moved a bunch of state stuff out of Player and into GameState