Starting to fix up to work with refactorings
Merge branch 'master' of https://github.com/erhlee-bird/block-market