Bad commit, everything is broken. I'm in the middle of refactoring, but I'm heading to bed.