More OOP.

I can hide the horror under more OOP sugar and pretend to forget about
it.