more work on "rooms"