Adds room functionality and improvements