Getting closer to building

* Getting tests to build
* Then will do renames
* Then piece-by-piece refactor
remove hat thiung