Separated out the geometry from player input work