Entities 10-29-2014

Done some work on the entities for the valuation feature.