Fixed some OOP stuff