State and GameState are now in one class