Changed structure of game. should be more logical now