More work on loadConfigFiles and RoomCell
Fix conflicts