wip
Add room_num & latitude, longtude