Trying to add OOP arch