Done some work on the game, lets merge!