Even more OOP code

^