started work on the lobby
merge