Updated OP to reflect current needs.