Massive restructuring of how rooms work.  Much cleanup yet to be done