Started making OOP code