Reintegration of Code with Lobby

See Email