Some work on the room editor