More in-progress OOP stuff.