middle of rework to remove entity system -- PITA to work around it