Finished the bulk of the refactoring methings, not so bad!
Last commit before going home, you know