More work moving towards OOP