Finished restructuring MarketManager and made sure that the app still functions, as far as I can tell