more refactors, about to get this game going