Refactored and added game states.