Working on move to OOP