Lobby to Game code added

Also did some minor copy-paste organization