More OOP code

More OOP work today.