Made OOP work haha