Reordeded stuff, broke stuff
Fixed stuff. Reverted OOP stuff