Added more game object classes and Transition to battle