Making everything more OOP with classes and what not. Cleaning up code, almost done