(WIP) moving to object-based code