Working on more OOP