Feature/16 gamemode