Add room list and some socket stuff