Prepping for overhaul to more OOPish