WIP...
Refactoring a shedload of names, and fixing some bugs on github