Grand refactoring of a whole bunch of stuff at once - View it on GitHub