Starting rewrite of game and entity