refactors, mocks, bootstrap
Merge branch 'mymess'