Refactoring nearing completion, MarketDisplay and unit tests next