Unfinished Lobby and some refactor