Continuing transfer to OOP