Mid-point

Syncing because it isn't broken yet. Fixing MarketController