Added GameModel and fixing some issues