Added GameController class + minor changes