Added rooms to the device list; re-factoring for device status