More work on rooms.