Refactored Broker to Investor