Yet more work on uniform

All is well except for the last little bit of tweaking on connectRooms()