Refactoring for 1.7.2

Everything should generally work now
A few things have been disabled
SO MANY ERROR!