Begin rework of game