restructured the game for easier extension... I hope