WIP 2: More refactoring

* Now loads as a restface handler