Preliminary multi-room & read-from-file changes