work in progress checkin; big refactor, adds functionality to Opportunity and Mediaman service