fix up the oop-ness