diff --git a/PepperDashEssentials/AppServer/CotijaSystemController.cs b/PepperDashEssentials/AppServer/CotijaSystemController.cs
index 00f3ef5b..74ca8e9d 100644
--- a/PepperDashEssentials/AppServer/CotijaSystemController.cs
+++ b/PepperDashEssentials/AppServer/CotijaSystemController.cs
@@ -15,6 +15,7 @@ using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Room.Cotija;
 
 namespace PepperDash.Essentials
diff --git a/PepperDashEssentials/AppServer/Messengers/AtcDdvc01Messenger.cs b/PepperDashEssentials/AppServer/Messengers/AtcDdvc01Messenger.cs
index 882ad317..c1491f83 100644
--- a/PepperDashEssentials/AppServer/Messengers/AtcDdvc01Messenger.cs
+++ b/PepperDashEssentials/AppServer/Messengers/AtcDdvc01Messenger.cs
@@ -64,8 +64,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// </summary>
 		/// <param name="eisc"></param>
 		/// <param name="messagePath"></param>
-		public Ddvc01AtcMessenger(BasicTriList eisc, string messagePath)
-			: base(messagePath)
+		public Ddvc01AtcMessenger(string key, BasicTriList eisc, string messagePath)
+			: base(key, messagePath)
 		{
 			EISC = eisc;
 
diff --git a/PepperDashEssentials/AppServer/Messengers/MessengerBase.cs b/PepperDashEssentials/AppServer/Messengers/MessengerBase.cs
index 125bf83a..30f79da2 100644
--- a/PepperDashEssentials/AppServer/Messengers/MessengerBase.cs
+++ b/PepperDashEssentials/AppServer/Messengers/MessengerBase.cs
@@ -7,6 +7,8 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
+using PepperDash.Core;
+
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 
@@ -15,8 +17,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
 	/// <summary>
 	/// Provides a messaging bridge for a VideoCodecBase
 	/// </summary>
-	public abstract class MessengerBase
+	public abstract class MessengerBase : IKeyed
 	{
+        public string Key { get; private set; }
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -28,8 +32,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// 
 		/// </summary>
 		/// <param name="codec"></param>
-		public MessengerBase(string messagePath)
+		public MessengerBase(string key, string messagePath)
 		{
+            Key = key;
+
 			if (string.IsNullOrEmpty(messagePath))
 				throw new ArgumentException("messagePath must not be empty or null");
 
diff --git a/PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs b/PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs
new file mode 100644
index 00000000..51030e92
--- /dev/null
+++ b/PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
+using PepperDash.Essentials.Core.Monitoring;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class SystemMonitorMessenger : MessengerBase
+    {
+        public SystemMonitorController SysMon { get; private set; }
+
+        public SystemMonitorMessenger(string key, SystemMonitorController sysMon, string messagePath)
+            : base(key, messagePath)
+        {
+            if (sysMon == null)
+                throw new ArgumentNullException("sysMon");
+
+            SysMon = sysMon;
+
+            SysMon.SystemMonitorPropertiesChanged += new EventHandler<EventArgs>(SysMon_SystemMonitorPropertiesChanged);
+
+            foreach (var p in SysMon.ProgramStatusFeedbackCollection)
+            {
+                p.Value.AggregatedProgramInfoFeedback.OutputChange += new EventHandler<PepperDash.Essentials.Core.FeedbackEventArgs>(AggregatedProgramInfoFeedback_OutputChange);
+            }
+        }
+
+        /// <summary>
+        /// Posts the program information message
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void AggregatedProgramInfoFeedback_OutputChange(object sender, PepperDash.Essentials.Core.FeedbackEventArgs e)
+        {
+            SendProgramInfoStatusMessage(e.StringValue);
+        }
+
+        // Deserializes the program info into an object that can be setn in a status message
+        void SendProgramInfoStatusMessage(string serializedProgramInfo)
+        {
+            var programInfo = JsonConvert.DeserializeObject<ProgramInfo>(serializedProgramInfo);
+
+            PostStatusMessage(programInfo);
+        }
+
+        /// <summary>
+        /// Posts the system monitor properties
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void SysMon_SystemMonitorPropertiesChanged(object sender, EventArgs e)
+        {
+            SendSystemMonitorStatusMessage();
+        }
+
+        void SendFullStatusMessage()
+        {
+            SendSystemMonitorStatusMessage();
+
+            foreach (var p in SysMon.ProgramStatusFeedbackCollection)
+            {
+                SendProgramInfoStatusMessage(p.Value.AggregatedProgramInfoFeedback.StringValue);
+            }
+        }
+
+        void SendSystemMonitorStatusMessage()
+        {
+            // This takes a while, launch a new thread
+            CrestronInvoke.BeginInvoke((o) =>
+            {
+                PostStatusMessage(new
+                {
+                    timeZone = SysMon.TimeZoneFeedback.IntValue,
+                    timeZoneName = SysMon.TimeZoneTextFeedback.StringValue,
+                    ioControllerVersion = SysMon.IOControllerVersionFeedback.StringValue,
+                    snmpVersion = SysMon.SnmpVersionFeedback.StringValue,
+                    bacnetVersion = SysMon.BACnetAppVersionFeedback.StringValue,
+                    controllerVersion = SysMon.ControllerVersionFeedback.StringValue
+                });
+            });
+        }
+
+        protected override void CustomRegisterWithAppServer(CotijaSystemController appServerController)
+        {
+            AppServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullStatusMessage));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs b/PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs
index 37437b5d..3076cb56 100644
--- a/PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs
+++ b/PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs
@@ -26,7 +26,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
 		/// 
 		/// </summary>
 		/// <param name="codec"></param>
-		public VideoCodecBaseMessenger(VideoCodecBase codec, string messagePath) : base(messagePath)
+		public VideoCodecBaseMessenger(string key, VideoCodecBase codec, string messagePath)
+            : base(key, messagePath)
 		{
 			if (codec == null)
 				throw new ArgumentNullException("codec");
diff --git a/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs b/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs
index f02d6098..55c1f61b 100644
--- a/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs
+++ b/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs
@@ -204,7 +204,8 @@ namespace PepperDash.Essentials.Room.Cotija
 			SetupFunctions();
 			SetupFeedbacks();
 
-			AtcMessenger = new Ddvc01AtcMessenger(EISC, "/device/audioCodec");
+            var key = this.Key + "-" + Parent.Key;
+			AtcMessenger = new Ddvc01AtcMessenger(key, EISC, "/device/audioCodec");
 			AtcMessenger.RegisterWithAppServer(Parent);
 
 			EISC.SigChange += EISC_SigChange;
@@ -384,8 +385,8 @@ namespace PepperDash.Essentials.Room.Cotija
 			//Room
 			//if (co.Rooms == null)
 			// always start fresh in case simpl changed
-			co.Rooms = new List<EssentialsRoomConfig>();
-			var rm = new EssentialsRoomConfig();
+			co.Rooms = new List<DeviceConfig>();
+			var rm = new DeviceConfig();
             if (co.Rooms.Count == 0)
             {
                 Debug.Console(0, this, "Adding room to config");
diff --git a/PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs b/PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs
index 35acefc6..36ae6c03 100644
--- a/PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs
+++ b/PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs
@@ -95,7 +95,8 @@ namespace PepperDash.Essentials
 			if (vcRoom != null)
 			{
 				var codec = vcRoom.VideoCodec;
-				VCMessenger = new VideoCodecBaseMessenger(vcRoom.VideoCodec, "/device/videoCodec");
+                var key = vcRoom.VideoCodec.Key + "-" + parent.Key;
+				VCMessenger = new VideoCodecBaseMessenger(key, vcRoom.VideoCodec, "/device/videoCodec");
 				VCMessenger.RegisterWithAppServer(Parent);
 
 				// May need to move this or remove this 
diff --git a/PepperDashEssentials/ControlSystem.cs b/PepperDashEssentials/ControlSystem.cs
index 660d8311..63e417f8 100644
--- a/PepperDashEssentials/ControlSystem.cs
+++ b/PepperDashEssentials/ControlSystem.cs
@@ -212,6 +212,7 @@ namespace PepperDash.Essentials
 		void Load()
 		{
 			LoadDevices();
+            LinkSystemMonitorToAppServer();
 			LoadTieLines();
 			LoadRooms();
 			LoadLogoServer();
@@ -219,6 +220,24 @@ namespace PepperDash.Essentials
 			DeviceManager.ActivateAll();
 		}
 
+        void LinkSystemMonitorToAppServer()
+        {
+            var sysMon = DeviceManager.GetDeviceForKey("systemMonitor") as PepperDash.Essentials.Core.Monitoring.SystemMonitorController;
+
+            var appServer = DeviceManager.GetDeviceForKey("appServer") as CotijaSystemController;
+
+
+            if (sysMon != null && appServer != null)
+            {
+                var key = sysMon.Key + "-" + appServer.Key;
+                var messenger = new PepperDash.Essentials.AppServer.Messengers.SystemMonitorMessenger
+                    (key, sysMon, "/device/systemMonitor");
+
+                DeviceManager.AddDevice(messenger);    
+                
+
+            }
+        }
 
 		/// <summary>
 		/// Reads all devices from config and adds them to DeviceManager
@@ -278,6 +297,7 @@ namespace PepperDash.Essentials
 
 		}
 
+
 		/// <summary>
 		/// Helper method to load tie lines.  This should run after devices have loaded
 		/// </summary>
diff --git a/PepperDashEssentials/OTHER/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
similarity index 97%
rename from PepperDashEssentials/OTHER/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
rename to PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
index 3becfcfb..e7623975 100644
--- a/PepperDashEssentials/OTHER/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
+++ b/PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
@@ -1,1595 +1,1595 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.CrestronXml;
-using Crestron.SimplSharp.CrestronXml.Serialization;
-using Crestron.SimplSharp.CrestronXmlLinq;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.Fusion;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
-using PepperDash.Essentials;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Devices.Common;
-using PepperDash.Essentials.Devices.Common.Occupancy;
-
-
-
-namespace PepperDash.Essentials.Fusion
-{
-	public class EssentialsHuddleSpaceFusionSystemControllerBase : Device, IOccupancyStatusProvider
-	{
-        public event EventHandler<ScheduleChangeEventArgs> ScheduleChange;
-        //public event EventHandler<MeetingChangeEventArgs> MeetingEndWarning;
-        //public event EventHandler<MeetingChangeEventArgs> NextMeetingBeginWarning;
-
-        public event EventHandler<EventArgs> RoomInfoChange;
-
-        public FusionCustomPropertiesBridge CustomPropertiesBridge = new FusionCustomPropertiesBridge();
-
-		protected FusionRoom FusionRoom;
-		protected EssentialsRoomBase Room;
-		Dictionary<Device, BoolInputSig> SourceToFeedbackSigs = 
-			new Dictionary<Device, BoolInputSig>();
-
-		StatusMonitorCollection ErrorMessageRollUp;
-
-		protected StringSigData CurrentRoomSourceNameSig;
-
-        #region System Info Sigs
-        //StringSigData SystemName;
-        //StringSigData Model;
-        //StringSigData SerialNumber;
-        //StringSigData Uptime;
-        #endregion
-
-
-        #region Processor Info Sigs
-        StringSigData Ip1;
-        StringSigData Ip2;
-        StringSigData Gateway;
-        StringSigData Hostname;
-        StringSigData Domain;
-        StringSigData Dns1;
-        StringSigData Dns2;
-        StringSigData Mac1;
-        StringSigData Mac2;
-        StringSigData NetMask1;
-        StringSigData NetMask2;
-        StringSigData Firmware;
-
-        StringSigData[] Program = new StringSigData[10];
-        #endregion
-
-        #region Default Display Source Sigs
-
-        BooleanSigData[] Source = new BooleanSigData[10];
-
-        #endregion
-
-        RoomSchedule CurrentSchedule;
-
-        Event NextMeeting;
-
-        Event CurrentMeeting;
-
-        protected string RoomGuid
-        {
-            get
-            {
-                return GUIDs.RoomGuid;
-            }
-  
-        }
-
-        uint IpId;
-
-        FusionRoomGuids GUIDs;
-
-        bool GuidFileExists;
-
-        bool IsRegisteredForSchedulePushNotifications = false;
-
-        CTimer PollTimer = null;
-
-        CTimer PushNotificationTimer = null;
-
-        CTimer DailyTimeRequestTimer = null;
-
-        // Default poll time is 5 min unless overridden by config value
-        public long SchedulePollInterval = 300000;
-
-        public long PushNotificationTimeout = 5000;
-
-        protected Dictionary<int, FusionAsset> FusionStaticAssets;
-
-        // For use with local occ sensor devices which will relay to Fusion the current occupancy status
-        protected FusionRemoteOccupancySensor FusionRemoteOccSensor;
-        
-        // For use with occ sensor attached to a scheduling panel in Fusion
-        protected FusionOccupancySensorAsset FusionOccSensor;
-
-        public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
-
-        protected Func<bool> RoomIsOccupiedFeedbackFunc
-        {
-            get
-            {
-                return () => FusionRemoteOccSensor.RoomOccupied.OutputSig.BoolValue;
-            }
-        }
-
-        //ScheduleResponseEvent NextMeeting;
-
-        public EssentialsHuddleSpaceFusionSystemControllerBase(EssentialsRoomBase room, uint ipId)
-			: base(room.Key + "-fusion")
-		{
-
-            try
-            {
-
-                Room = room;
-
-                IpId = ipId;
-
-                FusionStaticAssets = new Dictionary<int, FusionAsset>();
-
-                GUIDs = new FusionRoomGuids();
-
-                var mac = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0);
-
-                var slot = Global.ControlSystem.ProgramNumber;
-
-                string guidFilePath = Global.FilePathPrefix + string.Format(@"{0}-FusionGuids.json", InitialParametersClass.ProgramIDTag);
-
-                GuidFileExists = File.Exists(guidFilePath);
-
-                // Check if file exists
-                if (!GuidFileExists)
-                {
-                    // Does not exist. Create GUIDs
-                    GUIDs = new FusionRoomGuids(Room.Name, ipId, GUIDs.GenerateNewRoomGuid(slot, mac), FusionStaticAssets);
-                }
-                else
-                {
-                    // Exists. Read GUIDs
-                    ReadGuidFile(guidFilePath);
-                }
-
-                CreateSymbolAndBasicSigs(IpId);
-                SetUpSources();
-                SetUpCommunitcationMonitors();
-                SetUpDisplay();
-                SetUpError();
-                ExecuteCustomSteps();
-
-                if (Room.RoomOccupancy != null)
-                {
-                    if (Room.OccupancyStatusProviderIsRemote)
-                        SetUpRemoteOccupancy();
-                    else
-                    {
-                        SetUpLocalOccupancy();
-                    }
-                }
-
-                // Make it so!   
-                FusionRVI.GenerateFileForAllFusionDevices();
-
-                GenerateGuidFile(guidFilePath);
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Error Building Fusion System Controller: {0}", e);
-            }
-		}
-
-        /// <summary>
-        /// Used for extension classes to execute whatever steps are necessary before generating the RVI and GUID files
-        /// </summary>
-        protected virtual void ExecuteCustomSteps()
-        {
-
-        }
-
-        /// <summary>
-        /// Generates the guid file in NVRAM.  If the file already exists it will be overwritten.
-        /// </summary>
-        /// <param name="filePath">path for the file</param>
-        void GenerateGuidFile(string filePath)
-        {
-            if (string.IsNullOrEmpty(filePath))
-            {
-                Debug.Console(0, this, "Error writing guid file.  No path specified.");
-                return;
-            }
-
-            CCriticalSection _fileLock = new CCriticalSection();
-
-            try
-            {
-                if (_fileLock == null || _fileLock.Disposed)
-                    return;
-
-                _fileLock.Enter();
-
-                Debug.Console(1, this, "Writing GUIDs to file");
-
-                if (FusionOccSensor == null)
-                    GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, FusionStaticAssets);
-                else
-                    GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, FusionStaticAssets, FusionOccSensor);
-
-                var JSON = JsonConvert.SerializeObject(GUIDs, Newtonsoft.Json.Formatting.Indented);
-
-                using (StreamWriter sw = new StreamWriter(filePath))
-                {
-                    sw.Write(JSON);
-                    sw.Flush();
-                }
-
-                Debug.Console(1, this, "Guids successfully written to file '{0}'", filePath);
-
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, this, "Error writing guid file: {0}", e);
-            }
-            finally
-            {
-                if (_fileLock != null && !_fileLock.Disposed)
-                    _fileLock.Leave();
-            }
-        }
-
-        /// <summary>
-        /// Reads the guid file from NVRAM
-        /// </summary>
-        /// <param name="filePath">path for te file</param>
-        void ReadGuidFile(string filePath)
-        {
-            if(string.IsNullOrEmpty(filePath))
-            {
-                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Error reading guid file.  No path specified.");
-                return;
-            }
-
-            CCriticalSection _fileLock = new CCriticalSection();
-
-            try
-            {
-                if(_fileLock == null || _fileLock.Disposed)
-                    return;
-
-                _fileLock.Enter();
-
-                if(File.Exists(filePath))
-                {
-                    var JSON = File.ReadToEnd(filePath, Encoding.ASCII);
-
-                    GUIDs = JsonConvert.DeserializeObject<FusionRoomGuids>(JSON);
-
-                    IpId = GUIDs.IpId;
-
-                    FusionStaticAssets = GUIDs.StaticAssets;
-
-                }
-
-                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Fusion Guids successfully read from file: {0}", filePath);
-
-                Debug.Console(1, this, "\nRoom Name: {0}\nIPID: {1:x}\n RoomGuid: {2}", Room.Name, IpId, RoomGuid);
-
-                foreach (var item in FusionStaticAssets)
-                {
-                    Debug.Console(1, this, "\nAsset Name: {0}\nAsset No: {1}\n Guid: {2}", item.Value.Name, item.Value.SlotNumber, item.Value.InstanceId);
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Error reading guid file: {0}", e);
-            }
-            finally
-            {
-                if(_fileLock != null && !_fileLock.Disposed)
-                   _fileLock.Leave();
-            }
-
-        }
-
-		protected virtual void CreateSymbolAndBasicSigs(uint ipId)
-		{
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);
-
-            FusionRoom = new FusionRoom(ipId, Global.ControlSystem, Room.Name, RoomGuid);
-            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.Use();
-            FusionRoom.ExtenderFusionRoomDataReservedSigs.Use();
-
-			FusionRoom.Register();
-
-            FusionRoom.FusionStateChange += new FusionStateEventHandler(FusionRoom_FusionStateChange);
-
-            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.DeviceExtenderSigChange += new DeviceExtenderJoinChangeEventHandler(FusionRoomSchedule_DeviceExtenderSigChange);
-            FusionRoom.ExtenderFusionRoomDataReservedSigs.DeviceExtenderSigChange += new DeviceExtenderJoinChangeEventHandler(ExtenderFusionRoomDataReservedSigs_DeviceExtenderSigChange);
-            FusionRoom.OnlineStatusChange += new OnlineStatusChangeEventHandler(FusionRoom_OnlineStatusChange);
-
-            CrestronConsole.AddNewConsoleCommand(RequestFullRoomSchedule, "FusReqRoomSchedule", "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod", "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(CreateAsHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
-
-			// Room to fusion room
-			Room.OnFeedback.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
-
-            // Moved to 
-			CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source", eSigIoMask.InputSigOnly);
-			// Don't think we need to get current status of this as nothing should be alive yet. 
-			(Room as EssentialsHuddleSpaceRoom).CurrentSingleSourceChange += new SourceInfoChangeHandler(Room_CurrentSourceInfoChange);
-
-
-            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleSpaceRoom).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff"));
-			// NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
-			FusionRoom.ErrorMessage.InputSig.StringValue =
-				"3: 7 Errors: This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;";
-
-            SetUpEthernetValues();
-
-            GetProcessorEthernetValues();
-
-            GetSystemInfo();
-
-            GetProcessorInfo();
-
-            CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
-        }
-
-        protected void CrestronEnvironment_EthernetEventHandler(EthernetEventArgs ethernetEventArgs)
-        {
-            if (ethernetEventArgs.EthernetEventType == eEthernetEventType.LinkUp)
-            {
-                GetProcessorEthernetValues();
-            }
-        }
-
-        protected void GetSystemInfo()
-        {
-            //SystemName.InputSig.StringValue = Room.Name;
-            //Model.InputSig.StringValue = InitialParametersClass.ControllerPromptName;
-            //SerialNumber.InputSig.StringValue = InitialParametersClass.
-
-            string response = string.Empty;
-
-            var systemReboot = FusionRoom.CreateOffsetBoolSig(74, "Processor - Reboot", eSigIoMask.OutputSigOnly);
-            systemReboot.OutputSig.SetSigFalseAction(() => CrestronConsole.SendControlSystemCommand("reboot", ref response));
-        }
-
-        protected void SetUpEthernetValues()
-        {
-            Ip1 = FusionRoom.CreateOffsetStringSig(50, "Info - Processor - IP 1", eSigIoMask.InputSigOnly);
-            Ip2 = FusionRoom.CreateOffsetStringSig(51, "Info - Processor - IP 2", eSigIoMask.InputSigOnly);
-            Gateway = FusionRoom.CreateOffsetStringSig(52, "Info - Processor - Gateway", eSigIoMask.InputSigOnly);
-            Hostname = FusionRoom.CreateOffsetStringSig(53, "Info - Processor - Hostname", eSigIoMask.InputSigOnly);
-            Domain = FusionRoom.CreateOffsetStringSig(54, "Info - Processor - Domain", eSigIoMask.InputSigOnly);
-            Dns1 = FusionRoom.CreateOffsetStringSig(55, "Info - Processor - DNS 1", eSigIoMask.InputSigOnly);
-            Dns2 = FusionRoom.CreateOffsetStringSig(56, "Info - Processor - DNS 2", eSigIoMask.InputSigOnly);
-            Mac1 = FusionRoom.CreateOffsetStringSig(57, "Info - Processor - MAC 1", eSigIoMask.InputSigOnly);
-            Mac2 = FusionRoom.CreateOffsetStringSig(58, "Info - Processor - MAC 2", eSigIoMask.InputSigOnly);
-            NetMask1 = FusionRoom.CreateOffsetStringSig(59, "Info - Processor - Net Mask 1", eSigIoMask.InputSigOnly);
-            NetMask2 = FusionRoom.CreateOffsetStringSig(60, "Info - Processor - Net Mask 2", eSigIoMask.InputSigOnly);
-        }
-
-        protected void GetProcessorEthernetValues()
-        {
-            Ip1.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);
-            Gateway.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, 0);
-            Hostname.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, 0);
-            Domain.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, 0);
-
-            var dnsServers = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DNS_SERVER, 0).Split(',');
-            Dns1.InputSig.StringValue = dnsServers[0];
-            if (dnsServers.Length > 1)
-                Dns2.InputSig.StringValue = dnsServers[1];
-
-            Mac1.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0);
-            NetMask1.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, 0);
-
-            // Interface 1
-
-            if (InitialParametersClass.NumberOfEthernetInterfaces > 1)      // Only get these values if the processor has more than 1 NIC
-            {
-                Ip2.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 1);
-                Mac2.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 1);
-                NetMask2.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, 1);
-            }
-        }
-
-        protected void GetProcessorInfo()
-        {
-
-            Firmware = FusionRoom.CreateOffsetStringSig(61, "Info - Processor - Firmware", eSigIoMask.InputSigOnly);
-
-            if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)
-            {
-                for (int i = 0; i < Global.ControlSystem.NumProgramsSupported; i++)
-                {
-                    var join = 62 + i;
-                    var progNum = i + 1;
-                    Program[i] = FusionRoom.CreateOffsetStringSig((uint)join, string.Format("Info - Processor - Program {0}", progNum), eSigIoMask.InputSigOnly);
-                }
-            }
-
-            Firmware.InputSig.StringValue = InitialParametersClass.FirmwareVersion;
-            
-        }
-
-        protected void GetCustomProperties()
-        {
-            if (FusionRoom.IsOnline)
-            {
-                string fusionRoomCustomPropertiesRequest = @"<RequestRoomConfiguration><RequestID>RoomConfigurationRequest</RequestID><CustomProperties><Property></Property></CustomProperties></RequestRoomConfiguration>";
-
-                FusionRoom.ExtenderFusionRoomDataReservedSigs.RoomConfigQuery.StringValue = fusionRoomCustomPropertiesRequest;
-            }
-        }
-
-        void GetTouchpanelInfo()
-        {
-            // TODO Get IP and Project Name from TP
-        }
-
-        protected void FusionRoom_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-        {
-            if (args.DeviceOnLine)
-            {
-                CrestronEnvironment.Sleep(200);
-
-                // Send Push Notification Action request:
-
-                string requestID = "InitialPushRequest";
-
-
-                string actionRequest =
-                    string.Format("<RequestAction>\n<RequestID>{0}</RequestID>\n", requestID) +
-                    "<ActionID>RegisterPushModel</ActionID>\n" +
-                    "<Parameters>\n" +
-                        "<Parameter ID='Enabled' Value='1' />\n" +
-                        "<Parameter ID='RequestID' Value='PushNotification' />\n" +
-                        "<Parameter ID='Start' Value='00:00:00' />\n" +
-                        "<Parameter ID='HourSpan' Value='24' />\n" +
-                        "<Parameter ID='Field' Value='MeetingID' />\n" +
-                        "<Parameter ID='Field' Value='RVMeetingID' />\n" +
-                        "<Parameter ID='Field' Value='InstanceID' />\n" +
-                        "<Parameter ID='Field' Value='dtStart' />\n" +
-                        "<Parameter ID='Field' Value='dtEnd' />\n" +
-                        "<Parameter ID='Field' Value='Subject' />\n" +
-                        "<Parameter ID='Field' Value='Organizer' />\n" +
-                        "<Parameter ID='Field' Value='IsEvent' />\n" +
-                        "<Parameter ID='Field' Value='IsPrivate' />\n" +
-                        "<Parameter ID='Field' Value='IsExchangePrivate' />\n" +
-                        "<Parameter ID='Field' Value='LiveMeeting' />\n" +
-                        "<Parameter ID='Field' Value='ShareDocPath' />\n" +
-                        "<Parameter ID='Field' Value='PhoneNo' />\n" +
-                        "<Parameter ID='Field' Value='ParticipantCode' />\n" +
-                    "</Parameters>\n" +
-                "</RequestAction>\n";
-
-                Debug.Console(2, this, "Sending Fusion ActionRequest: \n{0}", actionRequest);
-
-                FusionRoom.ExtenderFusionRoomDataReservedSigs.ActionQuery.StringValue = actionRequest;
-
-                GetCustomProperties();
-
-                // Request current Fusion Server Time
-                RequestLocalDateTime(null);
-
-                // Setup timer to request time daily
-                if (DailyTimeRequestTimer != null && !DailyTimeRequestTimer.Disposed)
-                {
-                    DailyTimeRequestTimer.Stop();
-                    DailyTimeRequestTimer.Dispose();
-                }
-
-                DailyTimeRequestTimer = new CTimer(RequestLocalDateTime, null, 86400000, 86400000);
-
-                DailyTimeRequestTimer.Reset(86400000, 86400000);
-            }
-
-        }
-
-        /// <summary>
-        /// Requests the local date and time from the Fusion Server
-        /// </summary>
-        /// <param name="callbackObject"></param>
-        public void RequestLocalDateTime(object callbackObject)
-        {
-            string timeRequestID = "TimeRequest";
-
-            string timeRequest = string.Format("<LocalTimeRequest><RequestID>{0}</RequestID></LocalTimeRequest>", timeRequestID);
-
-            FusionRoom.ExtenderFusionRoomDataReservedSigs.LocalDateTimeQuery.StringValue = timeRequest;
-        }
-
-        /// <summary>
-        /// Generates a room schedule request for this room for the next 24 hours.
-        /// </summary>
-        /// <param name="requestID">string identifying this request. Used with a corresponding ScheduleResponse value</param>
-        public void RequestFullRoomSchedule(object callbackObject)
-        {
-            DateTime now = DateTime.Today;
-
-            string currentTime = now.ToString("s");
-
-            string requestTest =
-                string.Format("<RequestSchedule><RequestID>FullSchedleRequest</RequestID><RoomID>{0}</RoomID><Start>{1}</Start><HourSpan>24</HourSpan></RequestSchedule>", RoomGuid, currentTime);
-
-            Debug.Console(2, this, "Sending Fusion ScheduleQuery: \n{0}", requestTest);
-
-            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.ScheduleQuery.StringValue = requestTest;
-
-            if (IsRegisteredForSchedulePushNotifications)
-                PushNotificationTimer.Stop();
-        }
-        
-        /// <summary>
-        /// Wrapper method to allow console commands to modify the current meeting end time
-        /// </summary>
-        /// <param name="command">meetingID extendTime</param>
-        public void ModifyMeetingEndTimeConsoleHelper(string command)
-        {
-            string requestID;
-            string meetingID = null;
-            int extendMinutes = -1;
-
-            requestID = "ModifyMeetingTest12345";
-
-            try
-            {
-                var tokens = command.Split(' ');
-
-                meetingID = tokens[0];
-                extendMinutes = Int32.Parse(tokens[1]);
-
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Error parsing console command: {0}", e);
-            }
-
-            ModifyMeetingEndTime(requestID, extendMinutes);
-
-        }
-
-        /// <summary>
-        /// Ends or Extends the current meeting by the specified number of minutes.
-        /// </summary>
-        /// <param name="extendMinutes">Number of minutes to extend the meeting.  A value of 0 will end the meeting.</param>
-        public void ModifyMeetingEndTime(string requestID, int extendMinutes)
-        {
-            if(CurrentMeeting == null)
-            {
-                Debug.Console(1, this, "No meeting in progress.  Unable to modify end time.");
-                return;
-            }            
-
-            if (extendMinutes > -1)
-            {
-                if(extendMinutes > 0)
-                {
-                    var extendTime = CurrentMeeting.dtEnd - DateTime.Now;
-                    double extendMinutesRaw = extendTime.TotalMinutes;
-
-                    extendMinutes = extendMinutes + (int)Math.Round(extendMinutesRaw);
-                }
-
-
-                string requestTest = string.Format(
-                    "<RequestAction><RequestID>{0}</RequestID><RoomID>{1}</RoomID><ActionID>MeetingChange</ActionID><Parameters><Parameter ID = 'MeetingID' Value = '{2}' /><Parameter ID = 'EndTime' Value = '{3}' /></Parameters></RequestAction>"
-                    , requestID, RoomGuid, CurrentMeeting.MeetingID, extendMinutes);
-
-                Debug.Console(1, this, "Sending MeetingChange Request: \n{0}", requestTest);
-
-                FusionRoom.ExtenderFusionRoomDataReservedSigs.ActionQuery.StringValue = requestTest;
-            }
-            else
-            {
-                Debug.Console(1, this, "Invalid time specified");
-            }
-
-
-        }
-
-        /// <summary>
-        /// Creates and Ad Hoc meeting with a duration of 1 hour, or until the next meeting if in less than 1 hour.
-        /// </summary>
-        public void CreateAsHocMeeting(string command)
-        {
-            string requestID = "CreateAdHocMeeting";
-
-            DateTime now = DateTime.Now.AddMinutes(1);
-
-            now.AddSeconds(-now.Second);
-
-            // Assume 1 hour meeting if possible
-            DateTime dtEnd = now.AddHours(1);
-
-            // Check if room is available for 1 hour before next meeting
-            if (NextMeeting != null)
-            {
-                var roomAvailable = NextMeeting.dtEnd.Subtract(dtEnd);
-
-                if (roomAvailable.TotalMinutes < 60)
-                {
-                    /// Room not available for full hour, book until next meeting starts
-                    dtEnd = NextMeeting.dtEnd;
-                }
-            }
-
-            string createMeetingRequest = 
-                "<CreateSchedule>" +
-                    string.Format("<RequestID>{0}</RequestID>", requestID) +
-                    string.Format("<RoomID>{0}</RoomID>", RoomGuid) +
-                    "<Event>" +
-                        string.Format("<dtStart>{0}</dtStart>", now.ToString("s")) +
-                        string.Format("<dtEnd>{0}</dtEnd>", dtEnd.ToString("s")) +
-                        "<Subject>AdHoc Meeting</Subject>" +
-                        "<Organizer>Room User</Organizer>" +
-                        "<WelcomMsg>Example Message</WelcomMsg>" +
-                    "</Event>" +
-                "</CreateSchedule>";
-
-            Debug.Console(2, this, "Sending CreateMeeting Request: \n{0}", createMeetingRequest);
-
-            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = createMeetingRequest;
-
-            //Debug.Console(1, this, "Sending CreateMeeting Request: \n{0}", command);
-
-            //FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = command;
-
-        }
-
-        /// <summary>
-        /// Event handler method for Device Extender sig changes
-        /// </summary>
-        /// <param name="currentDeviceExtender"></param>
-        /// <param name="args"></param>
-        protected void ExtenderFusionRoomDataReservedSigs_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args)
-        {
-            Debug.Console(2, this, "Event: {0}\n Sig: {1}\nFusionResponse:\n{2}", args.Event, args.Sig.Name, args.Sig.StringValue);
-
-
-            if (args.Sig == FusionRoom.ExtenderFusionRoomDataReservedSigs.ActionQueryResponse)
-            {
-                try
-                {
-                    XmlDocument message = new XmlDocument();
-
-                    message.LoadXml(args.Sig.StringValue);
-
-                    var actionResponse = message["ActionResponse"];
-
-                    if (actionResponse != null)
-                    {
-                        var requestID = actionResponse["RequestID"];
-
-                        if (requestID.InnerText == "InitialPushRequest")
-                        {
-                            if (actionResponse["ActionID"].InnerText == "RegisterPushModel")
-                            {
-                                var parameters = actionResponse["Parameters"];
-
-                                foreach (XmlElement parameter in parameters)
-                                {
-                                    if (parameter.HasAttributes)
-                                    {
-                                        var attributes = parameter.Attributes;
-
-                                        if (attributes["ID"].Value == "Registered")
-                                        {
-                                            var isRegistered = Int32.Parse(attributes["Value"].Value);
-
-                                            if (isRegistered == 1)
-                                            {
-                                                IsRegisteredForSchedulePushNotifications = true;
-
-                                                if (PollTimer != null && !PollTimer.Disposed)
-                                                {
-                                                    PollTimer.Stop();
-                                                    PollTimer.Dispose();
-                                                }
-
-                                                PushNotificationTimer = new CTimer(RequestFullRoomSchedule, null, PushNotificationTimeout, PushNotificationTimeout);
-
-                                                PushNotificationTimer.Reset(PushNotificationTimeout, PushNotificationTimeout);
-                                            }
-                                            else if (isRegistered == 0)
-                                            {
-                                                IsRegisteredForSchedulePushNotifications = false;
-
-                                                if (PushNotificationTimer != null && !PushNotificationTimer.Disposed)
-                                                {
-                                                    PushNotificationTimer.Stop();
-                                                    PushNotificationTimer.Dispose();
-                                                }
-
-                                                PollTimer = new CTimer(RequestFullRoomSchedule, null, SchedulePollInterval, SchedulePollInterval);
-
-                                                PollTimer.Reset(SchedulePollInterval, SchedulePollInterval);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(1, this, "Error parsing ActionQueryResponse: {0}", e);
-                }
-            }
-            else if (args.Sig == FusionRoom.ExtenderFusionRoomDataReservedSigs.LocalDateTimeQueryResponse)
-            {
-                try
-                {
-                    XmlDocument message = new XmlDocument();
-
-                    message.LoadXml(args.Sig.StringValue);
-
-                    var localDateTimeResponse = message["LocalTimeResponse"];
-
-                    if (localDateTimeResponse != null)
-                    {
-                        var localDateTime = localDateTimeResponse["LocalDateTime"];
-
-                        if (localDateTime != null)
-                        {
-                            var tempLocalDateTime = localDateTime.InnerText;
-                         
-                            DateTime currentTime = DateTime.Parse(tempLocalDateTime);
-
-                            Debug.Console(1, this, "DateTime from Fusion Server: {0}", currentTime);
-
-                            // Parse time and date from response and insert values
-                            CrestronEnvironment.SetTimeAndDate((ushort)currentTime.Hour, (ushort)currentTime.Minute, (ushort)currentTime.Second, (ushort)currentTime.Month, (ushort)currentTime.Day, (ushort)currentTime.Year);
-
-                            Debug.Console(1, this, "Processor time set to {0}", CrestronEnvironment.GetLocalTime());
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(1, this, "Error parsing LocalDateTimeQueryResponse: {0}", e);
-                }
-            }
-            else if (args.Sig == FusionRoom.ExtenderFusionRoomDataReservedSigs.RoomConfigResponse)
-            {
-                // Room info response with custom properties
-
-                string roomConfigResponseArgs = args.Sig.StringValue.Replace("&", "and");
-
-                Debug.Console(2, this, "Fusion Response: \n {0}", roomConfigResponseArgs);
-
-                try
-                {
-                    XmlDocument roomConfigResponse = new XmlDocument();
-
-                    roomConfigResponse.LoadXml(roomConfigResponseArgs);
-
-                    var requestRoomConfiguration = roomConfigResponse["RoomConfigurationResponse"];
-
-                    if (requestRoomConfiguration != null)
-                    {
-                        RoomInformation roomInformation = new RoomInformation();
-
-                        foreach (XmlElement e in roomConfigResponse.FirstChild.ChildNodes)
-                        {
-                            if (e.Name == "RoomInformation")
-                            {
-                                XmlReader roomInfo = new XmlReader(e.OuterXml);
-
-                                roomInformation = CrestronXMLSerialization.DeSerializeObject<RoomInformation>(roomInfo);
-                            }
-                            else if (e.Name == "CustomFields")
-                            {
-                                foreach (XmlElement el in e)
-                                {
-                                    FusionCustomProperty customProperty = new FusionCustomProperty();
-
-                                    if (el.Name == "CustomField")
-                                    {
-                                        customProperty.ID = el.Attributes["ID"].Value;
-                                    }
-
-                                    foreach (XmlElement elm in el)
-                                    {
-                                        if (elm.Name == "CustomFieldName")
-                                        {
-                                            customProperty.CustomFieldName = elm.InnerText;
-                                        }
-                                        if (elm.Name == "CustomFieldType")
-                                        {
-                                            customProperty.CustomFieldType = elm.InnerText;
-                                        }
-                                        if (elm.Name == "CustomFieldValue")
-                                        {
-                                            customProperty.CustomFieldValue = elm.InnerText;
-                                        }
-                                    }
-
-                                    roomInformation.FusionCustomProperties.Add(customProperty);
-                                }
-                            }
-                        }
-
-                        var handler = RoomInfoChange;
-                        if (handler != null)
-                            handler(this, new EventArgs());
-
-                        CustomPropertiesBridge.EvaluateRoomInfo(Room.Key, roomInformation);
-                    }
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(1, this, "Error parsing Custom Properties response: {0}", e);
-                }
-                //PrintRoomInfo();
-                //getRoomInfoBusy = false;
-                //_DynFusion.API.EISC.BooleanInput[Constants.GetRoomInfo].BoolValue = getRoomInfoBusy;
-            }
-            
-        }
-
-        /// <summary>
-        /// Event handler method for Device Extender sig changes
-        /// </summary>
-        /// <param name="currentDeviceExtender"></param>
-        /// <param name="args"></param>
-        protected void FusionRoomSchedule_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args)
-        {
-           Debug.Console(2, this, "Scehdule Response Event: {0}\n Sig: {1}\nFusionResponse:\n{2}", args.Event, args.Sig.Name, args.Sig.StringValue);
-
-
-           if (args.Sig == FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.ScheduleResponse)
-           {
-               try
-               {
-                   ScheduleResponse scheduleResponse = new ScheduleResponse();
-
-                   XmlDocument message = new XmlDocument();
-
-                   message.LoadXml(args.Sig.StringValue);
-
-                   var response = message["ScheduleResponse"];
-
-                   if (response != null)
-                   {
-                       // Check for push notification
-                       if (response["RequestID"].InnerText == "RVRequest")
-                       {
-                           var action = response["Action"];
-
-                           if (action.OuterXml.IndexOf("RequestSchedule") > -1)
-                           {
-                               PushNotificationTimer.Reset(PushNotificationTimeout, PushNotificationTimeout);
-                           }
-                       }
-                       else    // Not a push notification
-                       {
-                           CurrentSchedule = new RoomSchedule();  // Clear Current Schedule
-                           CurrentMeeting = null;   // Clear Current Meeting
-                           NextMeeting = null;      // Clear Next Meeting
-
-                           bool isNextMeeting = false;
-
-                           foreach (XmlElement element in message.FirstChild.ChildNodes)
-                           {
-                               if (element.Name == "RequestID")
-                               {
-                                   scheduleResponse.RequestID = element.InnerText;
-                               }
-                               else if (element.Name == "RoomID")
-                               {
-                                   scheduleResponse.RoomID = element.InnerText;
-                               }
-                               else if (element.Name == "RoomName")
-                               {
-                                   scheduleResponse.RoomName = element.InnerText;
-                               }
-                               else if (element.Name == "Event")
-                               {
-                                   Debug.Console(2, this, "Event Found:\n{0}", element.OuterXml);
-
-                                   XmlReader reader = new XmlReader(element.OuterXml);
-
-                                   Event tempEvent = new Event();
-
-                                   tempEvent = CrestronXMLSerialization.DeSerializeObject<Event>(reader);
-
-                                   scheduleResponse.Events.Add(tempEvent);
-
-                                   // Check is this is the current event
-                                   if (tempEvent.dtStart <= DateTime.Now && tempEvent.dtEnd >= DateTime.Now)
-                                   {
-                                       CurrentMeeting = tempEvent;  // Set Current Meeting
-                                       isNextMeeting = true;        // Flag that next element is next meeting
-                                   }
-
-                                   if (isNextMeeting)
-                                   {
-                                       NextMeeting = tempEvent; // Set Next Meeting
-                                       isNextMeeting = false;
-                                   }
-
-                                   CurrentSchedule.Meetings.Add(tempEvent);
-                               }
-
-                           }
-
-                           PrintTodaysSchedule();
-
-                           if (!IsRegisteredForSchedulePushNotifications)
-                               PollTimer.Reset(SchedulePollInterval, SchedulePollInterval);
-
-                           // Fire Schedule Change Event 
-                           var handler = ScheduleChange;
-
-                           if (handler != null)
-                           {
-                               handler(this, new ScheduleChangeEventArgs() { Schedule = CurrentSchedule });
-                           }
-                           
-                       }
-                   }
-
-                   
-
-               }
-               catch (Exception e)
-               {
-                   Debug.Console(1, this, "Error parsing ScheduleResponse: {0}", e);
-               }
-           }
-           else if (args.Sig == FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateResponse)
-           {
-               Debug.Console(2, this, "Create Meeting Response Event: {0}\n Sig: {1}\nFusionResponse:\n{2}", args.Event, args.Sig.Name, args.Sig.StringValue);
-           }
-
-        }
-
-        /// <summary>
-        /// Prints today's schedule to console for debugging
-        /// </summary>
-        void PrintTodaysSchedule()
-        {
-            if (Debug.Level > 1)
-            {
-                if (CurrentSchedule.Meetings.Count > 0)
-                {
-                    Debug.Console(1, this, "Today's Schedule for '{0}'\n", Room.Name);
-
-                    foreach (Event e in CurrentSchedule.Meetings)
-                    {
-                        Debug.Console(1, this, "Subject: {0}", e.Subject);
-                        Debug.Console(1, this, "Organizer: {0}", e.Organizer);
-                        Debug.Console(1, this, "MeetingID: {0}", e.MeetingID);
-                        Debug.Console(1, this, "Start Time: {0}", e.dtStart);
-                        Debug.Console(1, this, "End Time: {0}", e.dtEnd);
-                        Debug.Console(1, this, "Duration: {0}\n", e.DurationInMinutes);
-                    }
-                }
-            }
-        }
-
-		protected virtual void SetUpSources()
-		{
-			// Sources
-            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleSpaceRoom).SourceListKey);
-			if (dict != null)
-			{
-				// NEW PROCESS:
-				// Make these lists and insert the fusion attributes by iterating these
-				var setTopBoxes = dict.Where(d => d.Value.SourceDevice is ISetTopBoxControls);
-				uint i = 1;
-				foreach (var kvp in setTopBoxes)
-				{
-					TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
-					i++;
-					if (i > 5) // We only have five spots
-						break;
-				}
-
-				var discPlayers = dict.Where(d => d.Value.SourceDevice is IDiscPlayerControls);
-				i = 1;
-				foreach (var kvp in discPlayers)
-				{
-                    TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
-					i++;
-					if (i > 5) // We only have five spots
-						break;
-				}
-
-				var laptops = dict.Where(d => d.Value.SourceDevice is Laptop);
-				i = 1;
-				foreach (var kvp in laptops)
-				{
-                    TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
-					i++;
-					if (i > 10) // We only have ten spots???
-						break;
-				}
-
-                foreach (var kvp in dict)
-                {
-                    var usageDevice = kvp.Value.SourceDevice as IUsageTracking;
-
-                    if (usageDevice != null)
-                    {
-                        usageDevice.UsageTracker = new UsageTracking(usageDevice as Device);
-                        usageDevice.UsageTracker.UsageIsTracked = true;
-                        usageDevice.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
-                    }
-                }
-				
-			}
-			else
-			{
-				Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
-                    (Room as EssentialsHuddleSpaceRoom).SourceListKey, Room.Key);
-			}
-		}
-
-        /// <summary>
-        /// Collects usage data from source and sends to Fusion
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void UsageTracker_DeviceUsageEnded(object sender, DeviceUsageEventArgs e)
-        {          
-            var deviceTracker = sender as UsageTracking;
-
-            var configDevice = ConfigReader.ConfigObject.Devices.Where(d => d.Key.Equals(deviceTracker.Parent));
-
-            string group = ConfigReader.GetGroupForDeviceKey(deviceTracker.Parent.Key);
-
-            string currentMeetingId = "-";
-
-            if (CurrentMeeting != null)
-                currentMeetingId = CurrentMeeting.MeetingID;
-
-            //String Format:  "USAGE||[Date YYYY-MM-DD]||[Time HH-mm-ss]||TIME||[Asset_Type]||[Asset_Name]||[Minutes_used]||[Asset_ID]||[Meeting_ID]"
-            // [Asset_ID] property does not appear to be used in Crestron SSI examples.  They are sending "-" instead so that's what is replicated here
-            string deviceUsage = string.Format("USAGE||{0}||{1}||TIME||{2}||{3}||-||{4}||-||{5}||{6}||\r\n", e.UsageEndTime.ToString("yyyy-MM-dd"), e.UsageEndTime.ToString("HH:mm:ss"),
-                group, deviceTracker.Parent.Name, e.MinutesUsed, "-", currentMeetingId);
-
-            Debug.Console(1, this, "Device usage for: {0} ended at {1}. In use for {2} minutes", deviceTracker.Parent.Name, e.UsageEndTime, e.MinutesUsed);
-
-            FusionRoom.DeviceUsage.InputSig.StringValue = deviceUsage;
-
-            Debug.Console(1, this, "Device usage string: {0}", deviceUsage);
-        }
-
-
-		protected void TryAddRouteActionSigs(string attrName, uint attrNum, string routeKey, Device pSrc)
-		{
-			Debug.Console(2, this, "Creating attribute '{0}' with join {1} for source {2}",
-				attrName, attrNum, pSrc.Key);
-			try
-			{
-				var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputOutputSig);
-				// Need feedback when this source is selected
-				// Event handler, added below, will compare source changes with this sig dict
-				SourceToFeedbackSigs.Add(pSrc, sigD.InputSig);
-
-				// And respond to selection in Fusion
-                sigD.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleSpaceRoom).RunRouteAction(routeKey));
-			}
-			catch (Exception)
-			{
-				Debug.Console(2, this, "Error creating Fusion signal {0} {1} for device '{2}'. THIS NEEDS REWORKING", attrNum, attrName, pSrc.Key);
-			}
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SetUpCommunitcationMonitors()
-		{
-            uint displayNum = 0;
-            uint touchpanelNum = 0;
-            uint xpanelNum = 0;
-
-			// Attach to all room's devices with monitors.
-			//foreach (var dev in DeviceManager.Devices)
-			foreach (var dev in DeviceManager.GetDevices())
-			{
-				if (!(dev is ICommunicationMonitor))
-					continue;
-
-                string attrName = null;
-                uint attrNum = 1;
-
-                //var keyNum = ExtractNumberFromKey(dev.Key);
-                //if (keyNum == -1)
-                //{
-                //    Debug.Console(1, this, "WARNING: Cannot link device '{0}' to numbered Fusion monitoring attributes",
-                //        dev.Key);
-                //    continue;
-                //}
-                //uint attrNum = Convert.ToUInt32(keyNum);
-
-                // Check for UI devices
-                var uiDev = dev as EssentialsTouchpanelController;
-                if (uiDev != null)
-                {
-                    if (uiDev.Panel is Crestron.SimplSharpPro.UI.XpanelForSmartGraphics)
-                    {
-                        attrNum = attrNum + touchpanelNum;
-
-                        if (attrNum > 10)
-                            continue;
-                        attrName = "Online - XPanel " + attrNum;
-                        attrNum += 160;
-
-                        touchpanelNum++;
-                    }
-                    else
-                    {
-                        attrNum = attrNum + xpanelNum;
-
-                        if (attrNum > 10)
-                            continue;
-                        attrName = "Online - Touch Panel " + attrNum;
-                        attrNum += 150;
-
-                        xpanelNum++;
-                    }
-                }
-
-				//else 
-				if (dev is DisplayBase)
-				{
-                    attrNum = attrNum + displayNum; 
-					if (attrNum > 10)
-						continue;
-					attrName = "Online - Display " + attrNum;
-					attrNum += 170;
-
-                    displayNum++;
-				}
-				//else if (dev is DvdDeviceBase)
-				//{
-				//    if (attrNum > 5)
-				//        continue;
-				//    attrName = "Device Ok - DVD " + attrNum;
-				//    attrNum += 260;
-				//}
-				// add set top box
-
-				// add Cresnet roll-up
-
-				// add DM-devices roll-up
-
-				if (attrName != null)
-				{
-					// Link comm status to sig and update
-					var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputSigOnly);
-					var smd = dev as ICommunicationMonitor;
-					sigD.InputSig.BoolValue = smd.CommunicationMonitor.Status == MonitorStatus.IsOk;
-					smd.CommunicationMonitor.StatusChange += (o, a) =>
-					{ sigD.InputSig.BoolValue = a.Status == MonitorStatus.IsOk; };
-					Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", dev.Key, attrName);
-				}
-			}
-		}
-
-		protected virtual void SetUpDisplay()
-		{
-            try
-            {
-                //Setup Display Usage Monitoring
-
-                var displays = DeviceManager.AllDevices.Where(d => d is DisplayBase);
-
-                //  Consider updating this in multiple display systems
-
-                foreach (DisplayBase display in displays)
-                {
-                    display.UsageTracker = new UsageTracking(display);
-                    display.UsageTracker.UsageIsTracked = true;
-                    display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
-                }
-
-                var defaultDisplay = (Room as EssentialsHuddleSpaceRoom).DefaultDisplay as DisplayBase;
-                if (defaultDisplay == null)
-                {
-                    Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
-                    return;
-                }
-
-                var dispPowerOnAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOn(); });
-                var dispPowerOffAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOff(); });
-
-                // Display to fusion room sigs
-                FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
-                FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
-                defaultDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
-                if (defaultDisplay is IDisplayUsage)
-                    (defaultDisplay as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
-
-
-
-                MapDisplayToRoomJoins(1, 158, defaultDisplay);
-
-
-                var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(defaultDisplay.Key));
-
-                //Check for existing asset in GUIDs collection
-
-                var tempAsset = new FusionAsset();
-
-                if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
-                {
-                    tempAsset = FusionStaticAssets[deviceConfig.Uid];
-                }
-                else
-                {
-                    // Create a new asset
-                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), defaultDisplay.Name, "Display", "");
-                    FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
-                }
-
-                var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display", tempAsset.InstanceId);
-                dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
-                dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
-                defaultDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
-                // NO!! display.PowerIsOn.LinkComplementInputSig(dispAsset.PowerOff.InputSig);
-                // Use extension methods
-                dispAsset.TrySetMakeModel(defaultDisplay);
-                dispAsset.TryLinkAssetErrorToCommunication(defaultDisplay);
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, this, "Error setting up display in Fusion: {0}", e);
-            }
-            
-		}
-
-        /// <summary>
-        /// Maps room attributes to a display at a specified index
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="display"></param>a
-        protected virtual void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
-        {
-            string displayName = string.Format("Display {0} - ", displayIndex);
-
-
-            if (display == (Room as EssentialsHuddleSpaceRoom).DefaultDisplay)
-            {
-                // Display volume
-                var defaultDisplayVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
-                defaultDisplayVolume.OutputSig.UserObject = new Action<ushort>(b => (display as IBasicVolumeWithFeedback).SetVolume(b));
-                (display as IBasicVolumeWithFeedback).VolumeLevelFeedback.LinkInputSig(defaultDisplayVolume.InputSig);
-
-                // Power on
-                var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
-                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOn(); });
-                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
-
-                // Power Off
-                var defaultDisplayPowerOff = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 1, displayName + "Power Off", eSigIoMask.InputOutputSig);
-                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOff(); }); ;
-                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
-
-                // Current Source
-                var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff"); }); ;
-            }
-        }
-
-		void SetUpError()
-		{
-			// Roll up ALL device errors
-			ErrorMessageRollUp = new StatusMonitorCollection(this);
-			foreach (var dev in DeviceManager.GetDevices())
-			{
-				var md = dev as ICommunicationMonitor;
-				if (md != null)
-				{
-					ErrorMessageRollUp.AddMonitor(md.CommunicationMonitor);
-					Debug.Console(2, this, "Adding '{0}' to room's overall error monitor", md.CommunicationMonitor.Parent.Key);
-				}
-			}
-			ErrorMessageRollUp.Start();
-			FusionRoom.ErrorMessage.InputSig.StringValue = ErrorMessageRollUp.Message;
-			ErrorMessageRollUp.StatusChange += (o, a) =>
-			{
-				FusionRoom.ErrorMessage.InputSig.StringValue = ErrorMessageRollUp.Message;
-			};
-
-		}
-
-        /// <summary>
-        /// Sets up a local occupancy sensor, such as one attached to a Fusion Scheduling panel.  The occupancy status of the room will be read from Fusion
-        /// </summary>
-        void SetUpLocalOccupancy()
-        {
-            RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
-
-            FusionRoom.FusionAssetStateChange += new FusionAssetStateEventHandler(FusionRoom_FusionAssetStateChange);
-
-            // Build Occupancy Asset?
-            // Link sigs?
-
-            //Room.SetRoomOccupancy(this as IOccupancyStatusProvider, 0);
-
-
-        }
-
-        void FusionRoom_FusionAssetStateChange(FusionBase device, FusionAssetStateEventArgs args)
-        {
-            if (args.EventId == FusionAssetEventId.RoomOccupiedReceivedEventId || args.EventId == FusionAssetEventId.RoomUnoccupiedReceivedEventId)
-                RoomIsOccupiedFeedback.FireUpdate();
-
-        }
-
-        /// <summary>
-        /// Sets up remote occupancy that will relay the occupancy status determined by local system devices to Fusion
-        /// </summary>
-        void SetUpRemoteOccupancy()
-        { 
-
-            //  Need to have the room occupancy object first and somehow determine the slot number of the Occupancy asset but will not be able to use the UID from config likely.
-            //  Consider defining an object just for Room Occupancy (either eAssetType.Occupancy Sensor (local) or eAssetType.RemoteOccupancySensor (from Fusion sched. panel)) and reserving slot 4 for that asset (statics would start at 5)
-
-            //if (Room.OccupancyObj != null)
-            //{ 
-
-                var tempOccAsset = GUIDs.OccupancyAsset;
-                
-                if(tempOccAsset == null)
-                {
-                    FusionOccSensor = new FusionOccupancySensorAsset(eAssetType.OccupancySensor);
-                    tempOccAsset = FusionOccSensor;
-                }
-
-                var occSensorAsset = FusionRoom.CreateOccupancySensorAsset(tempOccAsset.SlotNumber, tempOccAsset.Name, "Occupancy Sensor", tempOccAsset.InstanceId);
-
-                occSensorAsset.RoomOccupied.AddSigToRVIFile = true;
-
-                var occSensorShutdownMinutes = FusionRoom.CreateOffsetUshortSig(70, "Occ Shutdown - Minutes", eSigIoMask.InputOutputSig);
-                
-                // Tie to method on occupancy object
-                //occSensorShutdownMinutes.OutputSig.UserObject(new Action(ushort)(b => Room.OccupancyObj.SetShutdownMinutes(b));
-                
-
-                Room.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
-            //}
-        }
-
-		/// <summary>
-		/// Helper to get the number from the end of a device's key string
-		/// </summary>
-		/// <returns>-1 if no number matched</returns>
-		int ExtractNumberFromKey(string key)
-		{
-            var capture = System.Text.RegularExpressions.Regex.Match(key, @"\b(\d+)");
-			if (!capture.Success)
-				return -1;
-			else return Convert.ToInt32(capture.Groups[1].Value);
-		}
-
-		/// <summary>
-		/// Event handler for when room source changes
-		/// </summary>
-		protected void Room_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
-		{
-			// Handle null. Nothing to do when switching from or to null
-			if (info == null || info.SourceDevice == null)
-				return;
-
-			var dev = info.SourceDevice;
-			if (type == ChangeType.WillChange)
-			{
-				if (SourceToFeedbackSigs.ContainsKey(dev))
-					SourceToFeedbackSigs[dev].BoolValue = false;
-			}
-			else
-			{
-				if (SourceToFeedbackSigs.ContainsKey(dev))
-					SourceToFeedbackSigs[dev].BoolValue = true;
-				var name = (room == null ? "" : room.Name);
-				CurrentRoomSourceNameSig.InputSig.StringValue = info.SourceDevice.Name;
-			}
-		}
-
-		protected void FusionRoom_FusionStateChange(FusionBase device, FusionStateEventArgs args)
-		{
-
-			// The sig/UO method: Need separate handlers for fixed and user sigs, all flavors, 
-			// even though they all contain sigs.
-
-			var sigData = (args.UserConfiguredSigDetail as BooleanSigDataFixedName);
-			if (sigData != null)
-			{
-				var outSig = sigData.OutputSig;
-				if (outSig.UserObject is Action<bool>)
-					(outSig.UserObject as Action<bool>).Invoke(outSig.BoolValue);
-				else if (outSig.UserObject is Action<ushort>)
-					(outSig.UserObject as Action<ushort>).Invoke(outSig.UShortValue);
-				else if (outSig.UserObject is Action<string>)
-					(outSig.UserObject as Action<string>).Invoke(outSig.StringValue);
-				return;
-			}
-
-			var attrData = (args.UserConfiguredSigDetail as BooleanSigData);
-			if (attrData != null)
-			{
-				var outSig = attrData.OutputSig;
-				if (outSig.UserObject is Action<bool>)
-					(outSig.UserObject as Action<bool>).Invoke(outSig.BoolValue);
-				else if (outSig.UserObject is Action<ushort>)
-					(outSig.UserObject as Action<ushort>).Invoke(outSig.UShortValue);
-				else if (outSig.UserObject is Action<string>)
-					(outSig.UserObject as Action<string>).Invoke(outSig.StringValue);
-				return;
-			}
-
-		}
-	}
-
-
-	public static class FusionRoomExtensions
-	{
-		/// <summary>
-		/// Creates and returns a fusion attribute. The join number will match the established Simpl
-		/// standard of 50+, and will generate a 50+ join in the RVI. It calls
-		/// FusionRoom.AddSig with join number - 49
-		/// </summary>
-		/// <returns>The new attribute</returns>
-		public static BooleanSigData CreateOffsetBoolSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
-		{
-			if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
-			number -= 49;
-			fr.AddSig(eSigType.Bool, number, name, mask);
-			return fr.UserDefinedBooleanSigDetails[number];
-		}
-
-		/// <summary>
-		/// Creates and returns a fusion attribute. The join number will match the established Simpl
-		/// standard of 50+, and will generate a 50+ join in the RVI. It calls
-		/// FusionRoom.AddSig with join number - 49
-		/// </summary>
-		/// <returns>The new attribute</returns>
-		public static UShortSigData CreateOffsetUshortSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
-		{
-			if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
-			number -= 49;
-			fr.AddSig(eSigType.UShort, number, name, mask);
-			return fr.UserDefinedUShortSigDetails[number];
-		}
-
-		/// <summary>
-		/// Creates and returns a fusion attribute. The join number will match the established Simpl
-		/// standard of 50+, and will generate a 50+ join in the RVI. It calls
-		/// FusionRoom.AddSig with join number - 49
-		/// </summary>
-		/// <returns>The new attribute</returns>
-		public static StringSigData CreateOffsetStringSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
-		{
-			if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
-			number -= 49;
-			fr.AddSig(eSigType.String, number, name, mask);
-			return fr.UserDefinedStringSigDetails[number];
-		}
-
-		/// <summary>
-		/// Creates and returns a static asset
-		/// </summary>
-		/// <returns>the new asset</returns>
-		public static FusionStaticAsset CreateStaticAsset(this FusionRoom fr, uint number, string name, string type, string instanceId)
-		{            
-            Debug.Console(0, "Adding Fusion Static Asset '{0}' to slot {1} with GUID: '{2}'", name, number, instanceId);
-
-			fr.AddAsset(eAssetType.StaticAsset, number, name, type, instanceId);
-			return fr.UserConfigurableAssetDetails[number].Asset as FusionStaticAsset;
-		}
-
-        public static FusionOccupancySensor CreateOccupancySensorAsset(this FusionRoom fr, uint number, string name, string type, string instanceId)
-        {
-            Debug.Console(0, "Adding Fusion Occupancy Sensor Asset '{0}' to slot {1} with GUID: '{2}'", name, number, instanceId);
-
-            fr.AddAsset(eAssetType.OccupancySensor, number, name, type, instanceId);
-            return fr.UserConfigurableAssetDetails[number].Asset as FusionOccupancySensor;
-        }
-	}
-
-	//************************************************************************************************
-	/// <summary>
-	/// Extensions to enhance Fusion room, asset and signal creation.
-	/// </summary>
-	public static class FusionStaticAssetExtensions
-	{
-		/// <summary>
-		/// Tries to set a Fusion asset with the make and model of a device.
-		/// If the provided Device is IMakeModel, will set the corresponding parameters on the fusion static asset.
-		/// Otherwise, does nothing.
-		/// </summary>
-		public static void TrySetMakeModel(this FusionStaticAsset asset, Device device)
-		{
-			var mm = device as IMakeModel;
-			if (mm != null)
-			{
-				asset.ParamMake.Value = mm.DeviceMake;
-				asset.ParamModel.Value = mm.DeviceModel;
-			}
-		}
-
-		/// <summary>
-		/// Tries to attach the AssetError input on a Fusion asset to a Device's
-		/// CommunicationMonitor.StatusChange event. Does nothing if the device is not 
-		/// IStatusMonitor
-		/// </summary>
-		/// <param name="asset"></param>
-		/// <param name="device"></param>
-		public static void TryLinkAssetErrorToCommunication(this FusionStaticAsset asset, Device device)
-		{
-			if (device is ICommunicationMonitor)
-			{
-				var monitor = (device as ICommunicationMonitor).CommunicationMonitor;
-				monitor.StatusChange += (o, a) =>
-				{
-					// Link connected and error inputs on asset
-					asset.Connected.InputSig.BoolValue = a.Status == MonitorStatus.IsOk;
-					asset.AssetError.InputSig.StringValue = a.Status.ToString();
-				};
-				// set current value
-				asset.Connected.InputSig.BoolValue = monitor.Status == MonitorStatus.IsOk;
-				asset.AssetError.InputSig.StringValue = monitor.Status.ToString();
-			}
-		}
-	}
-
-    public class RoomInformation
-    {
-        public string ID { get; set; }
-        public string Name { get; set; }
-        public string Location { get; set; }
-        public string Description { get; set; }
-        public string TimeZone { get; set; }
-        public string WebcamURL { get; set; }
-        public string BacklogMsg { get; set; }
-        public string SubErrorMsg { get; set; }
-        public string EmailInfo { get; set; }
-        public List<FusionCustomProperty> FusionCustomProperties { get; set; }
-
-        public RoomInformation()
-        {
-            FusionCustomProperties = new List<FusionCustomProperty>();
-        }
-    }
-    public class FusionCustomProperty
-    {
-        public string ID { get; set; }
-        public string CustomFieldName { get; set; }
-        public string CustomFieldType { get; set; }
-        public string CustomFieldValue { get; set; }
-
-        public FusionCustomProperty()
-        {
-
-        }
-
-        public FusionCustomProperty(string id)
-        {
-            ID = id;
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharp.CrestronXml;
+using Crestron.SimplSharp.CrestronXml.Serialization;
+using Crestron.SimplSharp.CrestronXmlLinq;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.Fusion;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+using PepperDash.Core;
+using PepperDash.Essentials;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Devices.Common;
+using PepperDash.Essentials.Devices.Common.Occupancy;
+
+
+
+namespace PepperDash.Essentials.Fusion
+{
+	public class EssentialsHuddleSpaceFusionSystemControllerBase : Device, IOccupancyStatusProvider
+	{
+        public event EventHandler<ScheduleChangeEventArgs> ScheduleChange;
+        //public event EventHandler<MeetingChangeEventArgs> MeetingEndWarning;
+        //public event EventHandler<MeetingChangeEventArgs> NextMeetingBeginWarning;
+
+        public event EventHandler<EventArgs> RoomInfoChange;
+
+        public FusionCustomPropertiesBridge CustomPropertiesBridge = new FusionCustomPropertiesBridge();
+
+		protected FusionRoom FusionRoom;
+		protected EssentialsRoomBase Room;
+		Dictionary<Device, BoolInputSig> SourceToFeedbackSigs = 
+			new Dictionary<Device, BoolInputSig>();
+
+		StatusMonitorCollection ErrorMessageRollUp;
+
+		protected StringSigData CurrentRoomSourceNameSig;
+
+        #region System Info Sigs
+        //StringSigData SystemName;
+        //StringSigData Model;
+        //StringSigData SerialNumber;
+        //StringSigData Uptime;
+        #endregion
+
+
+        #region Processor Info Sigs
+        StringSigData Ip1;
+        StringSigData Ip2;
+        StringSigData Gateway;
+        StringSigData Hostname;
+        StringSigData Domain;
+        StringSigData Dns1;
+        StringSigData Dns2;
+        StringSigData Mac1;
+        StringSigData Mac2;
+        StringSigData NetMask1;
+        StringSigData NetMask2;
+        StringSigData Firmware;
+
+        StringSigData[] Program = new StringSigData[10];
+        #endregion
+
+        #region Default Display Source Sigs
+
+        BooleanSigData[] Source = new BooleanSigData[10];
+
+        #endregion
+
+        RoomSchedule CurrentSchedule;
+
+        Event NextMeeting;
+
+        Event CurrentMeeting;
+
+        protected string RoomGuid
+        {
+            get
+            {
+                return GUIDs.RoomGuid;
+            }
+  
+        }
+
+        uint IpId;
+
+        FusionRoomGuids GUIDs;
+
+        bool GuidFileExists;
+
+        bool IsRegisteredForSchedulePushNotifications = false;
+
+        CTimer PollTimer = null;
+
+        CTimer PushNotificationTimer = null;
+
+        CTimer DailyTimeRequestTimer = null;
+
+        // Default poll time is 5 min unless overridden by config value
+        public long SchedulePollInterval = 300000;
+
+        public long PushNotificationTimeout = 5000;
+
+        protected Dictionary<int, FusionAsset> FusionStaticAssets;
+
+        // For use with local occ sensor devices which will relay to Fusion the current occupancy status
+        protected FusionRemoteOccupancySensor FusionRemoteOccSensor;
+        
+        // For use with occ sensor attached to a scheduling panel in Fusion
+        protected FusionOccupancySensorAsset FusionOccSensor;
+
+        public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
+
+        protected Func<bool> RoomIsOccupiedFeedbackFunc
+        {
+            get
+            {
+                return () => FusionRemoteOccSensor.RoomOccupied.OutputSig.BoolValue;
+            }
+        }
+
+        //ScheduleResponseEvent NextMeeting;
+
+        public EssentialsHuddleSpaceFusionSystemControllerBase(EssentialsRoomBase room, uint ipId)
+			: base(room.Key + "-fusion")
+		{
+
+            try
+            {
+
+                Room = room;
+
+                IpId = ipId;
+
+                FusionStaticAssets = new Dictionary<int, FusionAsset>();
+
+                GUIDs = new FusionRoomGuids();
+
+                var mac = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0);
+
+                var slot = Global.ControlSystem.ProgramNumber;
+
+                string guidFilePath = Global.FilePathPrefix + string.Format(@"{0}-FusionGuids.json", InitialParametersClass.ProgramIDTag);
+
+                GuidFileExists = File.Exists(guidFilePath);
+
+                // Check if file exists
+                if (!GuidFileExists)
+                {
+                    // Does not exist. Create GUIDs
+                    GUIDs = new FusionRoomGuids(Room.Name, ipId, GUIDs.GenerateNewRoomGuid(slot, mac), FusionStaticAssets);
+                }
+                else
+                {
+                    // Exists. Read GUIDs
+                    ReadGuidFile(guidFilePath);
+                }
+
+                CreateSymbolAndBasicSigs(IpId);
+                SetUpSources();
+                SetUpCommunitcationMonitors();
+                SetUpDisplay();
+                SetUpError();
+                ExecuteCustomSteps();
+
+                if (Room.RoomOccupancy != null)
+                {
+                    if (Room.OccupancyStatusProviderIsRemote)
+                        SetUpRemoteOccupancy();
+                    else
+                    {
+                        SetUpLocalOccupancy();
+                    }
+                }
+
+                // Make it so!   
+                FusionRVI.GenerateFileForAllFusionDevices();
+
+                GenerateGuidFile(guidFilePath);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Error Building Fusion System Controller: {0}", e);
+            }
+		}
+
+        /// <summary>
+        /// Used for extension classes to execute whatever steps are necessary before generating the RVI and GUID files
+        /// </summary>
+        protected virtual void ExecuteCustomSteps()
+        {
+
+        }
+
+        /// <summary>
+        /// Generates the guid file in NVRAM.  If the file already exists it will be overwritten.
+        /// </summary>
+        /// <param name="filePath">path for the file</param>
+        void GenerateGuidFile(string filePath)
+        {
+            if (string.IsNullOrEmpty(filePath))
+            {
+                Debug.Console(0, this, "Error writing guid file.  No path specified.");
+                return;
+            }
+
+            CCriticalSection _fileLock = new CCriticalSection();
+
+            try
+            {
+                if (_fileLock == null || _fileLock.Disposed)
+                    return;
+
+                _fileLock.Enter();
+
+                Debug.Console(1, this, "Writing GUIDs to file");
+
+                if (FusionOccSensor == null)
+                    GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, FusionStaticAssets);
+                else
+                    GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, FusionStaticAssets, FusionOccSensor);
+
+                var JSON = JsonConvert.SerializeObject(GUIDs, Newtonsoft.Json.Formatting.Indented);
+
+                using (StreamWriter sw = new StreamWriter(filePath))
+                {
+                    sw.Write(JSON);
+                    sw.Flush();
+                }
+
+                Debug.Console(1, this, "Guids successfully written to file '{0}'", filePath);
+
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, "Error writing guid file: {0}", e);
+            }
+            finally
+            {
+                if (_fileLock != null && !_fileLock.Disposed)
+                    _fileLock.Leave();
+            }
+        }
+
+        /// <summary>
+        /// Reads the guid file from NVRAM
+        /// </summary>
+        /// <param name="filePath">path for te file</param>
+        void ReadGuidFile(string filePath)
+        {
+            if(string.IsNullOrEmpty(filePath))
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Error reading guid file.  No path specified.");
+                return;
+            }
+
+            CCriticalSection _fileLock = new CCriticalSection();
+
+            try
+            {
+                if(_fileLock == null || _fileLock.Disposed)
+                    return;
+
+                _fileLock.Enter();
+
+                if(File.Exists(filePath))
+                {
+                    var JSON = File.ReadToEnd(filePath, Encoding.ASCII);
+
+                    GUIDs = JsonConvert.DeserializeObject<FusionRoomGuids>(JSON);
+
+                    IpId = GUIDs.IpId;
+
+                    FusionStaticAssets = GUIDs.StaticAssets;
+
+                }
+
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Fusion Guids successfully read from file: {0}", filePath);
+
+                Debug.Console(1, this, "\nRoom Name: {0}\nIPID: {1:x}\n RoomGuid: {2}", Room.Name, IpId, RoomGuid);
+
+                foreach (var item in FusionStaticAssets)
+                {
+                    Debug.Console(1, this, "\nAsset Name: {0}\nAsset No: {1}\n Guid: {2}", item.Value.Name, item.Value.SlotNumber, item.Value.InstanceId);
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Error reading guid file: {0}", e);
+            }
+            finally
+            {
+                if(_fileLock != null && !_fileLock.Disposed)
+                   _fileLock.Leave();
+            }
+
+        }
+
+		protected virtual void CreateSymbolAndBasicSigs(uint ipId)
+		{
+            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);
+
+            FusionRoom = new FusionRoom(ipId, Global.ControlSystem, Room.Name, RoomGuid);
+            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.Use();
+            FusionRoom.ExtenderFusionRoomDataReservedSigs.Use();
+
+			FusionRoom.Register();
+
+            FusionRoom.FusionStateChange += new FusionStateEventHandler(FusionRoom_FusionStateChange);
+
+            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.DeviceExtenderSigChange += new DeviceExtenderJoinChangeEventHandler(FusionRoomSchedule_DeviceExtenderSigChange);
+            FusionRoom.ExtenderFusionRoomDataReservedSigs.DeviceExtenderSigChange += new DeviceExtenderJoinChangeEventHandler(ExtenderFusionRoomDataReservedSigs_DeviceExtenderSigChange);
+            FusionRoom.OnlineStatusChange += new OnlineStatusChangeEventHandler(FusionRoom_OnlineStatusChange);
+
+            CrestronConsole.AddNewConsoleCommand(RequestFullRoomSchedule, "FusReqRoomSchedule", "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod", "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(CreateAsHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
+
+			// Room to fusion room
+			Room.OnFeedback.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
+
+            // Moved to 
+			CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source", eSigIoMask.InputSigOnly);
+			// Don't think we need to get current status of this as nothing should be alive yet. 
+			(Room as EssentialsHuddleSpaceRoom).CurrentSingleSourceChange += new SourceInfoChangeHandler(Room_CurrentSourceInfoChange);
+
+
+            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleSpaceRoom).PowerOnToDefaultOrLastSource);
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff"));
+			// NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
+			FusionRoom.ErrorMessage.InputSig.StringValue =
+				"3: 7 Errors: This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;";
+
+            SetUpEthernetValues();
+
+            GetProcessorEthernetValues();
+
+            GetSystemInfo();
+
+            GetProcessorInfo();
+
+            CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
+        }
+
+        protected void CrestronEnvironment_EthernetEventHandler(EthernetEventArgs ethernetEventArgs)
+        {
+            if (ethernetEventArgs.EthernetEventType == eEthernetEventType.LinkUp)
+            {
+                GetProcessorEthernetValues();
+            }
+        }
+
+        protected void GetSystemInfo()
+        {
+            //SystemName.InputSig.StringValue = Room.Name;
+            //Model.InputSig.StringValue = InitialParametersClass.ControllerPromptName;
+            //SerialNumber.InputSig.StringValue = InitialParametersClass.
+
+            string response = string.Empty;
+
+            var systemReboot = FusionRoom.CreateOffsetBoolSig(74, "Processor - Reboot", eSigIoMask.OutputSigOnly);
+            systemReboot.OutputSig.SetSigFalseAction(() => CrestronConsole.SendControlSystemCommand("reboot", ref response));
+        }
+
+        protected void SetUpEthernetValues()
+        {
+            Ip1 = FusionRoom.CreateOffsetStringSig(50, "Info - Processor - IP 1", eSigIoMask.InputSigOnly);
+            Ip2 = FusionRoom.CreateOffsetStringSig(51, "Info - Processor - IP 2", eSigIoMask.InputSigOnly);
+            Gateway = FusionRoom.CreateOffsetStringSig(52, "Info - Processor - Gateway", eSigIoMask.InputSigOnly);
+            Hostname = FusionRoom.CreateOffsetStringSig(53, "Info - Processor - Hostname", eSigIoMask.InputSigOnly);
+            Domain = FusionRoom.CreateOffsetStringSig(54, "Info - Processor - Domain", eSigIoMask.InputSigOnly);
+            Dns1 = FusionRoom.CreateOffsetStringSig(55, "Info - Processor - DNS 1", eSigIoMask.InputSigOnly);
+            Dns2 = FusionRoom.CreateOffsetStringSig(56, "Info - Processor - DNS 2", eSigIoMask.InputSigOnly);
+            Mac1 = FusionRoom.CreateOffsetStringSig(57, "Info - Processor - MAC 1", eSigIoMask.InputSigOnly);
+            Mac2 = FusionRoom.CreateOffsetStringSig(58, "Info - Processor - MAC 2", eSigIoMask.InputSigOnly);
+            NetMask1 = FusionRoom.CreateOffsetStringSig(59, "Info - Processor - Net Mask 1", eSigIoMask.InputSigOnly);
+            NetMask2 = FusionRoom.CreateOffsetStringSig(60, "Info - Processor - Net Mask 2", eSigIoMask.InputSigOnly);
+        }
+
+        protected void GetProcessorEthernetValues()
+        {
+            Ip1.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);
+            Gateway.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, 0);
+            Hostname.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, 0);
+            Domain.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, 0);
+
+            var dnsServers = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DNS_SERVER, 0).Split(',');
+            Dns1.InputSig.StringValue = dnsServers[0];
+            if (dnsServers.Length > 1)
+                Dns2.InputSig.StringValue = dnsServers[1];
+
+            Mac1.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0);
+            NetMask1.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, 0);
+
+            // Interface 1
+
+            if (InitialParametersClass.NumberOfEthernetInterfaces > 1)      // Only get these values if the processor has more than 1 NIC
+            {
+                Ip2.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 1);
+                Mac2.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 1);
+                NetMask2.InputSig.StringValue = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, 1);
+            }
+        }
+
+        protected void GetProcessorInfo()
+        {
+
+            Firmware = FusionRoom.CreateOffsetStringSig(61, "Info - Processor - Firmware", eSigIoMask.InputSigOnly);
+
+            if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)
+            {
+                for (int i = 0; i < Global.ControlSystem.NumProgramsSupported; i++)
+                {
+                    var join = 62 + i;
+                    var progNum = i + 1;
+                    Program[i] = FusionRoom.CreateOffsetStringSig((uint)join, string.Format("Info - Processor - Program {0}", progNum), eSigIoMask.InputSigOnly);
+                }
+            }
+
+            Firmware.InputSig.StringValue = InitialParametersClass.FirmwareVersion;
+            
+        }
+
+        protected void GetCustomProperties()
+        {
+            if (FusionRoom.IsOnline)
+            {
+                string fusionRoomCustomPropertiesRequest = @"<RequestRoomConfiguration><RequestID>RoomConfigurationRequest</RequestID><CustomProperties><Property></Property></CustomProperties></RequestRoomConfiguration>";
+
+                FusionRoom.ExtenderFusionRoomDataReservedSigs.RoomConfigQuery.StringValue = fusionRoomCustomPropertiesRequest;
+            }
+        }
+
+        void GetTouchpanelInfo()
+        {
+            // TODO Get IP and Project Name from TP
+        }
+
+        protected void FusionRoom_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
+        {
+            if (args.DeviceOnLine)
+            {
+                CrestronEnvironment.Sleep(200);
+
+                // Send Push Notification Action request:
+
+                string requestID = "InitialPushRequest";
+
+
+                string actionRequest =
+                    string.Format("<RequestAction>\n<RequestID>{0}</RequestID>\n", requestID) +
+                    "<ActionID>RegisterPushModel</ActionID>\n" +
+                    "<Parameters>\n" +
+                        "<Parameter ID='Enabled' Value='1' />\n" +
+                        "<Parameter ID='RequestID' Value='PushNotification' />\n" +
+                        "<Parameter ID='Start' Value='00:00:00' />\n" +
+                        "<Parameter ID='HourSpan' Value='24' />\n" +
+                        "<Parameter ID='Field' Value='MeetingID' />\n" +
+                        "<Parameter ID='Field' Value='RVMeetingID' />\n" +
+                        "<Parameter ID='Field' Value='InstanceID' />\n" +
+                        "<Parameter ID='Field' Value='dtStart' />\n" +
+                        "<Parameter ID='Field' Value='dtEnd' />\n" +
+                        "<Parameter ID='Field' Value='Subject' />\n" +
+                        "<Parameter ID='Field' Value='Organizer' />\n" +
+                        "<Parameter ID='Field' Value='IsEvent' />\n" +
+                        "<Parameter ID='Field' Value='IsPrivate' />\n" +
+                        "<Parameter ID='Field' Value='IsExchangePrivate' />\n" +
+                        "<Parameter ID='Field' Value='LiveMeeting' />\n" +
+                        "<Parameter ID='Field' Value='ShareDocPath' />\n" +
+                        "<Parameter ID='Field' Value='PhoneNo' />\n" +
+                        "<Parameter ID='Field' Value='ParticipantCode' />\n" +
+                    "</Parameters>\n" +
+                "</RequestAction>\n";
+
+                Debug.Console(2, this, "Sending Fusion ActionRequest: \n{0}", actionRequest);
+
+                FusionRoom.ExtenderFusionRoomDataReservedSigs.ActionQuery.StringValue = actionRequest;
+
+                GetCustomProperties();
+
+                // Request current Fusion Server Time
+                RequestLocalDateTime(null);
+
+                // Setup timer to request time daily
+                if (DailyTimeRequestTimer != null && !DailyTimeRequestTimer.Disposed)
+                {
+                    DailyTimeRequestTimer.Stop();
+                    DailyTimeRequestTimer.Dispose();
+                }
+
+                DailyTimeRequestTimer = new CTimer(RequestLocalDateTime, null, 86400000, 86400000);
+
+                DailyTimeRequestTimer.Reset(86400000, 86400000);
+            }
+
+        }
+
+        /// <summary>
+        /// Requests the local date and time from the Fusion Server
+        /// </summary>
+        /// <param name="callbackObject"></param>
+        public void RequestLocalDateTime(object callbackObject)
+        {
+            string timeRequestID = "TimeRequest";
+
+            string timeRequest = string.Format("<LocalTimeRequest><RequestID>{0}</RequestID></LocalTimeRequest>", timeRequestID);
+
+            FusionRoom.ExtenderFusionRoomDataReservedSigs.LocalDateTimeQuery.StringValue = timeRequest;
+        }
+
+        /// <summary>
+        /// Generates a room schedule request for this room for the next 24 hours.
+        /// </summary>
+        /// <param name="requestID">string identifying this request. Used with a corresponding ScheduleResponse value</param>
+        public void RequestFullRoomSchedule(object callbackObject)
+        {
+            DateTime now = DateTime.Today;
+
+            string currentTime = now.ToString("s");
+
+            string requestTest =
+                string.Format("<RequestSchedule><RequestID>FullSchedleRequest</RequestID><RoomID>{0}</RoomID><Start>{1}</Start><HourSpan>24</HourSpan></RequestSchedule>", RoomGuid, currentTime);
+
+            Debug.Console(2, this, "Sending Fusion ScheduleQuery: \n{0}", requestTest);
+
+            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.ScheduleQuery.StringValue = requestTest;
+
+            if (IsRegisteredForSchedulePushNotifications)
+                PushNotificationTimer.Stop();
+        }
+        
+        /// <summary>
+        /// Wrapper method to allow console commands to modify the current meeting end time
+        /// </summary>
+        /// <param name="command">meetingID extendTime</param>
+        public void ModifyMeetingEndTimeConsoleHelper(string command)
+        {
+            string requestID;
+            string meetingID = null;
+            int extendMinutes = -1;
+
+            requestID = "ModifyMeetingTest12345";
+
+            try
+            {
+                var tokens = command.Split(' ');
+
+                meetingID = tokens[0];
+                extendMinutes = Int32.Parse(tokens[1]);
+
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error parsing console command: {0}", e);
+            }
+
+            ModifyMeetingEndTime(requestID, extendMinutes);
+
+        }
+
+        /// <summary>
+        /// Ends or Extends the current meeting by the specified number of minutes.
+        /// </summary>
+        /// <param name="extendMinutes">Number of minutes to extend the meeting.  A value of 0 will end the meeting.</param>
+        public void ModifyMeetingEndTime(string requestID, int extendMinutes)
+        {
+            if(CurrentMeeting == null)
+            {
+                Debug.Console(1, this, "No meeting in progress.  Unable to modify end time.");
+                return;
+            }            
+
+            if (extendMinutes > -1)
+            {
+                if(extendMinutes > 0)
+                {
+                    var extendTime = CurrentMeeting.dtEnd - DateTime.Now;
+                    double extendMinutesRaw = extendTime.TotalMinutes;
+
+                    extendMinutes = extendMinutes + (int)Math.Round(extendMinutesRaw);
+                }
+
+
+                string requestTest = string.Format(
+                    "<RequestAction><RequestID>{0}</RequestID><RoomID>{1}</RoomID><ActionID>MeetingChange</ActionID><Parameters><Parameter ID = 'MeetingID' Value = '{2}' /><Parameter ID = 'EndTime' Value = '{3}' /></Parameters></RequestAction>"
+                    , requestID, RoomGuid, CurrentMeeting.MeetingID, extendMinutes);
+
+                Debug.Console(1, this, "Sending MeetingChange Request: \n{0}", requestTest);
+
+                FusionRoom.ExtenderFusionRoomDataReservedSigs.ActionQuery.StringValue = requestTest;
+            }
+            else
+            {
+                Debug.Console(1, this, "Invalid time specified");
+            }
+
+
+        }
+
+        /// <summary>
+        /// Creates and Ad Hoc meeting with a duration of 1 hour, or until the next meeting if in less than 1 hour.
+        /// </summary>
+        public void CreateAsHocMeeting(string command)
+        {
+            string requestID = "CreateAdHocMeeting";
+
+            DateTime now = DateTime.Now.AddMinutes(1);
+
+            now.AddSeconds(-now.Second);
+
+            // Assume 1 hour meeting if possible
+            DateTime dtEnd = now.AddHours(1);
+
+            // Check if room is available for 1 hour before next meeting
+            if (NextMeeting != null)
+            {
+                var roomAvailable = NextMeeting.dtEnd.Subtract(dtEnd);
+
+                if (roomAvailable.TotalMinutes < 60)
+                {
+                    /// Room not available for full hour, book until next meeting starts
+                    dtEnd = NextMeeting.dtEnd;
+                }
+            }
+
+            string createMeetingRequest = 
+                "<CreateSchedule>" +
+                    string.Format("<RequestID>{0}</RequestID>", requestID) +
+                    string.Format("<RoomID>{0}</RoomID>", RoomGuid) +
+                    "<Event>" +
+                        string.Format("<dtStart>{0}</dtStart>", now.ToString("s")) +
+                        string.Format("<dtEnd>{0}</dtEnd>", dtEnd.ToString("s")) +
+                        "<Subject>AdHoc Meeting</Subject>" +
+                        "<Organizer>Room User</Organizer>" +
+                        "<WelcomMsg>Example Message</WelcomMsg>" +
+                    "</Event>" +
+                "</CreateSchedule>";
+
+            Debug.Console(2, this, "Sending CreateMeeting Request: \n{0}", createMeetingRequest);
+
+            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = createMeetingRequest;
+
+            //Debug.Console(1, this, "Sending CreateMeeting Request: \n{0}", command);
+
+            //FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = command;
+
+        }
+
+        /// <summary>
+        /// Event handler method for Device Extender sig changes
+        /// </summary>
+        /// <param name="currentDeviceExtender"></param>
+        /// <param name="args"></param>
+        protected void ExtenderFusionRoomDataReservedSigs_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args)
+        {
+            Debug.Console(2, this, "Event: {0}\n Sig: {1}\nFusionResponse:\n{2}", args.Event, args.Sig.Name, args.Sig.StringValue);
+
+
+            if (args.Sig == FusionRoom.ExtenderFusionRoomDataReservedSigs.ActionQueryResponse)
+            {
+                try
+                {
+                    XmlDocument message = new XmlDocument();
+
+                    message.LoadXml(args.Sig.StringValue);
+
+                    var actionResponse = message["ActionResponse"];
+
+                    if (actionResponse != null)
+                    {
+                        var requestID = actionResponse["RequestID"];
+
+                        if (requestID.InnerText == "InitialPushRequest")
+                        {
+                            if (actionResponse["ActionID"].InnerText == "RegisterPushModel")
+                            {
+                                var parameters = actionResponse["Parameters"];
+
+                                foreach (XmlElement parameter in parameters)
+                                {
+                                    if (parameter.HasAttributes)
+                                    {
+                                        var attributes = parameter.Attributes;
+
+                                        if (attributes["ID"].Value == "Registered")
+                                        {
+                                            var isRegistered = Int32.Parse(attributes["Value"].Value);
+
+                                            if (isRegistered == 1)
+                                            {
+                                                IsRegisteredForSchedulePushNotifications = true;
+
+                                                if (PollTimer != null && !PollTimer.Disposed)
+                                                {
+                                                    PollTimer.Stop();
+                                                    PollTimer.Dispose();
+                                                }
+
+                                                PushNotificationTimer = new CTimer(RequestFullRoomSchedule, null, PushNotificationTimeout, PushNotificationTimeout);
+
+                                                PushNotificationTimer.Reset(PushNotificationTimeout, PushNotificationTimeout);
+                                            }
+                                            else if (isRegistered == 0)
+                                            {
+                                                IsRegisteredForSchedulePushNotifications = false;
+
+                                                if (PushNotificationTimer != null && !PushNotificationTimer.Disposed)
+                                                {
+                                                    PushNotificationTimer.Stop();
+                                                    PushNotificationTimer.Dispose();
+                                                }
+
+                                                PollTimer = new CTimer(RequestFullRoomSchedule, null, SchedulePollInterval, SchedulePollInterval);
+
+                                                PollTimer.Reset(SchedulePollInterval, SchedulePollInterval);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    Debug.Console(1, this, "Error parsing ActionQueryResponse: {0}", e);
+                }
+            }
+            else if (args.Sig == FusionRoom.ExtenderFusionRoomDataReservedSigs.LocalDateTimeQueryResponse)
+            {
+                try
+                {
+                    XmlDocument message = new XmlDocument();
+
+                    message.LoadXml(args.Sig.StringValue);
+
+                    var localDateTimeResponse = message["LocalTimeResponse"];
+
+                    if (localDateTimeResponse != null)
+                    {
+                        var localDateTime = localDateTimeResponse["LocalDateTime"];
+
+                        if (localDateTime != null)
+                        {
+                            var tempLocalDateTime = localDateTime.InnerText;
+                         
+                            DateTime currentTime = DateTime.Parse(tempLocalDateTime);
+
+                            Debug.Console(1, this, "DateTime from Fusion Server: {0}", currentTime);
+
+                            // Parse time and date from response and insert values
+                            CrestronEnvironment.SetTimeAndDate((ushort)currentTime.Hour, (ushort)currentTime.Minute, (ushort)currentTime.Second, (ushort)currentTime.Month, (ushort)currentTime.Day, (ushort)currentTime.Year);
+
+                            Debug.Console(1, this, "Processor time set to {0}", CrestronEnvironment.GetLocalTime());
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    Debug.Console(1, this, "Error parsing LocalDateTimeQueryResponse: {0}", e);
+                }
+            }
+            else if (args.Sig == FusionRoom.ExtenderFusionRoomDataReservedSigs.RoomConfigResponse)
+            {
+                // Room info response with custom properties
+
+                string roomConfigResponseArgs = args.Sig.StringValue.Replace("&", "and");
+
+                Debug.Console(2, this, "Fusion Response: \n {0}", roomConfigResponseArgs);
+
+                try
+                {
+                    XmlDocument roomConfigResponse = new XmlDocument();
+
+                    roomConfigResponse.LoadXml(roomConfigResponseArgs);
+
+                    var requestRoomConfiguration = roomConfigResponse["RoomConfigurationResponse"];
+
+                    if (requestRoomConfiguration != null)
+                    {
+                        RoomInformation roomInformation = new RoomInformation();
+
+                        foreach (XmlElement e in roomConfigResponse.FirstChild.ChildNodes)
+                        {
+                            if (e.Name == "RoomInformation")
+                            {
+                                XmlReader roomInfo = new XmlReader(e.OuterXml);
+
+                                roomInformation = CrestronXMLSerialization.DeSerializeObject<RoomInformation>(roomInfo);
+                            }
+                            else if (e.Name == "CustomFields")
+                            {
+                                foreach (XmlElement el in e)
+                                {
+                                    FusionCustomProperty customProperty = new FusionCustomProperty();
+
+                                    if (el.Name == "CustomField")
+                                    {
+                                        customProperty.ID = el.Attributes["ID"].Value;
+                                    }
+
+                                    foreach (XmlElement elm in el)
+                                    {
+                                        if (elm.Name == "CustomFieldName")
+                                        {
+                                            customProperty.CustomFieldName = elm.InnerText;
+                                        }
+                                        if (elm.Name == "CustomFieldType")
+                                        {
+                                            customProperty.CustomFieldType = elm.InnerText;
+                                        }
+                                        if (elm.Name == "CustomFieldValue")
+                                        {
+                                            customProperty.CustomFieldValue = elm.InnerText;
+                                        }
+                                    }
+
+                                    roomInformation.FusionCustomProperties.Add(customProperty);
+                                }
+                            }
+                        }
+
+                        var handler = RoomInfoChange;
+                        if (handler != null)
+                            handler(this, new EventArgs());
+
+                        CustomPropertiesBridge.EvaluateRoomInfo(Room.Key, roomInformation);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Debug.Console(1, this, "Error parsing Custom Properties response: {0}", e);
+                }
+                //PrintRoomInfo();
+                //getRoomInfoBusy = false;
+                //_DynFusion.API.EISC.BooleanInput[Constants.GetRoomInfo].BoolValue = getRoomInfoBusy;
+            }
+            
+        }
+
+        /// <summary>
+        /// Event handler method for Device Extender sig changes
+        /// </summary>
+        /// <param name="currentDeviceExtender"></param>
+        /// <param name="args"></param>
+        protected void FusionRoomSchedule_DeviceExtenderSigChange(DeviceExtender currentDeviceExtender, SigEventArgs args)
+        {
+           Debug.Console(2, this, "Scehdule Response Event: {0}\n Sig: {1}\nFusionResponse:\n{2}", args.Event, args.Sig.Name, args.Sig.StringValue);
+
+
+           if (args.Sig == FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.ScheduleResponse)
+           {
+               try
+               {
+                   ScheduleResponse scheduleResponse = new ScheduleResponse();
+
+                   XmlDocument message = new XmlDocument();
+
+                   message.LoadXml(args.Sig.StringValue);
+
+                   var response = message["ScheduleResponse"];
+
+                   if (response != null)
+                   {
+                       // Check for push notification
+                       if (response["RequestID"].InnerText == "RVRequest")
+                       {
+                           var action = response["Action"];
+
+                           if (action.OuterXml.IndexOf("RequestSchedule") > -1)
+                           {
+                               PushNotificationTimer.Reset(PushNotificationTimeout, PushNotificationTimeout);
+                           }
+                       }
+                       else    // Not a push notification
+                       {
+                           CurrentSchedule = new RoomSchedule();  // Clear Current Schedule
+                           CurrentMeeting = null;   // Clear Current Meeting
+                           NextMeeting = null;      // Clear Next Meeting
+
+                           bool isNextMeeting = false;
+
+                           foreach (XmlElement element in message.FirstChild.ChildNodes)
+                           {
+                               if (element.Name == "RequestID")
+                               {
+                                   scheduleResponse.RequestID = element.InnerText;
+                               }
+                               else if (element.Name == "RoomID")
+                               {
+                                   scheduleResponse.RoomID = element.InnerText;
+                               }
+                               else if (element.Name == "RoomName")
+                               {
+                                   scheduleResponse.RoomName = element.InnerText;
+                               }
+                               else if (element.Name == "Event")
+                               {
+                                   Debug.Console(2, this, "Event Found:\n{0}", element.OuterXml);
+
+                                   XmlReader reader = new XmlReader(element.OuterXml);
+
+                                   Event tempEvent = new Event();
+
+                                   tempEvent = CrestronXMLSerialization.DeSerializeObject<Event>(reader);
+
+                                   scheduleResponse.Events.Add(tempEvent);
+
+                                   // Check is this is the current event
+                                   if (tempEvent.dtStart <= DateTime.Now && tempEvent.dtEnd >= DateTime.Now)
+                                   {
+                                       CurrentMeeting = tempEvent;  // Set Current Meeting
+                                       isNextMeeting = true;        // Flag that next element is next meeting
+                                   }
+
+                                   if (isNextMeeting)
+                                   {
+                                       NextMeeting = tempEvent; // Set Next Meeting
+                                       isNextMeeting = false;
+                                   }
+
+                                   CurrentSchedule.Meetings.Add(tempEvent);
+                               }
+
+                           }
+
+                           PrintTodaysSchedule();
+
+                           if (!IsRegisteredForSchedulePushNotifications)
+                               PollTimer.Reset(SchedulePollInterval, SchedulePollInterval);
+
+                           // Fire Schedule Change Event 
+                           var handler = ScheduleChange;
+
+                           if (handler != null)
+                           {
+                               handler(this, new ScheduleChangeEventArgs() { Schedule = CurrentSchedule });
+                           }
+                           
+                       }
+                   }
+
+                   
+
+               }
+               catch (Exception e)
+               {
+                   Debug.Console(1, this, "Error parsing ScheduleResponse: {0}", e);
+               }
+           }
+           else if (args.Sig == FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateResponse)
+           {
+               Debug.Console(2, this, "Create Meeting Response Event: {0}\n Sig: {1}\nFusionResponse:\n{2}", args.Event, args.Sig.Name, args.Sig.StringValue);
+           }
+
+        }
+
+        /// <summary>
+        /// Prints today's schedule to console for debugging
+        /// </summary>
+        void PrintTodaysSchedule()
+        {
+            if (Debug.Level > 1)
+            {
+                if (CurrentSchedule.Meetings.Count > 0)
+                {
+                    Debug.Console(1, this, "Today's Schedule for '{0}'\n", Room.Name);
+
+                    foreach (Event e in CurrentSchedule.Meetings)
+                    {
+                        Debug.Console(1, this, "Subject: {0}", e.Subject);
+                        Debug.Console(1, this, "Organizer: {0}", e.Organizer);
+                        Debug.Console(1, this, "MeetingID: {0}", e.MeetingID);
+                        Debug.Console(1, this, "Start Time: {0}", e.dtStart);
+                        Debug.Console(1, this, "End Time: {0}", e.dtEnd);
+                        Debug.Console(1, this, "Duration: {0}\n", e.DurationInMinutes);
+                    }
+                }
+            }
+        }
+
+		protected virtual void SetUpSources()
+		{
+			// Sources
+            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleSpaceRoom).SourceListKey);
+			if (dict != null)
+			{
+				// NEW PROCESS:
+				// Make these lists and insert the fusion attributes by iterating these
+				var setTopBoxes = dict.Where(d => d.Value.SourceDevice is ISetTopBoxControls);
+				uint i = 1;
+				foreach (var kvp in setTopBoxes)
+				{
+					TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
+					i++;
+					if (i > 5) // We only have five spots
+						break;
+				}
+
+				var discPlayers = dict.Where(d => d.Value.SourceDevice is IDiscPlayerControls);
+				i = 1;
+				foreach (var kvp in discPlayers)
+				{
+                    TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
+					i++;
+					if (i > 5) // We only have five spots
+						break;
+				}
+
+				var laptops = dict.Where(d => d.Value.SourceDevice is Laptop);
+				i = 1;
+				foreach (var kvp in laptops)
+				{
+                    TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
+					i++;
+					if (i > 10) // We only have ten spots???
+						break;
+				}
+
+                foreach (var kvp in dict)
+                {
+                    var usageDevice = kvp.Value.SourceDevice as IUsageTracking;
+
+                    if (usageDevice != null)
+                    {
+                        usageDevice.UsageTracker = new UsageTracking(usageDevice as Device);
+                        usageDevice.UsageTracker.UsageIsTracked = true;
+                        usageDevice.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
+                    }
+                }
+				
+			}
+			else
+			{
+				Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
+                    (Room as EssentialsHuddleSpaceRoom).SourceListKey, Room.Key);
+			}
+		}
+
+        /// <summary>
+        /// Collects usage data from source and sends to Fusion
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void UsageTracker_DeviceUsageEnded(object sender, DeviceUsageEventArgs e)
+        {          
+            var deviceTracker = sender as UsageTracking;
+
+            var configDevice = ConfigReader.ConfigObject.Devices.Where(d => d.Key.Equals(deviceTracker.Parent));
+
+            string group = ConfigReader.GetGroupForDeviceKey(deviceTracker.Parent.Key);
+
+            string currentMeetingId = "-";
+
+            if (CurrentMeeting != null)
+                currentMeetingId = CurrentMeeting.MeetingID;
+
+            //String Format:  "USAGE||[Date YYYY-MM-DD]||[Time HH-mm-ss]||TIME||[Asset_Type]||[Asset_Name]||[Minutes_used]||[Asset_ID]||[Meeting_ID]"
+            // [Asset_ID] property does not appear to be used in Crestron SSI examples.  They are sending "-" instead so that's what is replicated here
+            string deviceUsage = string.Format("USAGE||{0}||{1}||TIME||{2}||{3}||-||{4}||-||{5}||{6}||\r\n", e.UsageEndTime.ToString("yyyy-MM-dd"), e.UsageEndTime.ToString("HH:mm:ss"),
+                group, deviceTracker.Parent.Name, e.MinutesUsed, "-", currentMeetingId);
+
+            Debug.Console(1, this, "Device usage for: {0} ended at {1}. In use for {2} minutes", deviceTracker.Parent.Name, e.UsageEndTime, e.MinutesUsed);
+
+            FusionRoom.DeviceUsage.InputSig.StringValue = deviceUsage;
+
+            Debug.Console(1, this, "Device usage string: {0}", deviceUsage);
+        }
+
+
+		protected void TryAddRouteActionSigs(string attrName, uint attrNum, string routeKey, Device pSrc)
+		{
+			Debug.Console(2, this, "Creating attribute '{0}' with join {1} for source {2}",
+				attrName, attrNum, pSrc.Key);
+			try
+			{
+				var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputOutputSig);
+				// Need feedback when this source is selected
+				// Event handler, added below, will compare source changes with this sig dict
+				SourceToFeedbackSigs.Add(pSrc, sigD.InputSig);
+
+				// And respond to selection in Fusion
+                sigD.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleSpaceRoom).RunRouteAction(routeKey));
+			}
+			catch (Exception)
+			{
+				Debug.Console(2, this, "Error creating Fusion signal {0} {1} for device '{2}'. THIS NEEDS REWORKING", attrNum, attrName, pSrc.Key);
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		void SetUpCommunitcationMonitors()
+		{
+            uint displayNum = 0;
+            uint touchpanelNum = 0;
+            uint xpanelNum = 0;
+
+			// Attach to all room's devices with monitors.
+			//foreach (var dev in DeviceManager.Devices)
+			foreach (var dev in DeviceManager.GetDevices())
+			{
+				if (!(dev is ICommunicationMonitor))
+					continue;
+
+                string attrName = null;
+                uint attrNum = 1;
+
+                //var keyNum = ExtractNumberFromKey(dev.Key);
+                //if (keyNum == -1)
+                //{
+                //    Debug.Console(1, this, "WARNING: Cannot link device '{0}' to numbered Fusion monitoring attributes",
+                //        dev.Key);
+                //    continue;
+                //}
+                //uint attrNum = Convert.ToUInt32(keyNum);
+
+                // Check for UI devices
+                var uiDev = dev as EssentialsTouchpanelController;
+                if (uiDev != null)
+                {
+                    if (uiDev.Panel is Crestron.SimplSharpPro.UI.XpanelForSmartGraphics)
+                    {
+                        attrNum = attrNum + touchpanelNum;
+
+                        if (attrNum > 10)
+                            continue;
+                        attrName = "Online - XPanel " + attrNum;
+                        attrNum += 160;
+
+                        touchpanelNum++;
+                    }
+                    else
+                    {
+                        attrNum = attrNum + xpanelNum;
+
+                        if (attrNum > 10)
+                            continue;
+                        attrName = "Online - Touch Panel " + attrNum;
+                        attrNum += 150;
+
+                        xpanelNum++;
+                    }
+                }
+
+				//else 
+				if (dev is DisplayBase)
+				{
+                    attrNum = attrNum + displayNum; 
+					if (attrNum > 10)
+						continue;
+					attrName = "Online - Display " + attrNum;
+					attrNum += 170;
+
+                    displayNum++;
+				}
+				//else if (dev is DvdDeviceBase)
+				//{
+				//    if (attrNum > 5)
+				//        continue;
+				//    attrName = "Device Ok - DVD " + attrNum;
+				//    attrNum += 260;
+				//}
+				// add set top box
+
+				// add Cresnet roll-up
+
+				// add DM-devices roll-up
+
+				if (attrName != null)
+				{
+					// Link comm status to sig and update
+					var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputSigOnly);
+					var smd = dev as ICommunicationMonitor;
+					sigD.InputSig.BoolValue = smd.CommunicationMonitor.Status == MonitorStatus.IsOk;
+					smd.CommunicationMonitor.StatusChange += (o, a) =>
+					{ sigD.InputSig.BoolValue = a.Status == MonitorStatus.IsOk; };
+					Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", dev.Key, attrName);
+				}
+			}
+		}
+
+		protected virtual void SetUpDisplay()
+		{
+            try
+            {
+                //Setup Display Usage Monitoring
+
+                var displays = DeviceManager.AllDevices.Where(d => d is DisplayBase);
+
+                //  Consider updating this in multiple display systems
+
+                foreach (DisplayBase display in displays)
+                {
+                    display.UsageTracker = new UsageTracking(display);
+                    display.UsageTracker.UsageIsTracked = true;
+                    display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
+                }
+
+                var defaultDisplay = (Room as EssentialsHuddleSpaceRoom).DefaultDisplay as DisplayBase;
+                if (defaultDisplay == null)
+                {
+                    Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
+                    return;
+                }
+
+                var dispPowerOnAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOn(); });
+                var dispPowerOffAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOff(); });
+
+                // Display to fusion room sigs
+                FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
+                FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
+                defaultDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
+                if (defaultDisplay is IDisplayUsage)
+                    (defaultDisplay as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
+
+
+
+                MapDisplayToRoomJoins(1, 158, defaultDisplay);
+
+
+                var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(defaultDisplay.Key));
+
+                //Check for existing asset in GUIDs collection
+
+                var tempAsset = new FusionAsset();
+
+                if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
+                {
+                    tempAsset = FusionStaticAssets[deviceConfig.Uid];
+                }
+                else
+                {
+                    // Create a new asset
+                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), defaultDisplay.Name, "Display", "");
+                    FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
+                }
+
+                var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display", tempAsset.InstanceId);
+                dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
+                dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
+                defaultDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
+                // NO!! display.PowerIsOn.LinkComplementInputSig(dispAsset.PowerOff.InputSig);
+                // Use extension methods
+                dispAsset.TrySetMakeModel(defaultDisplay);
+                dispAsset.TryLinkAssetErrorToCommunication(defaultDisplay);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error setting up display in Fusion: {0}", e);
+            }
+            
+		}
+
+        /// <summary>
+        /// Maps room attributes to a display at a specified index
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="display"></param>a
+        protected virtual void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
+        {
+            string displayName = string.Format("Display {0} - ", displayIndex);
+
+
+            if (display == (Room as EssentialsHuddleSpaceRoom).DefaultDisplay)
+            {
+                // Display volume
+                var defaultDisplayVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
+                defaultDisplayVolume.OutputSig.UserObject = new Action<ushort>(b => (display as IBasicVolumeWithFeedback).SetVolume(b));
+                (display as IBasicVolumeWithFeedback).VolumeLevelFeedback.LinkInputSig(defaultDisplayVolume.InputSig);
+
+                // Power on
+                var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
+                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOn(); });
+                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
+
+                // Power Off
+                var defaultDisplayPowerOff = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 1, displayName + "Power Off", eSigIoMask.InputOutputSig);
+                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOff(); }); ;
+                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
+
+                // Current Source
+                var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff"); }); ;
+            }
+        }
+
+		void SetUpError()
+		{
+			// Roll up ALL device errors
+			ErrorMessageRollUp = new StatusMonitorCollection(this);
+			foreach (var dev in DeviceManager.GetDevices())
+			{
+				var md = dev as ICommunicationMonitor;
+				if (md != null)
+				{
+					ErrorMessageRollUp.AddMonitor(md.CommunicationMonitor);
+					Debug.Console(2, this, "Adding '{0}' to room's overall error monitor", md.CommunicationMonitor.Parent.Key);
+				}
+			}
+			ErrorMessageRollUp.Start();
+			FusionRoom.ErrorMessage.InputSig.StringValue = ErrorMessageRollUp.Message;
+			ErrorMessageRollUp.StatusChange += (o, a) =>
+			{
+				FusionRoom.ErrorMessage.InputSig.StringValue = ErrorMessageRollUp.Message;
+			};
+
+		}
+
+        /// <summary>
+        /// Sets up a local occupancy sensor, such as one attached to a Fusion Scheduling panel.  The occupancy status of the room will be read from Fusion
+        /// </summary>
+        void SetUpLocalOccupancy()
+        {
+            RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
+
+            FusionRoom.FusionAssetStateChange += new FusionAssetStateEventHandler(FusionRoom_FusionAssetStateChange);
+
+            // Build Occupancy Asset?
+            // Link sigs?
+
+            //Room.SetRoomOccupancy(this as IOccupancyStatusProvider, 0);
+
+
+        }
+
+        void FusionRoom_FusionAssetStateChange(FusionBase device, FusionAssetStateEventArgs args)
+        {
+            if (args.EventId == FusionAssetEventId.RoomOccupiedReceivedEventId || args.EventId == FusionAssetEventId.RoomUnoccupiedReceivedEventId)
+                RoomIsOccupiedFeedback.FireUpdate();
+
+        }
+
+        /// <summary>
+        /// Sets up remote occupancy that will relay the occupancy status determined by local system devices to Fusion
+        /// </summary>
+        void SetUpRemoteOccupancy()
+        { 
+
+            //  Need to have the room occupancy object first and somehow determine the slot number of the Occupancy asset but will not be able to use the UID from config likely.
+            //  Consider defining an object just for Room Occupancy (either eAssetType.Occupancy Sensor (local) or eAssetType.RemoteOccupancySensor (from Fusion sched. panel)) and reserving slot 4 for that asset (statics would start at 5)
+
+            //if (Room.OccupancyObj != null)
+            //{ 
+
+                var tempOccAsset = GUIDs.OccupancyAsset;
+                
+                if(tempOccAsset == null)
+                {
+                    FusionOccSensor = new FusionOccupancySensorAsset(eAssetType.OccupancySensor);
+                    tempOccAsset = FusionOccSensor;
+                }
+
+                var occSensorAsset = FusionRoom.CreateOccupancySensorAsset(tempOccAsset.SlotNumber, tempOccAsset.Name, "Occupancy Sensor", tempOccAsset.InstanceId);
+
+                occSensorAsset.RoomOccupied.AddSigToRVIFile = true;
+
+                var occSensorShutdownMinutes = FusionRoom.CreateOffsetUshortSig(70, "Occ Shutdown - Minutes", eSigIoMask.InputOutputSig);
+                
+                // Tie to method on occupancy object
+                //occSensorShutdownMinutes.OutputSig.UserObject(new Action(ushort)(b => Room.OccupancyObj.SetShutdownMinutes(b));
+                
+
+                Room.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
+            //}
+        }
+
+		/// <summary>
+		/// Helper to get the number from the end of a device's key string
+		/// </summary>
+		/// <returns>-1 if no number matched</returns>
+		int ExtractNumberFromKey(string key)
+		{
+            var capture = System.Text.RegularExpressions.Regex.Match(key, @"\b(\d+)");
+			if (!capture.Success)
+				return -1;
+			else return Convert.ToInt32(capture.Groups[1].Value);
+		}
+
+		/// <summary>
+		/// Event handler for when room source changes
+		/// </summary>
+		protected void Room_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
+		{
+			// Handle null. Nothing to do when switching from or to null
+			if (info == null || info.SourceDevice == null)
+				return;
+
+			var dev = info.SourceDevice;
+			if (type == ChangeType.WillChange)
+			{
+				if (SourceToFeedbackSigs.ContainsKey(dev))
+					SourceToFeedbackSigs[dev].BoolValue = false;
+			}
+			else
+			{
+				if (SourceToFeedbackSigs.ContainsKey(dev))
+					SourceToFeedbackSigs[dev].BoolValue = true;
+				var name = (room == null ? "" : room.Name);
+				CurrentRoomSourceNameSig.InputSig.StringValue = info.SourceDevice.Name;
+			}
+		}
+
+		protected void FusionRoom_FusionStateChange(FusionBase device, FusionStateEventArgs args)
+		{
+
+			// The sig/UO method: Need separate handlers for fixed and user sigs, all flavors, 
+			// even though they all contain sigs.
+
+			var sigData = (args.UserConfiguredSigDetail as BooleanSigDataFixedName);
+			if (sigData != null)
+			{
+				var outSig = sigData.OutputSig;
+				if (outSig.UserObject is Action<bool>)
+					(outSig.UserObject as Action<bool>).Invoke(outSig.BoolValue);
+				else if (outSig.UserObject is Action<ushort>)
+					(outSig.UserObject as Action<ushort>).Invoke(outSig.UShortValue);
+				else if (outSig.UserObject is Action<string>)
+					(outSig.UserObject as Action<string>).Invoke(outSig.StringValue);
+				return;
+			}
+
+			var attrData = (args.UserConfiguredSigDetail as BooleanSigData);
+			if (attrData != null)
+			{
+				var outSig = attrData.OutputSig;
+				if (outSig.UserObject is Action<bool>)
+					(outSig.UserObject as Action<bool>).Invoke(outSig.BoolValue);
+				else if (outSig.UserObject is Action<ushort>)
+					(outSig.UserObject as Action<ushort>).Invoke(outSig.UShortValue);
+				else if (outSig.UserObject is Action<string>)
+					(outSig.UserObject as Action<string>).Invoke(outSig.StringValue);
+				return;
+			}
+
+		}
+	}
+
+
+	public static class FusionRoomExtensions
+	{
+		/// <summary>
+		/// Creates and returns a fusion attribute. The join number will match the established Simpl
+		/// standard of 50+, and will generate a 50+ join in the RVI. It calls
+		/// FusionRoom.AddSig with join number - 49
+		/// </summary>
+		/// <returns>The new attribute</returns>
+		public static BooleanSigData CreateOffsetBoolSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
+		{
+			if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
+			number -= 49;
+			fr.AddSig(eSigType.Bool, number, name, mask);
+			return fr.UserDefinedBooleanSigDetails[number];
+		}
+
+		/// <summary>
+		/// Creates and returns a fusion attribute. The join number will match the established Simpl
+		/// standard of 50+, and will generate a 50+ join in the RVI. It calls
+		/// FusionRoom.AddSig with join number - 49
+		/// </summary>
+		/// <returns>The new attribute</returns>
+		public static UShortSigData CreateOffsetUshortSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
+		{
+			if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
+			number -= 49;
+			fr.AddSig(eSigType.UShort, number, name, mask);
+			return fr.UserDefinedUShortSigDetails[number];
+		}
+
+		/// <summary>
+		/// Creates and returns a fusion attribute. The join number will match the established Simpl
+		/// standard of 50+, and will generate a 50+ join in the RVI. It calls
+		/// FusionRoom.AddSig with join number - 49
+		/// </summary>
+		/// <returns>The new attribute</returns>
+		public static StringSigData CreateOffsetStringSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
+		{
+			if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
+			number -= 49;
+			fr.AddSig(eSigType.String, number, name, mask);
+			return fr.UserDefinedStringSigDetails[number];
+		}
+
+		/// <summary>
+		/// Creates and returns a static asset
+		/// </summary>
+		/// <returns>the new asset</returns>
+		public static FusionStaticAsset CreateStaticAsset(this FusionRoom fr, uint number, string name, string type, string instanceId)
+		{            
+            Debug.Console(0, "Adding Fusion Static Asset '{0}' to slot {1} with GUID: '{2}'", name, number, instanceId);
+
+			fr.AddAsset(eAssetType.StaticAsset, number, name, type, instanceId);
+			return fr.UserConfigurableAssetDetails[number].Asset as FusionStaticAsset;
+		}
+
+        public static FusionOccupancySensor CreateOccupancySensorAsset(this FusionRoom fr, uint number, string name, string type, string instanceId)
+        {
+            Debug.Console(0, "Adding Fusion Occupancy Sensor Asset '{0}' to slot {1} with GUID: '{2}'", name, number, instanceId);
+
+            fr.AddAsset(eAssetType.OccupancySensor, number, name, type, instanceId);
+            return fr.UserConfigurableAssetDetails[number].Asset as FusionOccupancySensor;
+        }
+	}
+
+	//************************************************************************************************
+	/// <summary>
+	/// Extensions to enhance Fusion room, asset and signal creation.
+	/// </summary>
+	public static class FusionStaticAssetExtensions
+	{
+		/// <summary>
+		/// Tries to set a Fusion asset with the make and model of a device.
+		/// If the provided Device is IMakeModel, will set the corresponding parameters on the fusion static asset.
+		/// Otherwise, does nothing.
+		/// </summary>
+		public static void TrySetMakeModel(this FusionStaticAsset asset, Device device)
+		{
+			var mm = device as IMakeModel;
+			if (mm != null)
+			{
+				asset.ParamMake.Value = mm.DeviceMake;
+				asset.ParamModel.Value = mm.DeviceModel;
+			}
+		}
+
+		/// <summary>
+		/// Tries to attach the AssetError input on a Fusion asset to a Device's
+		/// CommunicationMonitor.StatusChange event. Does nothing if the device is not 
+		/// IStatusMonitor
+		/// </summary>
+		/// <param name="asset"></param>
+		/// <param name="device"></param>
+		public static void TryLinkAssetErrorToCommunication(this FusionStaticAsset asset, Device device)
+		{
+			if (device is ICommunicationMonitor)
+			{
+				var monitor = (device as ICommunicationMonitor).CommunicationMonitor;
+				monitor.StatusChange += (o, a) =>
+				{
+					// Link connected and error inputs on asset
+					asset.Connected.InputSig.BoolValue = a.Status == MonitorStatus.IsOk;
+					asset.AssetError.InputSig.StringValue = a.Status.ToString();
+				};
+				// set current value
+				asset.Connected.InputSig.BoolValue = monitor.Status == MonitorStatus.IsOk;
+				asset.AssetError.InputSig.StringValue = monitor.Status.ToString();
+			}
+		}
+	}
+
+    public class RoomInformation
+    {
+        public string ID { get; set; }
+        public string Name { get; set; }
+        public string Location { get; set; }
+        public string Description { get; set; }
+        public string TimeZone { get; set; }
+        public string WebcamURL { get; set; }
+        public string BacklogMsg { get; set; }
+        public string SubErrorMsg { get; set; }
+        public string EmailInfo { get; set; }
+        public List<FusionCustomProperty> FusionCustomProperties { get; set; }
+
+        public RoomInformation()
+        {
+            FusionCustomProperties = new List<FusionCustomProperty>();
+        }
+    }
+    public class FusionCustomProperty
+    {
+        public string ID { get; set; }
+        public string CustomFieldName { get; set; }
+        public string CustomFieldType { get; set; }
+        public string CustomFieldValue { get; set; }
+
+        public FusionCustomProperty()
+        {
+
+        }
+
+        public FusionCustomProperty(string id)
+        {
+            ID = id;
+        }
+    }
 }
\ No newline at end of file
diff --git a/PepperDashEssentials/OTHER/Fusion/EssentialsHuddleVtc1FusionController.cs b/PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/EssentialsHuddleVtc1FusionController.cs
similarity index 100%
rename from PepperDashEssentials/OTHER/Fusion/EssentialsHuddleVtc1FusionController.cs
rename to PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/EssentialsHuddleVtc1FusionController.cs
diff --git a/PepperDashEssentials/OTHER/Fusion/FusionCustomPropertiesBridge.cs b/PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionCustomPropertiesBridge.cs
similarity index 98%
rename from PepperDashEssentials/OTHER/Fusion/FusionCustomPropertiesBridge.cs
rename to PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionCustomPropertiesBridge.cs
index ea04a73d..b5704b40 100644
--- a/PepperDashEssentials/OTHER/Fusion/FusionCustomPropertiesBridge.cs
+++ b/PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionCustomPropertiesBridge.cs	
@@ -1,119 +1,119 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Room.Behaviours;
-
-namespace PepperDash.Essentials.Fusion
-{
-    /// <summary>
-    /// Handles mapping Fusion Custom Property values to system properties
-    /// </summary>
-    public class FusionCustomPropertiesBridge
-    {
-
-        /// <summary>
-        /// Evaluates the room info and custom properties from Fusion and updates the system properties aa needed
-        /// </summary>
-        /// <param name="roomInfo"></param>
-        public void EvaluateRoomInfo(string roomKey, RoomInformation roomInfo)
-        {
-            try
-            {
-                var reconfigurableDevices = DeviceManager.AllDevices.Where(d => d is ReconfigurableDevice);
-
-                foreach (var device in reconfigurableDevices)
-                {
-                    // Get the current device config so new values can be overwritten over existing
-                    var deviceConfig = (device as ReconfigurableDevice).Config;
-
-                    if (device is RoomOnToDefaultSourceWhenOccupied)
-                    {
-                        Debug.Console(1, "Mapping Room on via Occupancy values from Fusion");
-
-                        var devProps = JsonConvert.DeserializeObject<RoomOnToDefaultSourceWhenOccupiedConfig>(deviceConfig.Properties.ToString());
-
-                        var enableFeature = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupied"));
-                        if (enableFeature != null)
-                            devProps.EnableRoomOnWhenOccupied = bool.Parse(enableFeature.CustomFieldValue);
-
-                        var enableTime = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomOnWhenOccupiedStartTime"));
-                        if (enableTime != null)
-                            devProps.OccupancyStartTime = enableTime.CustomFieldValue;
-
-                        var disableTime = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomOnWhenOccupiedEndTime"));
-                        if (disableTime != null)
-                            devProps.OccupancyEndTime = disableTime.CustomFieldValue;
-
-                        var enableSunday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedSun"));
-                        if (enableSunday != null)
-                            devProps.EnableSunday = bool.Parse(enableSunday.CustomFieldValue);
-
-                        var enableMonday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedMon"));
-                        if (enableMonday != null)
-                            devProps.EnableMonday = bool.Parse(enableMonday.CustomFieldValue);
-
-                        var enableTuesday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedTue"));
-                        if (enableTuesday != null)
-                            devProps.EnableTuesday = bool.Parse(enableTuesday.CustomFieldValue);
-
-                        var enableWednesday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedWed"));
-                        if (enableWednesday != null)
-                            devProps.EnableWednesday = bool.Parse(enableWednesday.CustomFieldValue);
-
-                        var enableThursday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedThu"));
-                        if (enableThursday != null)
-                            devProps.EnableThursday = bool.Parse(enableThursday.CustomFieldValue);
-
-                        var enableFriday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedFri"));
-                        if (enableFriday != null)
-                            devProps.EnableFriday = bool.Parse(enableFriday.CustomFieldValue);
-
-                        var enableSaturday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedSat"));
-                        if (enableSaturday != null)
-                            devProps.EnableSaturday = bool.Parse(enableSaturday.CustomFieldValue);
-
-                        deviceConfig.Properties = JToken.FromObject(devProps);
-                    }
-                    else if (device is EssentialsRoomBase)
-                    {
-                        // Set the room name
-                        if (!string.IsNullOrEmpty(roomInfo.Name))
-                        {
-                            Debug.Console(1, "Current Room Name: {0}. New Room Name: {1}", deviceConfig.Name, roomInfo.Name);
-                            // Set the name in config
-                            deviceConfig.Name = roomInfo.Name;
-
-                            Debug.Console(1, "Room Name Successfully Changed.");
-                        }
-
-                        // Set the help message
-                        var helpMessage = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomHelpMessage"));
-                        if (helpMessage != null)
-                        {
-                            //Debug.Console(1, "Current Help Message: {0}. New Help Message: {1}", deviceConfig.Properties["help"]["message"].Value<string>(ToString()), helpMessage.CustomFieldValue);
-                            deviceConfig.Properties["helpMessage"] = (string)helpMessage.CustomFieldValue;
-                        }
-                    }
-
-                    // Set the config on the device
-                    (device as ReconfigurableDevice).SetConfig(deviceConfig);
-                }
-
-
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, "FusionCustomPropetiesBridge: Error mapping properties: {0}", e);
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Room.Behaviours;
+
+namespace PepperDash.Essentials.Fusion
+{
+    /// <summary>
+    /// Handles mapping Fusion Custom Property values to system properties
+    /// </summary>
+    public class FusionCustomPropertiesBridge
+    {
+
+        /// <summary>
+        /// Evaluates the room info and custom properties from Fusion and updates the system properties aa needed
+        /// </summary>
+        /// <param name="roomInfo"></param>
+        public void EvaluateRoomInfo(string roomKey, RoomInformation roomInfo)
+        {
+            try
+            {
+                var reconfigurableDevices = DeviceManager.AllDevices.Where(d => d is ReconfigurableDevice);
+
+                foreach (var device in reconfigurableDevices)
+                {
+                    // Get the current device config so new values can be overwritten over existing
+                    var deviceConfig = (device as ReconfigurableDevice).Config;
+
+                    if (device is RoomOnToDefaultSourceWhenOccupied)
+                    {
+                        Debug.Console(1, "Mapping Room on via Occupancy values from Fusion");
+
+                        var devProps = JsonConvert.DeserializeObject<RoomOnToDefaultSourceWhenOccupiedConfig>(deviceConfig.Properties.ToString());
+
+                        var enableFeature = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupied"));
+                        if (enableFeature != null)
+                            devProps.EnableRoomOnWhenOccupied = bool.Parse(enableFeature.CustomFieldValue);
+
+                        var enableTime = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomOnWhenOccupiedStartTime"));
+                        if (enableTime != null)
+                            devProps.OccupancyStartTime = enableTime.CustomFieldValue;
+
+                        var disableTime = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomOnWhenOccupiedEndTime"));
+                        if (disableTime != null)
+                            devProps.OccupancyEndTime = disableTime.CustomFieldValue;
+
+                        var enableSunday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedSun"));
+                        if (enableSunday != null)
+                            devProps.EnableSunday = bool.Parse(enableSunday.CustomFieldValue);
+
+                        var enableMonday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedMon"));
+                        if (enableMonday != null)
+                            devProps.EnableMonday = bool.Parse(enableMonday.CustomFieldValue);
+
+                        var enableTuesday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedTue"));
+                        if (enableTuesday != null)
+                            devProps.EnableTuesday = bool.Parse(enableTuesday.CustomFieldValue);
+
+                        var enableWednesday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedWed"));
+                        if (enableWednesday != null)
+                            devProps.EnableWednesday = bool.Parse(enableWednesday.CustomFieldValue);
+
+                        var enableThursday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedThu"));
+                        if (enableThursday != null)
+                            devProps.EnableThursday = bool.Parse(enableThursday.CustomFieldValue);
+
+                        var enableFriday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedFri"));
+                        if (enableFriday != null)
+                            devProps.EnableFriday = bool.Parse(enableFriday.CustomFieldValue);
+
+                        var enableSaturday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedSat"));
+                        if (enableSaturday != null)
+                            devProps.EnableSaturday = bool.Parse(enableSaturday.CustomFieldValue);
+
+                        deviceConfig.Properties = JToken.FromObject(devProps);
+                    }
+                    else if (device is EssentialsRoomBase)
+                    {
+                        // Set the room name
+                        if (!string.IsNullOrEmpty(roomInfo.Name))
+                        {
+                            Debug.Console(1, "Current Room Name: {0}. New Room Name: {1}", deviceConfig.Name, roomInfo.Name);
+                            // Set the name in config
+                            deviceConfig.Name = roomInfo.Name;
+
+                            Debug.Console(1, "Room Name Successfully Changed.");
+                        }
+
+                        // Set the help message
+                        var helpMessage = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomHelpMessage"));
+                        if (helpMessage != null)
+                        {
+                            //Debug.Console(1, "Current Help Message: {0}. New Help Message: {1}", deviceConfig.Properties["help"]["message"].Value<string>(ToString()), helpMessage.CustomFieldValue);
+                            deviceConfig.Properties["helpMessage"] = (string)helpMessage.CustomFieldValue;
+                        }
+                    }
+
+                    // Set the config on the device
+                    (device as ReconfigurableDevice).SetConfig(deviceConfig);
+                }
+
+
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, "FusionCustomPropetiesBridge: Error mapping properties: {0}", e);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/PepperDashEssentials/OTHER/Fusion/FusionEventHandlers.cs b/PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionEventHandlers.cs
similarity index 100%
rename from PepperDashEssentials/OTHER/Fusion/FusionEventHandlers.cs
rename to PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionEventHandlers.cs
diff --git a/PepperDashEssentials/OTHER/Fusion/FusionProcessorQueries.cs b/PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionProcessorQueries.cs
similarity index 100%
rename from PepperDashEssentials/OTHER/Fusion/FusionProcessorQueries.cs
rename to PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionProcessorQueries.cs
diff --git a/PepperDashEssentials/OTHER/Fusion/FusionRviDataClasses.cs b/PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionRviDataClasses.cs
similarity index 100%
rename from PepperDashEssentials/OTHER/Fusion/FusionRviDataClasses.cs
rename to PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionRviDataClasses.cs
diff --git a/PepperDashEssentials/OTHER/Fusion/FusionSystemController.cs.orig b/PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionSystemController.cs.orig
similarity index 100%
rename from PepperDashEssentials/OTHER/Fusion/FusionSystemController.cs.orig
rename to PepperDashEssentials/FOR REFERENCE UI/OTHER/Fusion/FusionSystemController.cs.orig
diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj
index 26305d2f..6957f8c5 100644
--- a/PepperDashEssentials/PepperDashEssentials.csproj
+++ b/PepperDashEssentials/PepperDashEssentials.csproj
@@ -110,6 +110,7 @@
   <ItemGroup>
     <Compile Include="AppServer\Messengers\AtcDdvc01Messenger.cs" />
     <Compile Include="AppServer\Messengers\MessengerBase.cs" />
+    <Compile Include="AppServer\Messengers\SystemMonitorMessenger.cs" />
     <Compile Include="AppServer\Messengers\VideoCodecBaseMessenger.cs" />
     <Compile Include="Audio\EssentialsVolumeLevelConfig.cs" />
     <Compile Include="Bridges\BridgeBase.cs" />
@@ -142,13 +143,13 @@
     <Compile Include="Devices\NUMERIC AppleTV.cs" />
     <Compile Include="ControlSystem.cs" />
     <Compile Include="Factory\UiDeviceFactory.cs" />
-    <Compile Include="OTHER\Fusion\EssentialsHuddleVtc1FusionController.cs" />
-    <Compile Include="OTHER\Fusion\FusionCustomPropertiesBridge.cs" />
-    <Compile Include="OTHER\Fusion\FusionEventHandlers.cs" />
-    <Compile Include="OTHER\Fusion\FusionProcessorQueries.cs" />
-    <Compile Include="OTHER\Fusion\FusionRviDataClasses.cs" />
+    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\EssentialsHuddleVtc1FusionController.cs" />
+    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionCustomPropertiesBridge.cs" />
+    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionEventHandlers.cs" />
+    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionProcessorQueries.cs" />
+    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionRviDataClasses.cs" />
     <Compile Include="REMOVE EssentialsApp.cs" />
-    <Compile Include="OTHER\Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" />
+    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" />
     <Compile Include="HttpApiHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
diff --git a/essentials-framework b/essentials-framework
index 67ab8aa6..3d81472a 160000
--- a/essentials-framework
+++ b/essentials-framework
@@ -1 +1 @@
-Subproject commit 67ab8aa632bebc2a8a80621ef7d1e4c806efc6b8
+Subproject commit 3d81472afdcf8713ec92c44d9a1521bfb2261738