Refactored to Room and RoomUser

Rooms now find their users