feat: wip commit prior to removing the crestron library

.config/dotnet-tools.json

@@ -1,13 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "csharpier": {
-      "version": "1.2.4",
-      "commands": [
-        "csharpier"
-      ],
-      "rollForward": false
-    }
-  }
-}

.gitignore

@@ -395,5 +395,3 @@ essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Pepp
 _site/
 api/
 *.DS_Store
-/._PepperDash.Essentials.4Series.sln
-dotnet

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.19.4-local</Version>
+    <Version>2.4.0-local</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technology</Authors>
     <Company>PepperDash Technology</Company>

src/Directory.Build.targets

@@ -23,32 +23,23 @@
     <FileName>$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz</FileName>
   </PropertyGroup>
 
-  <Target Name="DeleteCLZ" BeforeTargets="CoreBuild" Condition="$(ProjectType) == 'Library' And $(TargetDir) != ''">
-    <ItemGroup>
-      <OldCLZFiles Include="$(TargetDir)$(TargetName).*.$(TargetFramework).clz" />
-    </ItemGroup>
-    <Delete Files="@(OldCLZFiles)" Condition="@(OldCLZFiles) != ''">
+  <Target Name="DeleteCLZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'Library' And $(TargetDir) != '' And Exists($(FileName))">
+    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).clz">
       <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
     </Delete>
-    <Message Text="Deleted old CLZ files: '@(DeletedList)'" Condition="@(DeletedList) != ''" />
+    <Message Text="Deleted files: '@(DeletedList)'" />
   </Target>
-  <Target Name="DeleteCPZ" BeforeTargets="CoreBuild" Condition="$(ProjectType) == 'Program' And $(TargetDir) != ''">
-    <ItemGroup>
-      <OldCPZFiles Include="$(TargetDir)$(TargetName).*.$(TargetFramework).cpz" />
-    </ItemGroup>
-    <Delete Files="@(OldCPZFiles)" Condition="@(OldCPZFiles) != ''">
+  <Target Name="DeleteCPZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'Program' And $(TargetDir) != '' And Exists($(FileName))">
+    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz">
       <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
     </Delete>
-    <Message Text="Deleted old CPZ files: '@(DeletedList)'" Condition="@(DeletedList) != ''" />
+    <Message Text="Deleted files: '@(DeletedList)'" />
   </Target>
-  <Target Name="DeleteCPLZ" BeforeTargets="CoreBuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
-    <ItemGroup>
-      <OldCPLZFiles Include="$(TargetDir)$(TargetName).*.$(TargetFramework).cplz" />
-    </ItemGroup>
-    <Delete Files="@(OldCPLZFiles)" Condition="@(OldCPLZFiles) != ''">
+  <Target Name="DeleteCPLZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != '' And Exists($(FileName))">
+    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz">
       <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
     </Delete>
-    <Message Text="Deleted old CPLZ files: '@(DeletedList)'" Condition="@(DeletedList) != ''" />
+    <Message Text="Deleted files: '@(DeletedList)'" />
   </Target>
   
   <Target Name="CreateCPLZ" AfterTargets="Build" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''" DependsOnTargets="DeleteCPLZ">

src/PepperDash.Core/ComTextHelper.cs

@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace PepperDash.Core
-{
-  /// <summary>
-  /// Helper class for formatting communication text and byte data for debugging purposes.
-  /// </summary>
-  public class ComTextHelper
-  {
-    /// <summary>
-    /// Gets escaped text for a byte array
-    /// </summary>
-    /// <param name="bytes"></param>
-    /// <returns>string with all bytes escaped</returns>
-    public static string GetEscapedText(byte[] bytes)
-    {
-      return string.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
-    }
-
-    /// <summary>
-    /// Gets escaped text for a string
-    /// </summary>
-    /// <param name="text"></param>
-    /// <returns>string with all bytes escaped</returns>
-    public static string GetEscapedText(string text)
-    {
-      var bytes = Encoding.GetEncoding(28591).GetBytes(text);
-      return string.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
-    }
-
-    /// <summary>
-    /// Gets debug text for a string
-    /// </summary>
-    /// <param name="text"></param>
-    /// <returns>string with all non-printable characters escaped</returns>
-    public static string GetDebugText(string text)
-    {
-      return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
-    }
-  }
-}

src/PepperDash.Core/Comm/CommunicationGather.cs

@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
 
 using PepperDash.Core;
 
 
-namespace PepperDash.Core
+namespace PepperDash.Essentials.Core.Communications
 {
 	/// <summary>
 	/// Defines the string event handler for line events on the gather

src/PepperDash.Core/Comm/CommunicationStreamDebugging.cs

@@ -1,8 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using PepperDash.Core;
 
 namespace PepperDash.Core
 {
@@ -36,14 +36,14 @@ namespace PepperDash.Core
         {
             get
             {
-                return _DebugTimeoutInMs / 60000;
+                return _DebugTimeoutInMs/60000;
             }
         }
 
         /// <summary>
         /// Gets or sets the RxStreamDebuggingIsEnabled
         /// </summary>
-        public bool RxStreamDebuggingIsEnabled { get; private set; }
+        public bool RxStreamDebuggingIsEnabled{ get; private set; }
 
         /// <summary>
         /// Indicates that transmit stream debugging is enabled
@@ -107,7 +107,7 @@ namespace PepperDash.Core
                 TxStreamDebuggingIsEnabled = true;
 
             Debug.SetDeviceDebugSettings(ParentDeviceKey, setting);
-
+        
         }
 
         /// <summary>
@@ -135,4 +135,51 @@ namespace PepperDash.Core
             DebugExpiryPeriod = null;
         }
     }
+
+    /// <summary>
+    /// The available settings for stream debugging
+    /// </summary>
+    [Flags]
+    /// <summary>
+    /// Enumeration of eStreamDebuggingSetting values
+    /// </summary>
+    public enum eStreamDebuggingSetting
+    {
+        /// <summary>
+        /// Debug off
+        /// </summary>
+        Off = 0,
+        /// <summary>
+        /// Debug received data
+        /// </summary>
+        Rx = 1, 
+        /// <summary>
+        /// Debug transmitted data
+        /// </summary>
+        Tx = 2,
+        /// <summary>
+        /// Debug both received and transmitted data
+        /// </summary>
+        Both = Rx | Tx
+    }
+
+    /// <summary>
+    /// The available settings for stream debugging response types
+    /// </summary>
+    [Flags]
+    public enum eStreamDebuggingDataTypeSettings
+    {
+        /// <summary>
+        /// Debug data in byte format
+        /// </summary>
+        Bytes = 0,
+        /// <summary>
+        /// Debug data in text format
+        /// </summary>
+        Text = 1,
+        /// <summary>
+        /// Debug data in both byte and text formats
+        /// </summary>
+        Both = Bytes | Text,
+    }
 }

src/PepperDash.Core/Comm/ControlPropertiesConfig.cs

@@ -1,9 +1,8 @@
 using System;
-using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PepperDash.Core
+namespace PepperDash.Essentials.Core.Communications
 {
     /// <summary>
     /// Represents a ControlPropertiesConfig

src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Threading;
 using Crestron.SimplSharp;
@@ -12,12 +11,11 @@ using Renci.SshNet.Common;
 namespace PepperDash.Core
 {
     /// <summary>
-    /// SSH Client
+    /// 
     /// </summary>
     public class GenericSshClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
     {
         private const string SPlusKey = "Uninitialized SshClient";
-
         /// <summary>
         /// Object to enable stream debugging
         /// </summary>
@@ -38,6 +36,11 @@ namespace PepperDash.Core
         /// </summary>
         public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
+        /// <summary>
+        ///// 
+        ///// </summary>
+        //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
+
         /// <summary>
         /// Gets or sets the Hostname
         /// </summary>
@@ -64,7 +67,7 @@ namespace PepperDash.Core
         public bool IsConnected
         {
             // returns false if no client or not connected
-            get { return client != null && ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+            get { return Client != null && ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
         }
 
         /// <summary>
@@ -80,26 +83,16 @@ namespace PepperDash.Core
         /// </summary>
         public SocketStatus ClientStatus
         {
-            get { lock (_stateLock) { return _ClientStatus; } }
+            get { return _ClientStatus; }
             private set
             {
-                bool shouldFireEvent = false;
-                lock (_stateLock)
-                {
-                    if (_ClientStatus != value)
-                    {
-                        _ClientStatus = value;
-                        shouldFireEvent = true;
-                    }
-                }
-                // Fire event outside lock to avoid deadlock
-                if (shouldFireEvent)
-                    OnConnectionChange();
+                if (_ClientStatus == value)
+                    return;
+                _ClientStatus = value;
+                OnConnectionChange();
             }
         }
-
-        private SocketStatus _ClientStatus;
-        private bool _ConnectEnabled;
+        SocketStatus _ClientStatus;
 
         /// <summary>
         /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
@@ -107,7 +100,7 @@ namespace PepperDash.Core
         /// </summary>
         public ushort UStatus
         {
-            get { lock (_stateLock) { return (ushort)_ClientStatus; } }
+            get { return (ushort)_ClientStatus; }
         }
 
         /// <summary>
@@ -118,11 +111,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Will be set and unset by connect and disconnect only
         /// </summary>
-        public bool ConnectEnabled
-        {
-            get { lock (_stateLock) { return _ConnectEnabled; } }
-            private set { lock (_stateLock) { _ConnectEnabled = value; } }
-        }
+        public bool ConnectEnabled { get; private set; }
 
         /// <summary>
         /// S+ helper for AutoReconnect
@@ -138,25 +127,17 @@ namespace PepperDash.Core
         /// </summary>
         public int AutoReconnectIntervalMs { get; set; }
 
-        private SshClient client;
+        SshClient Client;
 
-        private ShellStream shellStream;
+        ShellStream TheStream;
 
-        private readonly Timer reconnectTimer;
+        CTimer ReconnectTimer;
 
         //Lock object to prevent simulatneous connect/disconnect operations
         //private CCriticalSection connectLock = new CCriticalSection();
-        private readonly SemaphoreSlim connectLock = new SemaphoreSlim(1);
+        private SemaphoreSlim connectLock = new SemaphoreSlim(1);
 
-        // Thread-safety lock for state changes
-        private readonly object _stateLock = new object();
-
-        private bool disconnectLogged = false;
-
-        /// <summary>
-        /// When true, turns off echo for the SSH session
-        /// </summary>
-        public bool DisableEcho { get; set; }
+        private bool DisconnectLogged = false;
 
         /// <summary>
         /// Typical constructor.
@@ -173,13 +154,13 @@ namespace PepperDash.Core
             Password = password;
             AutoReconnectIntervalMs = 5000;
 
-            reconnectTimer = new Timer(o =>
+            ReconnectTimer = new CTimer(o =>
                 {
-                    if (ConnectEnabled) // Now thread-safe property access
+                    if (ConnectEnabled)
                     {
                         Connect();
                     }
-                }, null, System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
+                }, System.Threading.Timeout.Infinite);
         }
 
         /// <summary>
@@ -191,23 +172,23 @@ namespace PepperDash.Core
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             AutoReconnectIntervalMs = 5000;
 
-            reconnectTimer = new Timer(o =>
+            ReconnectTimer = new CTimer(o =>
             {
-                if (ConnectEnabled) // Now thread-safe property access
+                if (ConnectEnabled)
                 {
                     Connect();
                 }
-            }, null, System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
+            }, System.Threading.Timeout.Infinite);
         }
 
         /// <summary>
         /// Handles closing this up when the program shuts down
         /// </summary>
-        private void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
         {
             if (programEventType == eProgramStatusEventType.Stopping)
             {
-                if (client != null)
+                if (Client != null)
                 {
                     this.LogDebug("Program stopping. Closing connection");
                     Disconnect();
@@ -242,10 +223,10 @@ namespace PepperDash.Core
                     this.LogDebug("Attempting connect");
 
                     // Cancel reconnect if running.
-                    StopReconnectTimer();
+                    ReconnectTimer?.Stop();
 
                     // Cleanup the old client if it already exists
-                    if (client != null)
+                    if (Client != null)
                     {
                         this.LogDebug("Cleaning up disconnected client");
                         KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
@@ -258,36 +239,29 @@ namespace PepperDash.Core
 
                     this.LogDebug("Creating new SshClient");
                     ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
-                    client = new SshClient(connectionInfo);
-                    client.ErrorOccurred += Client_ErrorOccurred;
+                    Client = new SshClient(connectionInfo);
+                    Client.ErrorOccurred += Client_ErrorOccurred;
 
                     //Attempt to connect
                     ClientStatus = SocketStatus.SOCKET_STATUS_WAITING;
                     try
                     {
-                        client.Connect();
-
-                        var modes = new Dictionary<TerminalModes, uint>();
-
-                        if (DisableEcho)
-                        {
-                            modes.Add(TerminalModes.ECHO, 0);
-                        }
-
-                        shellStream = client.CreateShellStream("PDTShell", 0, 0, 0, 0, 65534, modes);
-                        if (shellStream.DataAvailable)
+                        Client.Connect();
+                        TheStream = Client.CreateShellStream("PDTShell", 0, 0, 0, 0, 65534);
+                        if (TheStream.DataAvailable)
                         {
                             // empty the buffer if there is data
-                            shellStream.Read();
+                            string str = TheStream.Read();
                         }
-                        shellStream.DataReceived += Stream_DataReceived;
+                        TheStream.DataReceived += Stream_DataReceived;
                         this.LogInformation("Connected");
                         ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
-                        disconnectLogged = false;
+                        DisconnectLogged = false;
                     }
                     catch (SshConnectionException e)
                     {
                         var ie = e.InnerException; // The details are inside!!
+                        var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
 
                         if (ie is SocketException)
                         {
@@ -312,36 +286,37 @@ namespace PepperDash.Core
                             this.LogVerbose(ie, "Exception details: ");
                         }
 
-                        disconnectLogged = true;
+                        DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
                         if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {autoReconnect}, {autoReconnectInterval}ms", AutoReconnect, AutoReconnectIntervalMs);
-                            StartReconnectTimer();
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
                         }
                     }
                     catch (SshOperationTimeoutException ex)
                     {
                         this.LogWarning("Connection attempt timed out: {message}", ex.Message);
 
-                        disconnectLogged = true;
+                        DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
                         if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                            StartReconnectTimer();
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
                         }
                     }
                     catch (Exception e)
                     {
+                        var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
                         this.LogError("Unhandled exception on connect: {error}", e.Message);
                         this.LogVerbose(e, "Exception details: ");
-                        disconnectLogged = true;
+                        DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
                         if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                            StartReconnectTimer();
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
                         }
                     }
                 }
@@ -359,7 +334,11 @@ namespace PepperDash.Core
         {
             ConnectEnabled = false;
             // Stop trying reconnects, if we are
-            StopReconnectTimer();
+            if (ReconnectTimer != null)
+            {
+                ReconnectTimer.Stop();
+                // ReconnectTimer = null;
+            }
 
             KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
         }
@@ -373,12 +352,12 @@ namespace PepperDash.Core
 
             try
             {
-                if (client != null)
+                if (Client != null)
                 {
-                    client.ErrorOccurred -= Client_ErrorOccurred;
-                    client.Disconnect();
-                    client.Dispose();
-                    client = null;
+                    Client.ErrorOccurred -= Client_ErrorOccurred;
+                    Client.Disconnect();
+                    Client.Dispose();
+                    Client = null;
                     ClientStatus = status;
                     this.LogDebug("Disconnected");
                 }
@@ -392,16 +371,16 @@ namespace PepperDash.Core
         /// <summary>
         /// Kills the stream
         /// </summary>
-        private void KillStream()
+		void KillStream()
         {
             try
             {
-                if (shellStream != null)
+                if (TheStream != null)
                 {
-                    shellStream.DataReceived -= Stream_DataReceived;
-                    shellStream.Close();
-                    shellStream.Dispose();
-                    shellStream = null;
+                    TheStream.DataReceived -= Stream_DataReceived;
+                    TheStream.Close();
+                    TheStream.Dispose();
+                    TheStream = null;
                     this.LogDebug("Disconnected stream");
                 }
             }
@@ -414,7 +393,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Handles the keyboard interactive authentication, should it be required.
         /// </summary>
-        private void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
+        void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
         {
             foreach (AuthenticationPrompt prompt in e.Prompts)
                 if (prompt.Request.IndexOf("Password:", StringComparison.InvariantCultureIgnoreCase) != -1)
@@ -424,7 +403,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Handler for data receive on ShellStream.  Passes data across to queue for line parsing.
         /// </summary>
-        private void Stream_DataReceived(object sender, ShellDataEventArgs e)
+        void Stream_DataReceived(object sender, ShellDataEventArgs e)
         {
             if (((ShellStream)sender).Length <= 0L)
             {
@@ -437,14 +416,18 @@ namespace PepperDash.Core
             if (bytesHandler != null)
             {
                 var bytes = Encoding.UTF8.GetBytes(response);
-                this.PrintReceivedBytes(bytes);
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                {
+                    this.LogInformation("Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                }
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
 
             var textHandler = TextReceived;
             if (textHandler != null)
             {
-                this.PrintReceivedText(response);
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    this.LogInformation("Received: '{0}'", ComTextHelper.GetDebugText(response));
 
                 textHandler(this, new GenericCommMethodReceiveTextArgs(response));
             }
@@ -456,7 +439,7 @@ namespace PepperDash.Core
         /// Error event handler for client events - disconnect, etc.  Will forward those events via ConnectionChange
         /// event
         /// </summary>
-        private void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
+        void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
         {
             CrestronInvoke.BeginInvoke(o =>
             {
@@ -476,7 +459,7 @@ namespace PepperDash.Core
                 if (AutoReconnect && ConnectEnabled)
                 {
                     this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                    StartReconnectTimer();
+                    ReconnectTimer.Reset(AutoReconnectIntervalMs);
                 }
             });
         }
@@ -484,7 +467,7 @@ namespace PepperDash.Core
         /// <summary>
         /// Helper for ConnectionChange event
         /// </summary>
-        private void OnConnectionChange()
+        void OnConnectionChange()
         {
             ConnectionChange?.Invoke(this, new GenericSocketStatusChageEventArgs(this));
         }
@@ -499,12 +482,16 @@ namespace PepperDash.Core
         {
             try
             {
-                if (client != null && shellStream != null && IsConnected)
+                if (Client != null && TheStream != null && IsConnected)
                 {
-                    this.PrintSentText(text);
+                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                        this.LogInformation(
+                                      "Sending {length} characters of text: '{text}'",
+                                      text.Length,
+                                      ComTextHelper.GetDebugText(text));
 
-                    shellStream.Write(text);
-                    shellStream.Flush();
+                    TheStream.Write(text);
+                    TheStream.Flush();
                 }
                 else
                 {
@@ -516,7 +503,7 @@ namespace PepperDash.Core
                 this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                StartReconnectTimer();
+                ReconnectTimer.Reset();
             }
             catch (Exception ex)
             {
@@ -532,12 +519,13 @@ namespace PepperDash.Core
         {
             try
             {
-                if (client != null && shellStream != null && IsConnected)
+                if (Client != null && TheStream != null && IsConnected)
                 {
-                    this.PrintSentBytes(bytes);
+                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                        this.LogInformation("Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
 
-                    shellStream.Write(bytes, 0, bytes.Length);
-                    shellStream.Flush();
+                    TheStream.Write(bytes, 0, bytes.Length);
+                    TheStream.Flush();
                 }
                 else
                 {
@@ -549,7 +537,7 @@ namespace PepperDash.Core
                 this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                StartReconnectTimer();
+                ReconnectTimer.Reset();
             }
             catch (Exception ex)
             {
@@ -558,83 +546,6 @@ namespace PepperDash.Core
         }
         #endregion
 
-        /// <summary>
-        /// Safely starts the reconnect timer with exception handling
-        /// </summary>
-        private void StartReconnectTimer()
-        {
-            try
-            {
-                reconnectTimer?.Change(AutoReconnectIntervalMs, System.Threading.Timeout.Infinite);
-            }
-            catch (ObjectDisposedException)
-            {
-                // Timer was disposed, ignore
-                this.LogDebug("Attempted to start timer but it was already disposed");
-            }
-        }
-
-        /// <summary>
-        /// Safely stops the reconnect timer with exception handling
-        /// </summary>
-        private void StopReconnectTimer()
-        {
-            try
-            {
-                reconnectTimer?.Change(System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
-            }
-            catch (ObjectDisposedException)
-            {
-                // Timer was disposed, ignore
-                this.LogDebug("Attempted to stop timer but it was already disposed");
-            }
-        }
-
-        /// <summary>
-        /// Deactivate method - properly dispose of resources
-        /// </summary>
-        public override bool Deactivate()
-        {
-            try
-            {
-                this.LogDebug("Deactivating SSH client - disposing resources");
-
-                // Stop trying reconnects
-                ConnectEnabled = false;
-                StopReconnectTimer();
-
-                // Disconnect and cleanup client
-                KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
-
-                // Dispose timer
-                try
-                {
-                    reconnectTimer?.Dispose();
-                }
-                catch (ObjectDisposedException)
-                {
-                    // Already disposed, ignore
-                }
-
-                // Dispose semaphore
-                try
-                {
-                    connectLock?.Dispose();
-                }
-                catch (ObjectDisposedException)
-                {
-                    // Already disposed, ignore
-                }
-
-                return base.Deactivate();
-            }
-            catch (Exception ex)
-            {
-                this.LogException(ex, "Error during SSH client deactivation");
-                return false;
-            }
-        }
-
     }
 
     //*****************************************************************************************************

src/PepperDash.Core/Comm/GenericTcpIpClient.cs

@@ -19,44 +19,44 @@ namespace PepperDash.Core
         /// </summary>
         public CommunicationStreamDebugging StreamDebugging { get; private set; }
 
-        /// <summary>
-        /// Fires when data is received from the server and returns it as a Byte array
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+		/// <summary>
+		/// Fires when data is received from the server and returns it as a Byte array
+		/// </summary>
+		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
 
-        /// <summary>
-        /// Fires when data is received from the server and returns it as text
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+		/// <summary>
+		/// Fires when data is received from the server and returns it as text
+		/// </summary>
+		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
-        public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+		/// <summary>
+		/// 
+		/// </summary>
+		//public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
+		public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
 
-        private string _hostname;
+		private string _hostname;
 
         /// <summary>
         /// Address of server
         /// </summary>
         public string Hostname
         {
-            get
-            {
-                return _hostname;
-            }
+			get
+			{
+				return _hostname;
+			}
 
-            set
-            {
-                _hostname = value;
-                if (_client != null)
-                {
-                    _client.AddressClientConnectedTo = _hostname;
-                }
-            }
-        }
+			set
+			{
+			 _hostname = value;
+				if (_client != null)
+				{
+					_client.AddressClientConnectedTo = _hostname;
+				}
+			}
+		}
 
         /// <summary>
         /// Gets or sets the Port
@@ -78,19 +78,19 @@ namespace PepperDash.Core
         /// </summary>
         public int BufferSize { get; set; }
 
-        /// <summary>
-        /// The actual client class
-        /// </summary>
-        private TCPClient _client;
+		/// <summary>
+		/// The actual client class
+		/// </summary>
+		private TCPClient _client;
 
-        /// <summary>
-        /// Bool showing if socket is connected
-        /// </summary>
-        public bool IsConnected
-        {
-            get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+		/// <summary>
+		/// Bool showing if socket is connected
+		/// </summary>
+		public bool IsConnected 
+        { 
+            get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } 
         }
-
+        
         /// <summary>
         /// S+ helper for IsConnected
         /// </summary>
@@ -99,15 +99,15 @@ namespace PepperDash.Core
             get { return (ushort)(IsConnected ? 1 : 0); }
         }
 
-        /// <summary>
-        /// _client socket status Read only
-        /// </summary>
-        public SocketStatus ClientStatus
-        {
-            get
+		/// <summary>
+		/// _client socket status Read only
+		/// </summary>
+		public SocketStatus ClientStatus 
+        { 
+            get 
             {
-                return _client == null ? SocketStatus.SOCKET_STATUS_NO_CONNECT : _client.ClientStatus;
-            }
+                return _client == null ? SocketStatus.SOCKET_STATUS_NO_CONNECT : _client.ClientStatus; 
+            } 
         }
 
         /// <summary>
@@ -119,26 +119,26 @@ namespace PepperDash.Core
             get { return (ushort)ClientStatus; }
         }
 
-        /// <summary>
+		/// <summary>
         /// Status text shows the message associated with socket status
-        /// </summary>
-        public string ClientStatusText { get { return ClientStatus.ToString(); } }
+		/// </summary>
+		public string ClientStatusText { get { return ClientStatus.ToString(); } }
 
-        /// <summary>
-        /// Ushort representation of client status
-        /// </summary>
+		/// <summary>
+		/// Ushort representation of client status
+		/// </summary>
         [Obsolete]
-        public ushort UClientStatus { get { return (ushort)ClientStatus; } }
+		public ushort UClientStatus { get { return (ushort)ClientStatus; } }
 
-        /// <summary>
-        /// Connection failure reason
-        /// </summary>
-        public string ConnectionFailure { get { return ClientStatus.ToString(); } }
+		/// <summary>
+		/// Connection failure reason
+		/// </summary>
+		public string ConnectionFailure { get { return ClientStatus.ToString(); } }
 
-        /// <summary>
-        /// Gets or sets the AutoReconnect
-        /// </summary>
-        public bool AutoReconnect { get; set; }
+  /// <summary>
+  /// Gets or sets the AutoReconnect
+  /// </summary>
+		public bool AutoReconnect { get; set; }
 
         /// <summary>
         /// S+ helper for AutoReconnect
@@ -149,29 +149,29 @@ namespace PepperDash.Core
             set { AutoReconnect = value == 1; }
         }
 
-        /// <summary>
-        /// Milliseconds to wait before attempting to reconnect. Defaults to 5000
-        /// </summary>
-        public int AutoReconnectIntervalMs { get; set; }
+		/// <summary>
+		/// Milliseconds to wait before attempting to reconnect. Defaults to 5000
+		/// </summary>
+		public int AutoReconnectIntervalMs { get; set; }
 
-        /// <summary>
-        /// Set only when the disconnect method is called
-        /// </summary>
-        bool DisconnectCalledByUser;
+		/// <summary>
+		/// Set only when the disconnect method is called
+		/// </summary>
+		bool DisconnectCalledByUser;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool Connected
-        {
-            get { return _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
-        }
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool Connected
+		{
+			get { return _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+		}
 
         //Lock object to prevent simulatneous connect/disconnect operations
         private CCriticalSection connectLock = new CCriticalSection();
 
         // private Timer for auto reconnect
-        private CTimer RetryTimer;
+		private CTimer RetryTimer;
 
         /// <summary>
         /// Constructor
@@ -181,8 +181,8 @@ namespace PepperDash.Core
         /// <param name="port"></param>
         /// <param name="bufferSize"></param>
 		public GenericTcpIpClient(string key, string address, int port, int bufferSize)
-            : base(key)
-        {
+			: base(key)
+		{
             StreamDebugging = new CommunicationStreamDebugging(key);
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             AutoReconnectIntervalMs = 5000;
@@ -218,18 +218,18 @@ namespace PepperDash.Core
         /// Default constructor for S+
         /// </summary>
         public GenericTcpIpClient()
-            : base(SplusKey)
+			: base(SplusKey)
         {
             StreamDebugging = new CommunicationStreamDebugging(SplusKey);
-            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
-            AutoReconnectIntervalMs = 5000;
+			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+			AutoReconnectIntervalMs = 5000;
             BufferSize = 2000;
 
             RetryTimer = new CTimer(o =>
             {
                 Reconnect();
             }, Timeout.Infinite);
-        }
+		}
 
         /// <summary>
         /// Initialize method
@@ -255,26 +255,26 @@ namespace PepperDash.Core
         /// 
         /// </summary>
         /// <returns></returns>
-        /// <summary>
-        /// Deactivate method
-        /// </summary>
-        public override bool Deactivate()
-        {
+  /// <summary>
+  /// Deactivate method
+  /// </summary>
+		public override bool Deactivate()
+		{
             RetryTimer.Stop();
             RetryTimer.Dispose();
             if (_client != null)
             {
-                _client.SocketStatusChange -= this.Client_SocketStatusChange;
+             _client.SocketStatusChange -= this.Client_SocketStatusChange;
                 DisconnectClient();
             }
-            return true;
-        }
+			return true;
+		}
 
-        /// <summary>
-        /// Connect method
-        /// </summary>
-        public void Connect()
-        {
+  /// <summary>
+  /// Connect method
+  /// </summary>
+		public void Connect()
+		{
             if (string.IsNullOrEmpty(Hostname))
             {
                 Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': No address set", Key);
@@ -310,7 +310,7 @@ namespace PepperDash.Core
             {
                 connectLock.Leave();
             }
-        }
+		}
 
         private void Reconnect()
         {
@@ -337,11 +337,11 @@ namespace PepperDash.Core
             }
         }
 
-        /// <summary>
-        /// Disconnect method
-        /// </summary>
-        public void Disconnect()
-        {
+  /// <summary>
+  /// Disconnect method
+  /// </summary>
+		public void Disconnect()
+		{
             try
             {
                 connectLock.Enter();
@@ -355,7 +355,7 @@ namespace PepperDash.Core
             {
                 connectLock.Leave();
             }
-        }
+		}
 
         /// <summary>
         /// DisconnectClient method
@@ -375,7 +375,7 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="c"></param>
 		void ConnectToServerCallback(TCPClient c)
-        {
+		{
             if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
             {
                 Debug.Console(0, this, "Server connection result: {0}", c.ClientStatus);
@@ -385,13 +385,13 @@ namespace PepperDash.Core
             {
                 Debug.Console(1, this, "Server connection result: {0}", c.ClientStatus);
             }
-        }
+		}
 
         /// <summary>
         /// Disconnects, waits and attemtps to connect again
         /// </summary>
 		void WaitAndTryReconnect()
-        {
+		{
             CrestronInvoke.BeginInvoke(o =>
             {
                 try
@@ -409,7 +409,7 @@ namespace PepperDash.Core
                     connectLock.Leave();
                 }
             });
-        }
+		}
 
         /// <summary>
         /// Recieves incoming data
@@ -417,7 +417,7 @@ namespace PepperDash.Core
         /// <param name="client"></param>
         /// <param name="numBytes"></param>
 		void Receive(TCPClient client, int numBytes)
-        {
+		{
             if (client != null)
             {
                 if (numBytes > 0)
@@ -426,7 +426,10 @@ namespace PepperDash.Core
                     var bytesHandler = BytesReceived;
                     if (bytesHandler != null)
                     {
-                        this.PrintReceivedBytes(bytes);
+                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        {
+                            Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                        }
                         bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
                     }
                     var textHandler = TextReceived;
@@ -434,53 +437,58 @@ namespace PepperDash.Core
                     {
                         var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
 
-                        this.PrintReceivedText(str);
+                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        {
+                            Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
+                        }
 
                         textHandler(this, new GenericCommMethodReceiveTextArgs(str));
-                    }
+                    }                    
                 }
                 client.ReceiveDataAsync(Receive);
             }
-        }
+		}
 
-        /// <summary>
-        /// SendText method
-        /// </summary>
-        public void SendText(string text)
-        {
-            var bytes = Encoding.GetEncoding(28591).GetBytes(text);
-            // Check debug level before processing byte array
-            this.PrintSentText(text);
+  /// <summary>
+  /// SendText method
+  /// </summary>
+		public void SendText(string text)
+		{
+			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+			// Check debug level before processing byte array
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
             if (_client != null)
-                _client.SendData(bytes, bytes.Length);
-        }
+			    _client.SendData(bytes, bytes.Length);
+		}
 
-        /// <summary>
-        /// SendEscapedText method
-        /// </summary>
-        public void SendEscapedText(string text)
-        {
-            var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
-                {
-                    var hex = s.Groups[1].Value;
-                    return ((char)Convert.ToByte(hex, 16)).ToString();
-                });
-            SendText(unescapedText);
-        }
+  /// <summary>
+  /// SendEscapedText method
+  /// </summary>
+		public void SendEscapedText(string text)
+		{
+			var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
+				{
+					var hex = s.Groups[1].Value;
+					return ((char)Convert.ToByte(hex, 16)).ToString();
+				});
+			SendText(unescapedText);
+		}
 
         /// <summary>
         /// Sends Bytes to the server
         /// </summary>
         /// <param name="bytes"></param>
-        /// <summary>
-        /// SendBytes method
-        /// </summary>
-        public void SendBytes(byte[] bytes)
-        {
-            this.PrintSentBytes(bytes);
+  /// <summary>
+  /// SendBytes method
+  /// </summary>
+		public void SendBytes(byte[] bytes)
+		{
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
             if (_client != null)
-                _client.SendData(bytes, bytes.Length);
-        }
+			    _client.SendData(bytes, bytes.Length);
+		}
 
         /// <summary>
         /// Socket Status Change Handler
@@ -488,7 +496,7 @@ namespace PepperDash.Core
         /// <param name="client"></param>
         /// <param name="clientSocketStatus"></param>
 		void Client_SocketStatusChange(TCPClient client, SocketStatus clientSocketStatus)
-        {
+		{
             if (clientSocketStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
             {
                 Debug.Console(0, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
@@ -497,73 +505,68 @@ namespace PepperDash.Core
             else
             {
                 Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
-                _client.ReceiveDataAsync(Receive);
+			    _client.ReceiveDataAsync(Receive);
             }
 
-            var handler = ConnectionChange;
-            if (handler != null)
-                ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
-        }
-    }
+			var handler = ConnectionChange;
+			if (handler != null)
+				ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
+		}
+	}
 
-    /// <summary>
-    /// Represents a TcpSshPropertiesConfig
-    /// </summary>
-    public class TcpSshPropertiesConfig
-    {
+ /// <summary>
+ /// Represents a TcpSshPropertiesConfig
+ /// </summary>
+	public class TcpSshPropertiesConfig
+	{
         /// <summary>
         /// Address to connect to
         /// </summary>
 		[JsonProperty(Required = Required.Always)]
-        public string Address { get; set; }
-
+		public string Address { get; set; }
+		
         /// <summary>
         /// Port to connect to
         /// </summary>
-        [JsonProperty(Required = Required.Always)]
-        public int Port { get; set; }
-
+		[JsonProperty(Required = Required.Always)]
+		public int Port { get; set; }
+		
         /// <summary>
         /// Username credential
         /// </summary>
-        public string Username { get; set; }
-        /// <summary>
-        /// Gets or sets the Password
-        /// </summary>
-        public string Password { get; set; }
+		public string Username { get; set; }
+  /// <summary>
+  /// Gets or sets the Password
+  /// </summary>
+		public string Password { get; set; }
 
-        /// <summary>
-        /// Defaults to 32768
-        /// </summary>
-        public int BufferSize { get; set; }
+		/// <summary>
+		/// Defaults to 32768
+		/// </summary>
+		public int BufferSize { get; set; }
 
-        /// <summary>
-        /// Gets or sets the AutoReconnect
-        /// </summary>
-        public bool AutoReconnect { get; set; }
+  /// <summary>
+  /// Gets or sets the AutoReconnect
+  /// </summary>
+		public bool AutoReconnect { get; set; }
 
-        /// <summary>
-        /// Gets or sets the AutoReconnectIntervalMs
-        /// </summary>
-        public int AutoReconnectIntervalMs { get; set; }
-
-        /// <summary>
-        /// When true, turns off echo for the SSH session
-        /// </summary>
-        [JsonProperty("disableSshEcho")]
-        public bool DisableSshEcho { get; set; }
+  /// <summary>
+  /// Gets or sets the AutoReconnectIntervalMs
+  /// </summary>
+		public int AutoReconnectIntervalMs { get; set; }
 
         /// <summary>
         /// Default constructor
         /// </summary>
 		public TcpSshPropertiesConfig()
-        {
-            BufferSize = 32768;
-            AutoReconnect = true;
-            AutoReconnectIntervalMs = 5000;
+		{
+			BufferSize = 32768;
+			AutoReconnect = true;
+			AutoReconnectIntervalMs = 5000;
             Username = "";
             Password = "";
-            DisableSshEcho = false;
-        }
-    }
+		}
+
+	}
+
 }

src/PepperDash.Core/Comm/GenericUdpServer.cs

@@ -124,21 +124,21 @@ namespace PepperDash.Core
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
         }
-
+       
         /// <summary>
         /// 
         /// </summary>
         /// <param name="key"></param>
         /// <param name="address"></param>
         /// <param name="port"></param>
-        /// <param name="bufferSize"></param>
-        public GenericUdpServer(string key, string address, int port, int bufferSize)
+        /// <param name="buffefSize"></param>
+        public GenericUdpServer(string key, string address, int port, int buffefSize)
             : base(key)
         {
-            StreamDebugging = new CommunicationStreamDebugging(key);
+            StreamDebugging = new CommunicationStreamDebugging(key); 
             Hostname = address;
             Port = port;
-            BufferSize = bufferSize;
+            BufferSize = buffefSize;
 
             CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
             CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
@@ -180,7 +180,7 @@ namespace PepperDash.Core
         /// <param name="programEventType"></param>
         void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
         {
-            if (programEventType != eProgramStatusEventType.Stopping)
+            if (programEventType != eProgramStatusEventType.Stopping) 
                 return;
 
             Debug.Console(1, this, "Program stopping. Disabling Server");
@@ -194,21 +194,7 @@ namespace PepperDash.Core
         {
             if (Server == null)
             {
-                try
-                {
-                    var address = IPAddress.Parse(Hostname);
-
-                    Server = new UDPServer(address, Port, BufferSize);
-
-                }
-                catch (Exception ex)
-                {
-                    this.LogError("Error parsing IP Address '{ipAddress}': message: {message}", Hostname, ex.Message);
-                    this.LogInformation("Creating UDPServer with default buffersize");
-
-                    Server = new UDPServer();
-                }
-
+                Server = new UDPServer();
             }
 
             if (string.IsNullOrEmpty(Hostname))
@@ -243,7 +229,7 @@ namespace PepperDash.Core
         /// </summary>
         public void Disconnect()
         {
-            if (Server != null)
+            if(Server != null)
                 Server.DisableUDPServer();
 
             IsConnected = false;
@@ -265,7 +251,7 @@ namespace PepperDash.Core
 
             try
             {
-                if (numBytes <= 0)
+                if (numBytes <= 0) 
                     return;
 
                 var sourceIp = Server.IPAddressLastMessageReceivedFrom;
@@ -281,13 +267,17 @@ namespace PepperDash.Core
                 var bytesHandler = BytesReceived;
                 if (bytesHandler != null)
                 {
-                    this.PrintReceivedBytes(bytes);
+                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    {
+                        Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                    }
                     bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
                 }
                 var textHandler = TextReceived;
                 if (textHandler != null)
                 {
-                    this.PrintReceivedText(str);
+                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
                     textHandler(this, new GenericCommMethodReceiveTextArgs(str));
                 }
             }
@@ -314,7 +304,8 @@ namespace PepperDash.Core
 
             if (IsConnected && Server != null)
             {
-                this.PrintSentText(text);
+                if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                    Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
 
                 Server.SendData(bytes, bytes.Length);
             }
@@ -329,7 +320,8 @@ namespace PepperDash.Core
         /// </summary>
         public void SendBytes(byte[] bytes)
         {
-            this.PrintSentBytes(bytes);
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
 
             if (IsConnected && Server != null)
                 Server.SendData(bytes, bytes.Length);
@@ -337,11 +329,11 @@ namespace PepperDash.Core
 
     }
 
-    /// <summary>
-    /// Represents a GenericUdpReceiveTextExtraArgs
-    /// </summary>
-    public class GenericUdpReceiveTextExtraArgs : EventArgs
-    {
+ /// <summary>
+ /// Represents a GenericUdpReceiveTextExtraArgs
+ /// </summary>
+	public class GenericUdpReceiveTextExtraArgs : EventArgs
+	{
         /// <summary>
         /// 
         /// </summary>
@@ -353,7 +345,7 @@ namespace PepperDash.Core
         /// <summary>
         /// 
         /// </summary>
-		public int Port { get; private set; }
+		public int	Port { get; private set; }
         /// <summary>
         /// 
         /// </summary>
@@ -367,18 +359,18 @@ namespace PepperDash.Core
         /// <param name="port"></param>
         /// <param name="bytes"></param>
 		public GenericUdpReceiveTextExtraArgs(string text, string ipAddress, int port, byte[] bytes)
-        {
-            Text = text;
-            IpAddress = ipAddress;
-            Port = port;
-            Bytes = bytes;
-        }
+		{
+			Text = text;
+			IpAddress = ipAddress;
+			Port = port;
+			Bytes = bytes;
+		}
 
-        /// <summary>
-        /// Stupid S+ Constructor
-        /// </summary>
-        public GenericUdpReceiveTextExtraArgs() { }
-    }
+		/// <summary>
+		/// Stupid S+ Constructor
+		/// </summary>
+		public GenericUdpReceiveTextExtraArgs() { }
+	}
 
     /// <summary>
     /// 

src/PepperDash.Core/Comm/StreamDebuggingExtensions.cs

@@ -1,69 +0,0 @@
-using System;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Core
-{
-  /// <summary>
-  /// Extension methods for stream debugging
-  /// </summary>
-  public static class StreamDebuggingExtensions
-  {
-    private static readonly string app = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? $"App {InitialParametersClass.ApplicationNumber}" : $"{InitialParametersClass.RoomId}";
-
-    /// <summary>
-    /// Print the sent bytes to the console
-    /// </summary>
-    /// <param name="comms">comms device</param>
-    /// <param name="bytes">bytes to print</param>
-    public static void PrintSentBytes(this IStreamDebugging comms, byte[] bytes)
-    {
-      if (!comms.StreamDebugging.TxStreamDebuggingIsEnabled) return;
-
-      var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
-      CrestronConsole.PrintLine($"[{timestamp}][{app}][{comms.Key}] Sending {bytes.Length} bytes: '{ComTextHelper.GetEscapedText(bytes)}'");
-    }
-
-    /// <summary>
-    /// Print the received bytes to the console
-    /// </summary>
-    /// <param name="comms">comms device</param>
-    /// <param name="bytes">bytes to print</param>
-    public static void PrintReceivedBytes(this IStreamDebugging comms, byte[] bytes)
-    {
-      if (!comms.StreamDebugging.RxStreamDebuggingIsEnabled) return;
-
-      var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
-      CrestronConsole.PrintLine($"[{timestamp}][{app}][{comms.Key}] Received {bytes.Length} bytes: '{ComTextHelper.GetEscapedText(bytes)}'");
-    }
-
-    /// <summary>
-    /// Print the sent text to the console
-    /// </summary>
-    /// <param name="comms">comms device</param>
-    /// <param name="text">text to print</param>
-    public static void PrintSentText(this IStreamDebugging comms, string text)
-    {
-      if (!comms.StreamDebugging.TxStreamDebuggingIsEnabled) return;
-
-      var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
-      CrestronConsole.PrintLine($"[{timestamp}][{app}][{comms.Key}] Sending Text: '{ComTextHelper.GetDebugText(text)}'");
-    }
-
-    /// <summary>
-    /// Print the received text to the console
-    /// </summary>
-    /// <param name="comms">comms device</param>
-    /// <param name="text">text to print</param>
-    public static void PrintReceivedText(this IStreamDebugging comms, string text)
-    {
-      if (!comms.StreamDebugging.RxStreamDebuggingIsEnabled) return;
-
-      var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-
-      CrestronConsole.PrintLine($"[{timestamp}][{app}][{comms.Key}] Received Text: '{ComTextHelper.GetDebugText(text)}'");
-    }
-  }
-}

src/PepperDash.Core/Comm/eControlMethod.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Core
+namespace PepperDash.Essentials.Core.Communications
 {
     /// <summary>
     /// Crestron Control Methods for a comm object
@@ -74,14 +68,6 @@ namespace PepperDash.Core
         /// <summary>
         /// Secure TCP/IP
         /// </summary>
-        SecureTcpIp,
-        /// <summary>
-        /// Used when comms needs to be handled in SIMPL and bridged opposite the normal direction
-        /// </summary>
-        ComBridge,
-        /// <summary>
-        /// InfinetEX control
-        /// </summary>
-        InfinetEx
+        SecureTcpIp
     }
 }

src/PepperDash.Core/Comm/eStreamDebuggingDataTypeSettings.cs

@@ -1,24 +0,0 @@
-using System;
-
-namespace PepperDash.Core
-{
-  /// <summary>
-  /// The available settings for stream debugging data format types
-  /// </summary>
-  [Flags]
-  public enum eStreamDebuggingDataTypeSettings
-  {
-    /// <summary>
-    /// Debug data in byte format
-    /// </summary>
-    Bytes = 0,
-    /// <summary>
-    /// Debug data in text format
-    /// </summary>
-    Text = 1,
-    /// <summary>
-    /// Debug data in both byte and text formats
-    /// </summary>
-    Both = Bytes | Text
-  }
-}

src/PepperDash.Core/Comm/eStreamDebuggingSetting.cs

@@ -1,28 +0,0 @@
-using System;
-
-namespace PepperDash.Core
-{
-  /// <summary>
-  /// The available settings for stream debugging
-  /// </summary>
-  [Flags]
-  public enum eStreamDebuggingSetting
-  {
-    /// <summary>
-    /// Debug off
-    /// </summary>
-    Off = 0,
-    /// <summary>
-    /// Debug received data
-    /// </summary>
-    Rx = 1,
-    /// <summary>
-    /// Debug transmitted data
-    /// </summary>
-    Tx = 2,
-    /// <summary>
-    /// Debug both received and transmitted data
-    /// </summary>
-    Both = Rx | Tx
-  }
-}

src/PepperDash.Core/CommunicationExtras.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
+using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 
 namespace PepperDash.Core
@@ -39,7 +42,7 @@ namespace PepperDash.Core
     /// Defines the contract for IBasicCommunication
     /// </summary>
     public interface IBasicCommunication : ICommunicationReceiver
-    {
+	{
         /// <summary>
         /// Send text to the device
         /// </summary>
@@ -51,7 +54,7 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="bytes"></param>
 		void SendBytes(byte[] bytes);
-    }
+	}
 
     /// <summary>
     /// Represents a device that implements IBasicCommunication and IStreamDebugging
@@ -64,7 +67,7 @@ namespace PepperDash.Core
     /// <summary>
     /// Represents a device with stream debugging capablities
     /// </summary>
-    public interface IStreamDebugging : IKeyed
+    public interface IStreamDebugging
     {
         /// <summary>
         /// Object to enable stream debugging
@@ -73,12 +76,12 @@ namespace PepperDash.Core
         CommunicationStreamDebugging StreamDebugging { get; }
     }
 
-    /// <summary>
-    /// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
-    /// GenericTcpIpClient
-    /// </summary>
-    public interface ISocketStatus : IBasicCommunication
-    {
+	/// <summary>
+	/// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
+	/// GenericTcpIpClient
+	/// </summary>
+	public interface ISocketStatus : IBasicCommunication
+	{
         /// <summary>
         /// Notifies of socket status changes
         /// </summary>
@@ -90,7 +93,7 @@ namespace PepperDash.Core
         [JsonProperty("clientStatus")]
         [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
         SocketStatus ClientStatus { get; }
-    }
+	}
 
     /// <summary>
     /// Describes a device that implements ISocketStatus and IStreamDebugging
@@ -104,24 +107,24 @@ namespace PepperDash.Core
     /// Describes a device that can automatically attempt to reconnect
     /// </summary>
 	public interface IAutoReconnect
-    {
+	{
         /// <summary>
         /// Enable automatic recconnect
         /// </summary>
         [JsonProperty("autoReconnect")]
-        bool AutoReconnect { get; set; }
+		bool AutoReconnect { get; set; }
         /// <summary>
         /// Interval in ms to attempt automatic recconnections
         /// </summary>
         [JsonProperty("autoReconnectIntervalMs")]
-        int AutoReconnectIntervalMs { get; set; }
-    }
+		int AutoReconnectIntervalMs { get; set; }
+	}
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public enum eGenericCommMethodStatusChangeType
-    {
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum eGenericCommMethodStatusChangeType
+	{
         /// <summary>
         /// Connected
         /// </summary>
@@ -130,45 +133,45 @@ namespace PepperDash.Core
         /// Disconnected
         /// </summary>
         Disconnected
-    }
+	}
 
-    /// <summary>
-    /// This delegate defines handler for IBasicCommunication status changes
-    /// </summary>
-    /// <param name="comm">Device firing the status change</param>
-    /// <param name="status"></param>
-    public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);
+	/// <summary>
+	/// This delegate defines handler for IBasicCommunication status changes
+	/// </summary>
+	/// <param name="comm">Device firing the status change</param>
+	/// <param name="status"></param>
+	public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public class GenericCommMethodReceiveBytesArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets or sets the Bytes
-        /// </summary>
-        public byte[] Bytes { get; private set; }
+	/// <summary>
+	/// 
+	/// </summary>
+	public class GenericCommMethodReceiveBytesArgs : EventArgs
+	{
+  /// <summary>
+  /// Gets or sets the Bytes
+  /// </summary>
+		public byte[] Bytes { get; private set; }
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="bytes"></param>
 		public GenericCommMethodReceiveBytesArgs(byte[] bytes)
-        {
-            Bytes = bytes;
-        }
+		{
+			Bytes = bytes;
+		}
 
-        /// <summary>
-        /// S+ Constructor
-        /// </summary>
-        public GenericCommMethodReceiveBytesArgs() { }
-    }
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericCommMethodReceiveBytesArgs() { }
+	}
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public class GenericCommMethodReceiveTextArgs : EventArgs
-    {
+	/// <summary>
+	/// 
+	/// </summary>
+	public class GenericCommMethodReceiveTextArgs : EventArgs
+	{
         /// <summary>
         /// 
         /// </summary>
@@ -182,9 +185,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="text"></param>
 		public GenericCommMethodReceiveTextArgs(string text)
-        {
-            Text = text;
-        }
+		{
+			Text = text;
+		}
 
         /// <summary>
         /// 
@@ -192,14 +195,59 @@ namespace PepperDash.Core
         /// <param name="text"></param>
         /// <param name="delimiter"></param>
         public GenericCommMethodReceiveTextArgs(string text, string delimiter)
-            : this(text)
+            :this(text)
         {
             Delimiter = delimiter;
         }
 
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericCommMethodReceiveTextArgs() { }
+	}
+
+
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class ComTextHelper
+	{
         /// <summary>
-        /// S+ Constructor
+        /// Gets escaped text for a byte array
         /// </summary>
-        public GenericCommMethodReceiveTextArgs() { }
-    }
+        /// <param name="bytes"></param>
+        /// <returns></returns>
+		public static string GetEscapedText(byte[] bytes)
+		{
+			return String.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
+		}
+
+        /// <summary>
+        /// Gets escaped text for a string
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+  /// <summary>
+  /// GetEscapedText method
+  /// </summary>
+		public static string GetEscapedText(string text)
+		{
+			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+			return String.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
+		}
+
+        /// <summary>
+        /// Gets debug text for a string
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        /// <summary>
+        /// GetDebugText method
+        /// </summary>
+        public static string GetDebugText(string text)
+        {
+            return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
+        }
+	}
 }

src/PepperDash.Core/Config/PortalConfigReader.cs

@@ -9,59 +9,40 @@ using Serilog.Events;
 
 namespace PepperDash.Core.Config
 {
-
-
     /// <summary>
     /// Reads a Portal formatted config file
     /// </summary>
 	public class PortalConfigReader
 	{
-        const string template = "template";
-        const string system = "system";
-		const string systemUrl = "system_url";
-        const string templateUrl = "template_url";
-		const string info = "info";
-        const string devices = "devices";
-        const string rooms = "rooms";
-        const string sourceLists = "sourceLists";
-        const string destinationLists = "destinationLists";
-        const string cameraLists = "cameraLists";
-        const string audioControlPointLists = "audioControlPointLists";
-
-		const string tieLines = "tieLines";
-        const string joinMaps = "joinMaps";
-		const string global = "global";
-
-
-        /// <summary>
-        /// Reads the config file, checks if it needs a merge, merges and saves, then returns the merged Object.
-        /// </summary>
-        /// <returns>JObject of config file</returns>
-        public static void ReadAndMergeFileIfNecessary(string filePath, string savePath)
+		/// <summary>
+		/// Reads the config file, checks if it needs a merge, merges and saves, then returns the merged Object.
+		/// </summary>
+		/// <returns>JObject of config file</returns>
+		public static void ReadAndMergeFileIfNecessary(string filePath, string savePath)
 		{
 			try
 			{
 				if (!File.Exists(filePath))
 				{
-					Debug.LogError(
+					Debug.Console(1, Debug.ErrorLogLevel.Error,
 						"ERROR: Configuration file not present. Please load file to {0} and reset program", filePath);
 				}
 
 				using (StreamReader fs = new StreamReader(filePath))
 				{
 					var jsonObj = JObject.Parse(fs.ReadToEnd());
-					if(jsonObj[template] != null && jsonObj[system] != null)
+					if(jsonObj["template"] != null && jsonObj["system"] != null)
 					{
 						// it's a double-config, merge it.
 						var merged = MergeConfigs(jsonObj);
-						if (jsonObj[systemUrl] != null)
+						if (jsonObj["system_url"] != null)
 						{
-							merged[systemUrl] = jsonObj[systemUrl].Value<string>();
+							merged["systemUrl"] = jsonObj["system_url"].Value<string>();
 						}
 
-						if (jsonObj[templateUrl] != null)
+						if (jsonObj["template_url"] != null)
 						{
-							merged[templateUrl] = jsonObj[templateUrl].Value<string>();
+							merged["templateUrl"] = jsonObj["template_url"].Value<string>();
 						}
 
 						jsonObj = merged;
@@ -96,62 +77,62 @@ namespace PepperDash.Core.Config
 			var merged = new JObject();
 
 			// Put together top-level objects
-			if (system[info] != null)
-				merged.Add(info, Merge(template[info], system[info], info));
+			if (system["info"] != null)
+				merged.Add("info", Merge(template["info"], system["info"], "infO"));
 			else
-				merged.Add(info, template[info]);
+				merged.Add("info", template["info"]);
 
-			merged.Add(devices, MergeArraysOnTopLevelProperty(template[devices] as JArray,
-				system[devices] as JArray, "key", devices));
+			merged.Add("devices", MergeArraysOnTopLevelProperty(template["devices"] as JArray,
+				system["devices"] as JArray, "key", "devices"));
 
-			if (system[rooms] == null)
-				merged.Add(rooms, template[rooms]);
+			if (system["rooms"] == null)
+				merged.Add("rooms", template["rooms"]);
 			else
-				merged.Add(rooms, MergeArraysOnTopLevelProperty(template[rooms] as JArray,
-					system[rooms] as JArray, "key", rooms));
+				merged.Add("rooms", MergeArraysOnTopLevelProperty(template["rooms"] as JArray,
+					system["rooms"] as JArray, "key", "rooms"));
 
-			if (system[sourceLists] == null)
-				merged.Add(sourceLists, template[sourceLists]);
+			if (system["sourceLists"] == null)
+				merged.Add("sourceLists", template["sourceLists"]);
 			else
-				merged.Add(sourceLists, Merge(template[sourceLists], system[sourceLists], sourceLists));
+				merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"], "sourceLists"));
 
-		    if (system[destinationLists] == null)
-		        merged.Add(destinationLists, template[destinationLists]);
+		    if (system["destinationLists"] == null)
+		        merged.Add("destinationLists", template["destinationLists"]);
 		    else
-		        merged.Add(destinationLists,
-		            Merge(template[destinationLists], system[destinationLists], destinationLists));
+		        merged.Add("destinationLists",
+		            Merge(template["destinationLists"], system["destinationLists"], "destinationLists"));
 
 
-            if (system[cameraLists] == null)
-                merged.Add(cameraLists, template[cameraLists]);
+            if (system["cameraLists"] == null)
+                merged.Add("cameraLists", template["cameraLists"]);
             else
-                merged.Add(cameraLists, Merge(template[cameraLists], system[cameraLists], cameraLists));
+                merged.Add("cameraLists", Merge(template["cameraLists"], system["cameraLists"], "cameraLists"));
 
-            if (system[audioControlPointLists] == null)
-                merged.Add(audioControlPointLists, template[audioControlPointLists]);
+            if (system["audioControlPointLists"] == null)
+                merged.Add("audioControlPointLists", template["audioControlPointLists"]);
             else
-                merged.Add(audioControlPointLists,
-                    Merge(template[audioControlPointLists], system[audioControlPointLists], audioControlPointLists));
+                merged.Add("audioControlPointLists",
+                    Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists"));
 
 
             // Template tie lines take precedence.  Config tool doesn't do them at system
             // level anyway...
-            if (template[tieLines] != null)
-				merged.Add(tieLines, template[tieLines]);
-			else if (system[tieLines] != null)
-				merged.Add(tieLines, system[tieLines]);
+            if (template["tieLines"] != null)
+				merged.Add("tieLines", template["tieLines"]);
+			else if (system["tieLines"] != null)
+				merged.Add("tieLines", system["tieLines"]);
 			else
-				merged.Add(tieLines, new JArray());
+				merged.Add("tieLines", new JArray());
 
-            if (template[joinMaps] != null)
-                merged.Add(joinMaps, template[joinMaps]);
+            if (template["joinMaps"] != null)
+                merged.Add("joinMaps", template["joinMaps"]);
             else
-                merged.Add(joinMaps, new JObject());
+                merged.Add("joinMaps", new JObject());
 
-			if (system[global] != null)
-				merged.Add(global, Merge(template[global], system[global], global));
+			if (system["global"] != null)
+				merged.Add("global", Merge(template["global"], system["global"], "global"));
 			else
-				merged.Add(global, template[global]);
+				merged.Add("global", template["global"]);
 
 			//Debug.Console(2, "MERGED CONFIG RESULT: \x0d\x0a{0}", merged);
 			return merged;
@@ -247,7 +228,7 @@ namespace PepperDash.Core.Config
 					}
 					catch (Exception e)
 					{
-						Debug.LogError($"Cannot merge items at path {propPath}: \r{e}");
+						Debug.Console(1, Debug.ErrorLogLevel.Warning, "Cannot merge items at path {0}: \r{1}", propPath, e);
 					}
 				}
 			}

src/PepperDash.Core/JsonToSimpl/JsonToSimplMaster.cs

@@ -162,7 +162,7 @@ namespace PepperDash.Core.JsonToSimpl
             /// <returns></returns>
 			public static JObject ParseObject(string json)
 			{
-				#if NET6_0
+				#if NET8_0
                 using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
 #else
                 using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json)))
@@ -186,7 +186,7 @@ namespace PepperDash.Core.JsonToSimpl
    /// </summary>
 			public static JArray ParseArray(string json)
 			{
-				#if NET6_0
+				#if NET8_0
                 using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
 #else
                 using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json)))

src/PepperDash.Core/Logging/Debug.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronDataStore;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.CrestronLogger;
@@ -16,10 +11,15 @@ using Serilog.Events;
 using Serilog.Formatting.Compact;
 using Serilog.Formatting.Json;
 using Serilog.Templates;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text.RegularExpressions;
 
 namespace PepperDash.Core
 {
     /// <summary>
+    /// Contains debug commands for use in various situations
     /// </summary>
     public static class Debug
     {
@@ -40,27 +40,21 @@ namespace PepperDash.Core
 
         private static ILogger _logger;
 
-        private static readonly LoggingLevelSwitch _consoleLogLevelSwitch;
+        private static readonly LoggingLevelSwitch _consoleLoggingLevelSwitch;
 
-        private static readonly LoggingLevelSwitch _websocketLogLevelSwitch;
+        private static readonly LoggingLevelSwitch _websocketLoggingLevelSwitch;
 
         private static readonly LoggingLevelSwitch _errorLogLevelSwitch;
 
-        private static readonly LoggingLevelSwitch _fileLogLevelSwitch;
+        private static readonly LoggingLevelSwitch _fileLevelSwitch;
 
-        /// <summary>
-        /// Gets the minimum log level for the websocket sink.
-        /// </summary>
         public static LogEventLevel WebsocketMinimumLogLevel
         {
-            get { return _websocketLogLevelSwitch.MinimumLevel; }
+            get { return _websocketLoggingLevelSwitch.MinimumLevel; }
         }
 
         private static readonly DebugWebsocketSink _websocketSink;
 
-        /// <summary>
-        /// Gets the websocket sink for debug logging.
-        /// </summary>
         public static DebugWebsocketSink WebsocketSink
         {
             get { return _websocketSink; }
@@ -97,33 +91,29 @@ namespace PepperDash.Core
 
         private const int SaveTimeoutMs = 30000;
 
-        /// <summary>
-        /// Indicates whether the system is running on an appliance.
-        /// </summary>
         public static bool IsRunningOnAppliance = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance;
 
         /// <summary>
         /// Gets or sets the PepperDashCoreVersion
         /// </summary>
-        public static string PepperDashCoreVersion { get; private set; }
+        public static string PepperDashCoreVersion { get; private set; } 
 
         private static CTimer _saveTimer;
 
-        /// <summary>
-        /// When true, the IncludedExcludedKeys dict will contain keys to include. 
-        /// When false (default), IncludedExcludedKeys will contain keys to exclude.
-        /// </summary>
-        private static bool _excludeAllMode;
+		/// <summary>
+		/// When true, the IncludedExcludedKeys dict will contain keys to include. 
+		/// When false (default), IncludedExcludedKeys will contain keys to exclude.
+		/// </summary>
+		private static bool _excludeAllMode;
 
-        private static readonly Dictionary<string, object> IncludedExcludedKeys;
+		//static bool ExcludeNoKeyMessages;
+
+		private static readonly Dictionary<string, object> IncludedExcludedKeys;
 
         private static readonly LoggerConfiguration _defaultLoggerConfiguration;
 
         private static LoggerConfiguration _loggerConfiguration;
 
-        /// <summary>
-        /// Gets the logger configuration for the debug logging.
-        /// </summary>
         public static LoggerConfiguration LoggerConfiguration => _loggerConfiguration;
 
         static Debug()
@@ -138,13 +128,13 @@ namespace PepperDash.Core
 
             var defaultFileLogLevel = GetStoredLogEventLevel(FileLevelStoreKey);
 
-            _consoleLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);
+            _consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);            
 
-            _websocketLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultWebsocketLevel);
+            _websocketLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultWebsocketLevel);
 
             _errorLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultErrorLogLevel);
 
-            _fileLogLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultFileLogLevel);
+            _fileLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultFileLogLevel);
 
             _websocketSink = new DebugWebsocketSink(new JsonFormatter(renderMessage: true));
 
@@ -154,7 +144,7 @@ namespace PepperDash.Core
 
             CrestronConsole.PrintLine($"Saving log files to {logFilePath}");
 
-            var errorLogTemplate = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance
+            var errorLogTemplate = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance 
                 ? "{@t:fff}ms [{@l:u4}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}"
                 : "[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}";
 
@@ -162,14 +152,14 @@ namespace PepperDash.Core
                 .MinimumLevel.Verbose()
                 .Enrich.FromLogContext()
                 .Enrich.With(new CrestronEnricher())
-                .WriteTo.Sink(new DebugConsoleSink(new ExpressionTemplate("[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}")), levelSwitch: _consoleLogLevelSwitch)
-                .WriteTo.Sink(_websocketSink, levelSwitch: _websocketLogLevelSwitch)
+                .WriteTo.Sink(new DebugConsoleSink(new ExpressionTemplate("[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}")), levelSwitch: _consoleLoggingLevelSwitch)
+                .WriteTo.Sink(_websocketSink, levelSwitch: _websocketLoggingLevelSwitch)
                 .WriteTo.Sink(new DebugErrorLogSink(new ExpressionTemplate(errorLogTemplate)), levelSwitch: _errorLogLevelSwitch)
-                .WriteTo.File(new RenderedCompactJsonFormatter(), logFilePath,
+                .WriteTo.File(new RenderedCompactJsonFormatter(), logFilePath,                                    
                     rollingInterval: RollingInterval.Day,
                     restrictedToMinimumLevel: LogEventLevel.Debug,
-                    retainedFileCountLimit: CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? 7 : 14,
-                    levelSwitch: _fileLogLevelSwitch
+                    retainedFileCountLimit: CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? 30 : 60,
+                    levelSwitch: _fileLevelSwitch
                 );
 
             try
@@ -203,27 +193,27 @@ namespace PepperDash.Core
 
             CrestronConsole.PrintLine(msg);
 
-            LogMessage(LogEventLevel.Information, msg);
-
-            IncludedExcludedKeys = new Dictionary<string, object>();
+            LogMessage(LogEventLevel.Information,msg);
 
+			IncludedExcludedKeys = new Dictionary<string, object>();
+            
             if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SimplSharpPro)
             {
                 // Add command to console
-                CrestronConsole.AddNewConsoleCommand(SetDoNotLoadOnNextBootFromConsole, "donotloadonnextboot",
+                CrestronConsole.AddNewConsoleCommand(SetDoNotLoadOnNextBootFromConsole, "donotloadonnextboot", 
                     "donotloadonnextboot:P [true/false]: Should the application load on next boot", ConsoleAccessLevelEnum.AccessOperator);
 
                 CrestronConsole.AddNewConsoleCommand(SetDebugFromConsole, "appdebug",
                     "appdebug:P [0-5]: Sets the application's console debug message level",
                     ConsoleAccessLevelEnum.AccessOperator);
                 CrestronConsole.AddNewConsoleCommand(ShowDebugLog, "appdebuglog",
-                    "appdebuglog:P [all] Use \"all\" for full log.",
+                    "appdebuglog:P [all] Use \"all\" for full log.", 
                     ConsoleAccessLevelEnum.AccessOperator);
                 CrestronConsole.AddNewConsoleCommand(s => CrestronLogger.Clear(false), "appdebugclear",
-                    "appdebugclear:P Clears the current custom log",
+                    "appdebugclear:P Clears the current custom log", 
                     ConsoleAccessLevelEnum.AccessOperator);
-                CrestronConsole.AddNewConsoleCommand(SetDebugFilterFromConsole, "appdebugfilter",
-                    "appdebugfilter [params]", ConsoleAccessLevelEnum.AccessOperator);
+				CrestronConsole.AddNewConsoleCommand(SetDebugFilterFromConsole, "appdebugfilter",
+					"appdebugfilter [params]", ConsoleAccessLevelEnum.AccessOperator);
             }
 
             CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
@@ -234,16 +224,13 @@ namespace PepperDash.Core
             Level = context.Level;
             DoNotLoadConfigOnNextBoot = context.DoNotLoadOnNextBoot;
 
-            if (DoNotLoadConfigOnNextBoot)
+            if(DoNotLoadConfigOnNextBoot)
                 CrestronConsole.PrintLine(string.Format("Program {0} will not load config after next boot.  Use console command go:{0} to load the config manually", InitialParametersClass.ApplicationNumber));
 
-            _errorLogLevelSwitch.MinimumLevelChanged += (sender, args) =>
+            _consoleLoggingLevelSwitch.MinimumLevelChanged += (sender, args) =>
             {
-                LogMessage(LogEventLevel.Information, "Error log debug level set to {minimumLevel}", _errorLogLevelSwitch.MinimumLevel);
+                LogMessage(LogEventLevel.Information, "Console debug level set to {minimumLevel}", _consoleLoggingLevelSwitch.MinimumLevel);
             };
-
-            // Set initial error log level based on platform && stored level. If appliance, use stored level, otherwise default to verbose
-            SetErrorLogMinimumDebugLevel(CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? _errorLogLevelSwitch.MinimumLevel : LogEventLevel.Verbose);
         }
 
         /// <summary>
@@ -270,28 +257,22 @@ namespace PepperDash.Core
         {
             try
             {
-                var result = CrestronDataStoreStatic.GetLocalIntValue(levelStoreKey, out int logLevel);
+                var result = CrestronDataStoreStatic.GetLocalIntValue(levelStoreKey, out int logLevel);                
 
                 if (result != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
                 {
                     CrestronConsole.Print($"Unable to retrieve stored log level for {levelStoreKey}.\r\nError: {result}.\r\nSetting level to {LogEventLevel.Information}\r\n");
-
-                    CrestronDataStoreStatic.SetLocalIntValue(levelStoreKey, levelStoreKey == ErrorLogLevelStoreKey ? (int)LogEventLevel.Warning : (int)LogEventLevel.Information);
-
-                    return levelStoreKey == ErrorLogLevelStoreKey ? LogEventLevel.Warning : LogEventLevel.Information;
+                    return LogEventLevel.Information;
                 }
 
-                if (logLevel < 0 || logLevel > 5)
+                if(logLevel < 0 || logLevel > 5)
                 {
                     CrestronConsole.PrintLine($"Stored Log level not valid for {levelStoreKey}: {logLevel}. Setting level to {LogEventLevel.Information}");
                     return LogEventLevel.Information;
                 }
 
-                CrestronConsole.PrintLine($"Stored log level for {levelStoreKey} is {logLevel}");
-
                 return (LogEventLevel)logLevel;
-            }
-            catch (Exception ex)
+            } catch (Exception ex)
             {
                 CrestronConsole.PrintLine($"Exception retrieving log level for {levelStoreKey}: {ex.Message}");
                 return LogEventLevel.Information;
@@ -303,7 +284,7 @@ namespace PepperDash.Core
             var assembly = Assembly.GetExecutingAssembly();
             var ver =
                 assembly
-                    .GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
+                    .GetCustomAttributes(typeof (AssemblyInformationalVersionAttribute), false);
 
             if (ver != null && ver.Length > 0)
             {
@@ -354,104 +335,44 @@ namespace PepperDash.Core
                 if (levelString.Trim() == "?")
                 {
                     CrestronConsole.ConsoleCommandResponse(
-                    "Used to set the minimum level of debug messages:\r\n" +
-                    "Usage: appdebug:P [sink] [level]\r\n" +
-                    "  sink: console (default), errorlog, file, all\r\n" +
-                    "  all: sets all sinks to the specified level\r\n" +
-                    "  level: 0-5 or LogEventLevel name\r\n" +
-                    $"{_logLevels[0]} = 0\r\n" +
-                    $"{_logLevels[1]} = 1\r\n" +
-                    $"{_logLevels[2]} = 2\r\n" +
-                    $"{_logLevels[3]} = 3\r\n" +
-                    $"{_logLevels[4]} = 4\r\n" +
-                    $"{_logLevels[5]} = 5");
+                    $@"Used to set the minimum level of debug messages to be printed to the console:
+{_logLevels[0]} = 0
+{_logLevels[1]} = 1
+{_logLevels[2]} = 2
+{_logLevels[3]} = 3
+{_logLevels[4]} = 4
+{_logLevels[5]} = 5");
                     return;
                 }
 
                 if (string.IsNullOrEmpty(levelString.Trim()))
                 {
-                    CrestronConsole.ConsoleCommandResponse("Console log level = {0}\r\n", _consoleLogLevelSwitch.MinimumLevel);
-                    CrestronConsole.ConsoleCommandResponse("File log level = {0}\r\n", _fileLogLevelSwitch.MinimumLevel);
-                    CrestronConsole.ConsoleCommandResponse("Error log level = {0}\r\n", _errorLogLevelSwitch.MinimumLevel);
+                    CrestronConsole.ConsoleCommandResponse("AppDebug level = {0}", _consoleLoggingLevelSwitch.MinimumLevel);
                     return;
                 }
 
-                // Parse tokens: first token is sink (defaults to console), second token is level
-                var tokens = levelString.Trim().Split(new char[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-
-                string sinkName;
-                string levelToken;
-
-                if (tokens.Length == 1)
+                if(int.TryParse(levelString, out var levelInt))
                 {
-                    // Single token - assume it's a level for console sink
-                    sinkName = "console";
-                    levelToken = tokens[0];
-                }
-                else if (tokens.Length == 2)
-                {
-                    // Two tokens - first is sink, second is level
-                    sinkName = tokens[0].ToLowerInvariant();
-                    levelToken = tokens[1];
-                }
-                else
-                {
-                    CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [sink] [level]");
-                    return;
-                }
-
-                // Parse the level using the same logic as before
-                LogEventLevel level;
-
-                if (int.TryParse(levelToken, out var levelInt))
-                {
-                    if (levelInt < 0 || levelInt > 5)
+                    if(levelInt < 0 || levelInt > 5)
                     {
-                        CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelToken} to valid log level. If using a number, value must be between 0-5");
+                        CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level. If using a number, value must be between 0-5");
                         return;
                     }
-
-                    if (!_logLevels.TryGetValue((uint)levelInt, out level))
-                    {
-                        level = LogEventLevel.Information;
-                        CrestronConsole.ConsoleCommandResponse($"{levelInt} not valid. Setting level to {level}");
-                    }
-                }
-                else if (Enum.TryParse(levelToken, true, out level))
-                {
-                    // Successfully parsed as LogEventLevel enum
-                }
-                else
-                {
-                    CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelToken} to valid log level");
+                    SetDebugLevel((uint) levelInt);
                     return;
                 }
 
-                // Set the level for the specified sink
-                switch (sinkName)
+                if(Enum.TryParse<LogEventLevel>(levelString, out var levelEnum))
                 {
-                    case "console":
-                        SetDebugLevel(level);
-                        break;
-                    case "errorlog":
-                        SetErrorLogMinimumDebugLevel(level);
-                        break;
-                    case "file":
-                        SetFileMinimumDebugLevel(level);
-                        break;
-                    case "all":
-                        SetDebugLevel(level);
-                        SetErrorLogMinimumDebugLevel(level);
-                        SetFileMinimumDebugLevel(level);
-                        break;
-                    default:
-                        CrestronConsole.ConsoleCommandResponse($"Error: Unknown sink '{sinkName}'. Valid sinks: console, errorlog, file");
-                        break;
+                    SetDebugLevel(levelEnum);
+                    return;
                 }
-            }
+
+                CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level");
+            }          
             catch
             {
-                CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [sink] [level]");
+                CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [0-5]");
             }
         }
 
@@ -464,7 +385,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetDebugLevel(uint level)
         {
-            if (!_logLevels.TryGetValue(level, out var logLevel))
+            if(!_logLevels.TryGetValue(level, out var logLevel))
             {
                 logLevel = LogEventLevel.Information;
 
@@ -481,14 +402,14 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetDebugLevel(LogEventLevel level)
         {
-            _consoleLogLevelSwitch.MinimumLevel = level;
+            _consoleLoggingLevelSwitch.MinimumLevel = level;
 
-            CrestronConsole.ConsoleCommandResponse("[Application {0}] Debug level set to {1}\r\n",
-                InitialParametersClass.ApplicationNumber, _consoleLogLevelSwitch.MinimumLevel);
+            CrestronConsole.ConsoleCommandResponse("[Application {0}], Debug level set to {1}\r\n",
+                InitialParametersClass.ApplicationNumber, _consoleLoggingLevelSwitch.MinimumLevel);
 
-            CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int)level}");
+            CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int) level}");
 
-            var err = CrestronDataStoreStatic.SetLocalIntValue(LevelStoreKey, (int)level);
+            var err = CrestronDataStoreStatic.SetLocalIntValue(LevelStoreKey, (int) level);
 
             CrestronConsole.ConsoleCommandResponse($"Store result: {err}:{(int)level}");
 
@@ -501,14 +422,14 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetWebSocketMinimumDebugLevel(LogEventLevel level)
         {
-            _websocketLogLevelSwitch.MinimumLevel = level;
+            _websocketLoggingLevelSwitch.MinimumLevel = level;            
 
-            var err = CrestronDataStoreStatic.SetLocalUintValue(WebSocketLevelStoreKey, (uint)level);
+            var err = CrestronDataStoreStatic.SetLocalUintValue(WebSocketLevelStoreKey, (uint) level);
 
             if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
                 LogMessage(LogEventLevel.Information, "Error saving websocket debug level setting: {erro}", err);
 
-            LogMessage(LogEventLevel.Information, "Websocket debug level set to {0}", _websocketLogLevelSwitch.MinimumLevel);
+            LogMessage(LogEventLevel.Information, "Websocket debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
         }
 
         /// <summary>
@@ -518,17 +439,12 @@ namespace PepperDash.Core
         {
             _errorLogLevelSwitch.MinimumLevel = level;
 
-            CrestronConsole.ConsoleCommandResponse("[Application {0}] Error log level set to {1}\r\n",
-                InitialParametersClass.ApplicationNumber, _errorLogLevelSwitch.MinimumLevel);
-
-            CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int)level}");
-
-            var err = CrestronDataStoreStatic.SetLocalIntValue(ErrorLogLevelStoreKey, (int)level);
-
-            CrestronConsole.ConsoleCommandResponse($"Store result: {err}:{(int)level}");
+            var err = CrestronDataStoreStatic.SetLocalUintValue(ErrorLogLevelStoreKey, (uint)level);
 
             if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-                CrestronConsole.PrintLine($"Error saving error log debug level setting: {err}");
+                LogMessage(LogEventLevel.Information, "Error saving Error Log debug level setting: {error}", err);
+
+            LogMessage(LogEventLevel.Information, "Error log debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
         }
 
         /// <summary>
@@ -536,19 +452,14 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetFileMinimumDebugLevel(LogEventLevel level)
         {
-            _fileLogLevelSwitch.MinimumLevel = level;
+            _errorLogLevelSwitch.MinimumLevel = level;
 
-            CrestronConsole.ConsoleCommandResponse("[Application {0}] File log level set to {1}\r\n",
-                InitialParametersClass.ApplicationNumber, _fileLogLevelSwitch.MinimumLevel);
-
-            CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int)level}");
-
-            var err = CrestronDataStoreStatic.SetLocalIntValue(FileLevelStoreKey, (int)level);
-
-            CrestronConsole.ConsoleCommandResponse($"Store result: {err}:{(int)level}");
+            var err = CrestronDataStoreStatic.SetLocalUintValue(ErrorLogLevelStoreKey, (uint)level);
 
             if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-                CrestronConsole.PrintLine($"Error saving file debug level setting: {err}");
+                LogMessage(LogEventLevel.Information, "Error saving File debug level setting: {error}", err);
+
+            LogMessage(LogEventLevel.Information, "File debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
         }
 
         /// <summary>
@@ -580,83 +491,83 @@ namespace PepperDash.Core
         /// Callback for console command
         /// </summary>
         /// <param name="items"></param>
-        /// <summary>
-        /// SetDebugFilterFromConsole method
-        /// </summary>
-        public static void SetDebugFilterFromConsole(string items)
-        {
-            var str = items.Trim();
-            if (str == "?")
-            {
-                CrestronConsole.ConsoleCommandResponse("Usage:\r APPDEBUGFILTER key1 key2 key3....\r " +
-                    "+all: at beginning puts filter into 'default include' mode\r" +
-                    "      All keys that follow will be excluded from output.\r" +
-                    "-all: at beginning puts filter into 'default exclude all' mode.\r" +
-                    "      All keys that follow will be the only keys that are shown\r" +
-                    "+nokey: Enables messages with no key (default)\r" +
-                    "-nokey: Disables messages with no key.\r" +
-                    "(nokey settings are independent of all other settings)");
-                return;
-            }
-            var keys = Regex.Split(str, @"\s*");
-            foreach (var keyToken in keys)
-            {
-                var lkey = keyToken.ToLower();
-                if (lkey == "+all")
-                {
-                    IncludedExcludedKeys.Clear();
-                    _excludeAllMode = false;
-                }
-                else if (lkey == "-all")
-                {
-                    IncludedExcludedKeys.Clear();
-                    _excludeAllMode = true;
-                }
-                //else if (lkey == "+nokey")
-                //{
-                //    ExcludeNoKeyMessages = false;
-                //}
-                //else if (lkey == "-nokey")
-                //{
-                //    ExcludeNoKeyMessages = true;
-                //}
-                else
-                {
-                    string key;
-                    if (lkey.StartsWith("-"))
-                    {
-                        key = lkey.Substring(1);
-                        // if in exclude all mode, we need to remove this from the inclusions
-                        if (_excludeAllMode)
-                        {
-                            if (IncludedExcludedKeys.ContainsKey(key))
-                                IncludedExcludedKeys.Remove(key);
-                        }
-                        // otherwise include all mode, add to the exclusions
-                        else
-                        {
-                            IncludedExcludedKeys[key] = new object();
-                        }
-                    }
-                    else if (lkey.StartsWith("+"))
-                    {
-                        key = lkey.Substring(1);
-                        // if in exclude all mode, we need to add this as inclusion
-                        if (_excludeAllMode)
-                        {
+  /// <summary>
+  /// SetDebugFilterFromConsole method
+  /// </summary>
+		public static void SetDebugFilterFromConsole(string items)
+		{
+			var str = items.Trim();
+			if (str == "?")
+			{
+				CrestronConsole.ConsoleCommandResponse("Usage:\r APPDEBUGFILTER key1 key2 key3....\r " +
+					"+all: at beginning puts filter into 'default include' mode\r" +
+					"      All keys that follow will be excluded from output.\r" +
+					"-all: at beginning puts filter into 'default exclude all' mode.\r" +
+					"      All keys that follow will be the only keys that are shown\r" +
+					"+nokey: Enables messages with no key (default)\r" +
+					"-nokey: Disables messages with no key.\r" +
+					"(nokey settings are independent of all other settings)");
+				return;
+			}
+			var keys = Regex.Split(str, @"\s*");
+			foreach (var keyToken in keys)
+			{
+				var lkey = keyToken.ToLower();
+				if (lkey == "+all")
+				{
+					IncludedExcludedKeys.Clear();
+					_excludeAllMode = false;
+				}
+				else if (lkey == "-all")
+				{
+					IncludedExcludedKeys.Clear();
+					_excludeAllMode = true;
+				}
+				//else if (lkey == "+nokey")
+				//{
+				//    ExcludeNoKeyMessages = false;
+				//}
+				//else if (lkey == "-nokey")
+				//{
+				//    ExcludeNoKeyMessages = true;
+				//}
+				else
+				{
+					string key;
+					if (lkey.StartsWith("-"))
+					{
+						key = lkey.Substring(1);
+						// if in exclude all mode, we need to remove this from the inclusions
+						if (_excludeAllMode)
+						{
+							if (IncludedExcludedKeys.ContainsKey(key))
+								IncludedExcludedKeys.Remove(key);
+						}
+						// otherwise include all mode, add to the exclusions
+						else
+						{
+							IncludedExcludedKeys[key] = new object();
+						}
+					}
+					else if (lkey.StartsWith("+"))
+					{
+						key = lkey.Substring(1);
+						// if in exclude all mode, we need to add this as inclusion
+						if (_excludeAllMode)
+						{
 
-                            IncludedExcludedKeys[key] = new object();
-                        }
-                        // otherwise include all mode, remove this from exclusions
-                        else
-                        {
-                            if (IncludedExcludedKeys.ContainsKey(key))
-                                IncludedExcludedKeys.Remove(key);
-                        }
-                    }
-                }
-            }
-        }
+							IncludedExcludedKeys[key] = new object();
+						}
+						// otherwise include all mode, remove this from exclusions
+						else
+						{
+							if (IncludedExcludedKeys.ContainsKey(key))
+								IncludedExcludedKeys.Remove(key);
+						}
+					}
+				}
+			}
+		}
 
 
 
@@ -684,7 +595,7 @@ namespace PepperDash.Core
         public static object GetDeviceDebugSettingsForKey(string deviceKey)
         {
             return _contexts.GetDebugSettingsForKey(deviceKey);
-        }
+        }  
 
         /// <summary>
         /// Sets the flag to prevent application starting on next boot
@@ -743,15 +654,9 @@ namespace PepperDash.Core
             }
         }
 
-        /// <summary>
-        /// Logs a message at the specified log level.
-        /// </summary>
-        /// <param name="level">Level to log at</param>
-        /// <param name="message">Message template</param>
-        /// <param name="args">Args to put into message template</param>
         public static void LogMessage(LogEventLevel level, string message, params object[] args)
         {
-            _logger.Write(level, message, args);
+           _logger.Write(level, message, args);
         }
 
         /// <summary>
@@ -787,7 +692,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogVerbose(IKeyed keyed, string message, params object[] args)
         {
-            using (LogContext.PushProperty("Key", keyed?.Key))
+            using(LogContext.PushProperty("Key", keyed?.Key))
             {
                 _logger.Write(LogEventLevel.Verbose, message, args);
             }
@@ -798,7 +703,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogVerbose(Exception ex, IKeyed keyed, string message, params object[] args)
         {
-            using (LogContext.PushProperty("Key", keyed?.Key))
+            using(LogContext.PushProperty("Key", keyed?.Key))
             {
                 _logger.Write(LogEventLevel.Verbose, ex, message, args);
             }
@@ -817,7 +722,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogVerbose(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Verbose, ex, message, args);
+            _logger.Write(LogEventLevel.Verbose, ex, null, message, args);
         }
 
         /// <summary>
@@ -893,7 +798,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogInformation(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Information, ex, message, args);
+            _logger.Write(LogEventLevel.Information, ex, null, message, args);
         }
 
         /// <summary>
@@ -931,7 +836,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogWarning(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Warning, ex, message, args);
+            _logger.Write(LogEventLevel.Warning, ex, null, message, args);
         }
 
         /// <summary>
@@ -969,7 +874,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogError(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Error, ex, message, args);
+            _logger.Write(LogEventLevel.Error, ex, null, message, args);
         }
 
         /// <summary>
@@ -1007,7 +912,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogFatal(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Fatal, ex, message, args);
+            _logger.Write(LogEventLevel.Fatal, ex, null, message, args);
         }
 
         #endregion
@@ -1018,7 +923,7 @@ namespace PepperDash.Core
             if (!_logLevels.ContainsKey(level)) return;
 
             var logLevel = _logLevels[level];
-
+            
             LogMessage(logLevel, format, items);
         }
 
@@ -1073,7 +978,7 @@ namespace PepperDash.Core
         [Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
         public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel,
             string format, params object[] items)
-        {
+        {           
             LogMessage(level, dev, format, items);
         }
 
@@ -1081,6 +986,9 @@ namespace PepperDash.Core
         /// Logs to Console when at-level, and all messages to error log
         /// </summary>
         [Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
+        /// <summary>
+        /// Console method
+        /// </summary>
         public static void Console(uint level, ErrorLogLevel errorLogLevel,
             string format, params object[] items)
         {
@@ -1093,6 +1001,9 @@ namespace PepperDash.Core
         /// it will only be written to the log.
         /// </summary>
         [Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
+        /// <summary>
+        /// ConsoleWithLog method
+        /// </summary>
         public static void ConsoleWithLog(uint level, string format, params object[] items)
         {
             LogMessage(level, format, items);
@@ -1211,7 +1122,7 @@ namespace PepperDash.Core
                 return string.Format(@"\user\debugSettings\program{0}", InitialParametersClass.ApplicationNumber);
             }
 
-            return string.Format("{0}{1}user{1}debugSettings{1}{2}.json", Directory.GetApplicationRootDirectory(), Path.DirectorySeparatorChar, InitialParametersClass.RoomId);
+            return string.Format("{0}{1}user{1}debugSettings{1}{2}.json",Directory.GetApplicationRootDirectory(), Path.DirectorySeparatorChar, InitialParametersClass.RoomId);
         }
 
         /// <summary>
@@ -1222,15 +1133,15 @@ namespace PepperDash.Core
             /// <summary>
             /// Error
             /// </summary>
-            Error,
+            Error, 
             /// <summary>
             /// Warning
             /// </summary>
-            Warning,
+            Warning, 
             /// <summary>
             /// Notice
             /// </summary>
-            Notice,
+            Notice, 
             /// <summary>
             /// None
             /// </summary>

src/PepperDash.Core/Logging/DebugExtensions.cs

@@ -1,5 +1,5 @@
-using System;
-using Serilog.Events;
+using Serilog.Events;
+using System;
 using Log = PepperDash.Core.Debug;
 
 namespace PepperDash.Core.Logging
@@ -11,7 +11,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogException(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogMessage(ex, message, device: device, args);
+            Log.LogMessage(ex, message, device, args);
         }
 
         /// <summary>
@@ -19,7 +19,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogVerbose(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogVerbose(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Verbose, ex, message, device, args);
         }
 
         /// <summary>
@@ -27,7 +27,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogVerbose(this IKeyed device, string message, params object[] args)
         {
-            Log.LogVerbose(device, message, args);
+            Log.LogMessage(LogEventLevel.Verbose, device, message, args);
         }
 
         /// <summary>
@@ -35,7 +35,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogDebug(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogDebug(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Debug, ex, message, device, args);
         }
 
         /// <summary>
@@ -43,7 +43,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogDebug(this IKeyed device, string message, params object[] args)
         {
-            Log.LogDebug(device, message, args);
+            Log.LogMessage(LogEventLevel.Debug, device, message, args);
         }
 
         /// <summary>
@@ -51,7 +51,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogInformation(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogInformation(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Information, ex, message, device, args);
         }
 
         /// <summary>
@@ -59,7 +59,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogInformation(this IKeyed device, string message, params object[] args)
         {
-            Log.LogInformation(device, message, args);
+            Log.LogMessage(LogEventLevel.Information, device, message, args);
         }
 
         /// <summary>
@@ -67,7 +67,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogWarning(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogWarning(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Warning, ex, message, device, args);
         }
 
         /// <summary>
@@ -75,7 +75,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogWarning(this IKeyed device, string message, params object[] args)
         {
-            Log.LogWarning(device, message, args);
+            Log.LogMessage(LogEventLevel.Warning, device, message, args);
         }
 
         /// <summary>
@@ -83,7 +83,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogError(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogError(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Error, ex, message, device, args);
         }
 
         /// <summary>
@@ -91,7 +91,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogError(this IKeyed device, string message, params object[] args)
         {
-            Log.LogError(device, message, args);
+            Log.LogMessage(LogEventLevel.Error, device, message, args);
         }
 
         /// <summary>
@@ -99,7 +99,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogFatal(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogFatal(ex, device, message, args);
+            Log.LogMessage(LogEventLevel.Fatal, ex, message, device, args);
         }
 
         /// <summary>
@@ -107,7 +107,7 @@ namespace PepperDash.Core.Logging
         /// </summary>
         public static void LogFatal(this IKeyed device, string message, params object[] args)
         {
-            Log.LogFatal(device, message, args);
+            Log.LogMessage(LogEventLevel.Fatal, device, message, args);
         }
     }
 }

src/PepperDash.Core/PepperDash.Core.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RootNamespace>PepperDash.Core</RootNamespace>
     <AssemblyName>PepperDashCore</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
     <Deterministic>true</Deterministic>
     <NeutralLanguage>en</NeutralLanguage>
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -44,6 +44,7 @@
   <ItemGroup>
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
     <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
@@ -52,9 +53,6 @@
     <PackageReference Include="SSH.NET" Version="2024.2.0" />
     <PackageReference Include="WebSocketSharp" Version="1.0.3-rc11" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6'">
-	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Remove="Comm\._GenericSshClient.cs" />
     <Compile Remove="Comm\._GenericTcpIpClient.cs" />

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -6,25 +6,24 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.EthernetCommunication;
+
 using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Core.Logging;
+using PepperDash.Essentials.Core.Communications;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.JoinMaps;
+using PepperDash.Essentials.Core.Monitoring;
 using Serilog.Events;
 
+//using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
     /// <summary>
     /// Base class for bridge API variants
     /// </summary>
-    [Obsolete("Will be removed in v3.0.0")]
     public abstract class BridgeApi : EssentialsDevice
     {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key">Device key</param>
         protected BridgeApi(string key) :
             base(key)
         {
@@ -33,36 +32,23 @@ namespace PepperDash.Essentials.Core.Bridges
     }
 
     /// <summary>
-    /// Class to link devices and rooms to an EISC Instance
+    /// Represents a EiscApiAdvanced
     /// </summary>
     public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
     {
-        /// <summary>
-        /// Gets the PropertiesConfig
-        /// </summary>
         public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
 
-        /// <summary>
-        /// Gets the JoinMaps dictionary
-        /// </summary>
         public Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
 
-        /// <summary>
-        /// Gets the EISC instance
-        /// </summary>
         public BasicTriList Eisc { get; private set; }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="dc">Device configuration</param>
-        /// <param name="eisc">EISC instance</param>
         public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
             base(dc.Key)
         {
             JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
 
             PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
+            //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
 
             Eisc = eisc;
 
@@ -77,7 +63,8 @@ namespace PepperDash.Essentials.Core.Bridges
 
         /// <summary>
         /// CustomActivate method
-        /// </summary>        
+        /// </summary>
+        /// <inheritdoc />
         public override bool CustomActivate()
         {
             CommunicationMonitor.Start();
@@ -99,7 +86,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (PropertiesConfig.Devices == null)
             {
-                this.LogDebug("No devices linked to this bridge");
+                Debug.LogMessage(LogEventLevel.Debug, this, "No devices linked to this bridge");
                 return;
             }
 
@@ -120,7 +107,9 @@ namespace PepperDash.Essentials.Core.Bridges
                     continue;
                 }
 
-                this.LogWarning("{deviceKey} is not compatible with this bridge type. Please update the device.", device.Key);
+                Debug.LogMessage(LogEventLevel.Information, this,
+                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
+                        device.Key);
             }
         }
 
@@ -135,31 +124,34 @@ namespace PepperDash.Essentials.Core.Bridges
 
             if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
             {
-                this.LogVerbose("Registration result: {registerResult}", registerResult);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Registration result: {0}", registerResult);
                 return;
             }
 
-            this.LogDebug("EISC registration successful");
+            Debug.LogMessage(LogEventLevel.Debug, this, "EISC registration successful");
         }
 
         /// <summary>
-        /// Link rooms to this EISC. Rooms MUST implement IBridgeAdvanced
+        /// LinkRooms method
         /// </summary>
         public void LinkRooms()
         {
-            this.LogDebug("Linking Rooms...");
+            Debug.LogMessage(LogEventLevel.Debug, this, "Linking Rooms...");
 
             if (PropertiesConfig.Rooms == null)
             {
-                this.LogDebug("No rooms linked to this bridge.");
+                Debug.LogMessage(LogEventLevel.Debug, this, "No rooms linked to this bridge.");
                 return;
             }
 
             foreach (var room in PropertiesConfig.Rooms)
             {
-                if (!(DeviceManager.GetDeviceForKey(room.RoomKey) is IBridgeAdvanced rm))
+                var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
+
+                if (rm == null)
                 {
-                    this.LogDebug("Room {roomKey} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
+                    Debug.LogMessage(LogEventLevel.Debug, this,
+                        "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
                     continue;
                 }
 
@@ -170,8 +162,11 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <summary>
         /// Adds a join map
         /// </summary>
-        /// <param name="deviceKey">The key of the device to add the join map for</param>
-        /// <param name="joinMap">The join map to add</param>        
+        /// <param name="deviceKey"></param>
+        /// <param name="joinMap"></param>
+        /// <summary>
+        /// AddJoinMap method
+        /// </summary>
         public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
         {
             if (!JoinMaps.ContainsKey(deviceKey))
@@ -180,13 +175,14 @@ namespace PepperDash.Essentials.Core.Bridges
             }
             else
             {
-                this.LogWarning("Unable to add join map with key '{deviceKey}'.  Key already exists in JoinMaps dictionary", deviceKey);
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
             }
         }
 
         /// <summary>
         /// PrintJoinMaps method
-        /// </summary>        
+        /// </summary>
+        /// <inheritdoc />
         public virtual void PrintJoinMaps()
         {
             CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));
@@ -197,17 +193,17 @@ namespace PepperDash.Essentials.Core.Bridges
                 joinMap.Value.PrintJoinMapInfo();
             }
         }
-
         /// <summary>
         /// MarkdownForBridge method
-        /// </summary>        
+        /// </summary>
+        /// <inheritdoc />
         public virtual void MarkdownForBridge(string bridgeKey)
         {
-            this.LogInformation("Writing Joinmaps to files for EISC IPID: {eiscId}", Eisc.ID.ToString("X"));
+            Debug.LogMessage(LogEventLevel.Information, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
 
             foreach (var joinMap in JoinMaps)
             {
-                this.LogInformation("Generating markdown for device '{deviceKey}':", joinMap.Key);
+                Debug.LogMessage(LogEventLevel.Information, "Generating markdown for device '{0}':", joinMap.Key);
                 joinMap.Value.MarkdownJoinMapInfo(joinMap.Key, bridgeKey);
             }
         }
@@ -215,45 +211,53 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <summary>
         /// Prints the join map for a device by key
         /// </summary>
-        /// <param name="deviceKey">The key of the device to print the join map for</param>        
+        /// <param name="deviceKey"></param>
+        /// <summary>
+        /// PrintJoinMapForDevice method
+        /// </summary>
         public void PrintJoinMapForDevice(string deviceKey)
         {
             var joinMap = JoinMaps[deviceKey];
 
             if (joinMap == null)
             {
-                this.LogInformation("Unable to find joinMap for device with key: '{deviceKey}'", deviceKey);
+                Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
                 return;
             }
 
-            this.LogInformation("Join map for device '{deviceKey}' on EISC '{eiscKey}':", deviceKey, Key);
+            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
             joinMap.PrintJoinMapInfo();
         }
         /// <summary>
-        /// Prints the join map for a device by key in Markdown format
+        /// Prints the join map for a device by key
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        /// <summary>
+        /// MarkdownJoinMapForDevice method
         /// </summary>
-        /// <param name="deviceKey">The key of the device to print the join map for</param>
-        /// <param name="bridgeKey">The key of the bridge to use for the Markdown output</param>        
         public void MarkdownJoinMapForDevice(string deviceKey, string bridgeKey)
         {
             var joinMap = JoinMaps[deviceKey];
 
             if (joinMap == null)
             {
-                this.LogInformation("Unable to find joinMap for device with key: '{deviceKey}'", deviceKey);
+                Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
                 return;
             }
 
-            this.LogInformation("Join map for device '{deviceKey}' on EISC '{eiscKey}':", deviceKey, Key);
+            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
             joinMap.MarkdownJoinMapInfo(deviceKey, bridgeKey);
         }
 
         /// <summary>
         /// Used for debugging to trigger an action based on a join number and type
         /// </summary>
-        /// <param name="join">The join number to execute the action for</param>
-        /// <param name="type">The type of join (digital, analog, serial)</param>
-        /// <param name="state">The state to pass to the action</param>        
+        /// <param name="join"></param>
+        /// <param name="type"></param>
+        /// <param name="state"></param>
+        /// <summary>
+        /// ExecuteJoinAction method
+        /// </summary>
         public void ExecuteJoinAction(uint join, string type, object state)
         {
             try
@@ -262,87 +266,78 @@ namespace PepperDash.Essentials.Core.Bridges
                 {
                     case "digital":
                         {
-                            if (Eisc.BooleanOutput[join].UserObject is Action<bool> userObject)
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
+                            if (uo != null)
                             {
-                                this.LogVerbose("Executing Boolean Action");
-                                userObject(Convert.ToBoolean(state));
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
+                                uo(Convert.ToBoolean(state));
                             }
                             else
-                                this.LogVerbose("User Object is null.  Nothing to Execute");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
                             break;
                         }
                     case "analog":
                         {
-                            if (Eisc.UShortOutput[join].UserObject is Action<ushort> userObject)
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
+                            if (uo != null)
                             {
-                                this.LogVerbose("Executing Analog Action");
-                                userObject(Convert.ToUInt16(state));
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
+                                uo(Convert.ToUInt16(state));
                             }
                             else
-                                this.LogVerbose("User Object is null.  Nothing to Execute");
-                            break;
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute"); break;
                         }
                     case "serial":
                         {
-                            if (Eisc.StringOutput[join].UserObject is Action<string> userObject)
+                            var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
+                            if (uo != null)
                             {
-                                this.LogVerbose("Executing Serial Action");
-                                userObject(Convert.ToString(state));
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
+                                uo(Convert.ToString(state));
                             }
                             else
-                                this.LogVerbose("User Object is null.  Nothing to Execute");
+                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
                             break;
                         }
                     default:
                         {
-                            this.LogVerbose("Unknown join type.  Use digital/serial/analog");
+                            Debug.LogMessage(LogEventLevel.Verbose, "Unknown join type.  Use digital/serial/analog");
                             break;
                         }
                 }
             }
             catch (Exception e)
             {
-                this.LogError("ExecuteJoinAction error: {message}", e.Message);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
 
         }
 
         /// <summary>
-        /// Handle incoming sig changes
+        /// Handles incoming sig changes
         /// </summary>
-        /// <param name="currentDevice">BasicTriList device that triggered the event</param>
-        /// <param name="args">Event arguments containing the signal information</param>
+        /// <param name="currentDevice"></param>
+        /// <param name="args"></param>
         protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
         {
             try
             {
-                this.LogVerbose("EiscApiAdvanced change: {type} {number}={value}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-                var userObject = args.Sig.UserObject;
+                Debug.LogMessage(LogEventLevel.Verbose, this, "EiscApiAdvanced change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+                var uo = args.Sig.UserObject;
 
-                if (userObject == null) return;
+                if (uo == null) return;
 
-
-                if (userObject is Action<bool>)
-                {
-                    this.LogDebug("Executing Boolean Action");
-                    (userObject as Action<bool>)(args.Sig.BoolValue);
-                }
-                else if (userObject is Action<ushort>)
-                {
-                    this.LogDebug("Executing Analog Action");
-                    (userObject as Action<ushort>)(args.Sig.UShortValue);
-                }
-                else if (userObject is Action<string>)
-                {
-                    this.LogDebug("Executing Serial Action");
-                    (userObject as Action<string>)(args.Sig.StringValue);
-                }
+                Debug.LogMessage(LogEventLevel.Debug, this, "Executing Action: {0}", uo.ToString());
+                if (uo is Action<bool>)
+                    (uo as Action<bool>)(args.Sig.BoolValue);
+                else if (uo is Action<ushort>)
+                    (uo as Action<ushort>)(args.Sig.UShortValue);
+                else if (uo is Action<string>)
+                    (uo as Action<string>)(args.Sig.StringValue);
             }
             catch (Exception e)
             {
-                this.LogError("Eisc_SigChange handler error: {message}", e.Message);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Verbose, this, "Error in Eisc_SigChange handler: {0}", e);
             }
         }
 
@@ -361,22 +356,22 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class EiscApiPropertiesConfig
     {
+        [JsonProperty("control")]
         /// <summary>
         /// Gets or sets the Control
         /// </summary>
-        [JsonProperty("control")]
         public EssentialsControlPropertiesConfig Control { get; set; }
 
+        [JsonProperty("devices")]
         /// <summary>
         /// Gets or sets the Devices
         /// </summary>
-        [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
+        [JsonProperty("rooms")]
         /// <summary>
         /// Gets or sets the Rooms
         /// </summary>
-        [JsonProperty("rooms")]
         public List<ApiRoomPropertiesConfig> Rooms { get; set; }
 
 
@@ -385,22 +380,22 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public class ApiDevicePropertiesConfig
         {
+            [JsonProperty("deviceKey")]
             /// <summary>
             /// Gets or sets the DeviceKey
             /// </summary>
-            [JsonProperty("deviceKey")]
             public string DeviceKey { get; set; }
 
+            [JsonProperty("joinStart")]
             /// <summary>
             /// Gets or sets the JoinStart
             /// </summary>
-            [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
+            [JsonProperty("joinMapKey")]
             /// <summary>
             /// Gets or sets the JoinMapKey
             /// </summary>
-            [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 
@@ -409,55 +404,44 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public class ApiRoomPropertiesConfig
         {
+            [JsonProperty("roomKey")]
             /// <summary>
             /// Gets or sets the RoomKey
             /// </summary>
-            [JsonProperty("roomKey")]
             public string RoomKey { get; set; }
 
+            [JsonProperty("joinStart")]
             /// <summary>
             /// Gets or sets the JoinStart
             /// </summary>
-            [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
+            [JsonProperty("joinMapKey")]
             /// <summary>
             /// Gets or sets the JoinMapKey
             /// </summary>
-            [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 
     }
 
     /// <summary>
-    /// Factory class for EiscApiAdvanced devices
+    /// Represents a EiscApiAdvancedFactory
     /// </summary>
-    /// <remarks>
-    /// Supported types:
-    /// eiscapiadv - Create a standard EISC client over TCP/IP
-    /// eiscapiadvanced - Create a standard EISC client over TCP/IP
-    /// eiscapiadvancedserver - Create an EISC server
-    /// eiscapiadvancedclient - Create an EISC client
-    /// vceiscapiadv - Create a VC-4 EISC client
-    /// vceiscapiadvanced - Create a VC-4 EISC client
-    /// eiscapiadvudp - Create a standard EISC client over UDP
-    /// eiscapiadvancedudp - Create a standard EISC client over UDP
-    /// </remarks>
     public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
     {
-        /// <summary>
-        /// Constructor
-        /// </summary>
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced", "eiscapiadvudp", "eiscapiadvancedudp" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
         }
 
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogDebug("Attempting to create new EiscApiAdvanced Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new EiscApiAdvanced Device");
 
             var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
 
@@ -465,13 +449,6 @@ namespace PepperDash.Essentials.Core.Bridges
 
             switch (dc.Type.ToLower())
             {
-                case "eiscapiadvudp":
-                case "eiscapiadvancedudp":
-                    {
-                        eisc = new EthernetIntersystemCommunications(controlProperties.IpIdInt,
-                            controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
-                    }
                 case "eiscapiadv":
                 case "eiscapiadvanced":
                     {
@@ -494,7 +471,7 @@ namespace PepperDash.Essentials.Core.Bridges
                     {
                         if (string.IsNullOrEmpty(controlProperties.RoomId))
                         {
-                            Debug.LogInformation("Unable to build VC-4 EISC Client for device {deviceKey}. Room ID is missing or empty", dc.Key);
+                            Debug.LogMessage(LogEventLevel.Information, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
                             eisc = null;
                             break;
                         }

src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs

@@ -1,4 +1,4 @@
-using PepperDash.Core;
+using PepperDash.Essentials.Core.Devices;
 using Serilog.Events;
 
 //using PepperDash.Essentials.Devices.Common.Cameras;
@@ -10,10 +10,6 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public static class BridgeHelper
     {
-        /// <summary>
-        /// PrintJoinMp method
-        /// </summary>
-        /// <param name="command">target bridgekey to print join map for</param>
         public static void PrintJoinMap(string command)
         {
             var targets = command.Split(' ');

src/PepperDash.Essentials.Core/Bridges/IBridge.cs

@@ -7,13 +7,6 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public interface IBridgeAdvanced
     {
-        /// <summary>
-        /// Links the bridge to the API using the provided trilist, join start, join map key, and bridge.
-        /// </summary>
-        /// <param name="trilist">The trilist to link to.</param>
-        /// <param name="joinStart">The starting join number.</param>
-        /// <param name="joinMapKey">The key for the join map.</param>
-        /// <param name="bridge">The EISC API bridge.</param>
         void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

@@ -1,92 +1,57 @@
+using PepperDash.Essentials.Core.JoinMaps;
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a AirMediaControllerJoinMap
     /// </summary>
     public class AirMediaControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Air Media Online status
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Air Media In Sharing Session status
-        /// </summary>
         [JoinName("IsInSession")]
         public JoinDataComplete IsInSession = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media In Sharing Session", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Air Media Has HDMI Video Sync status
-        /// </summary>
         [JoinName("HdmiVideoSync")]
         public JoinDataComplete HdmiVideoSync = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Has HDMI Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Air Media Automatic Input Routing Enable(d)
-        /// </summary>
         [JoinName("AutomaticInputRoutingEnabled")]
         public JoinDataComplete AutomaticInputRoutingEnabled = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Automatic Input Routing Enable(d)", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Air Media Video Route Select / Feedback
-        /// </summary>
         [JoinName("VideoOut")]
         public JoinDataComplete VideoOut = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Video Route Select / Feedback", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Air Media Error Status Feedback
-        /// </summary>
         [JoinName("ErrorFB")]
         public JoinDataComplete ErrorFB = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Error Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Air Media Number of Users Connected Feedback
-        /// </summary>
         [JoinName("NumberOfUsersConnectedFB")]
         public JoinDataComplete NumberOfUsersConnectedFB = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Number of Users Connected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Air Media Login Code Set / Get
-        /// </summary>
         [JoinName("LoginCode")]
         public JoinDataComplete LoginCode = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Login Code Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Air Media Device Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Device Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Air Media IP Address Feedback
-        /// </summary>
         [JoinName("ConnectionAddressFB")]
         public JoinDataComplete ConnectionAddressFB = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media IP Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Air Media Hostname Feedback
-        /// </summary>
         [JoinName("HostnameFB")]
         public JoinDataComplete HostnameFB = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Hostname", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Air Media Serial Number Feedback
-        /// </summary>
         [JoinName("SerialNumberFeedback")]
         public JoinDataComplete SerialNumberFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/AppleTvJoinMap.cs

@@ -1,57 +1,37 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a AppleTvJoinMap
     /// </summary>
     public class AppleTvJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// AppleTv Nav Up
-        /// </summary>
         [JoinName("UpArrow")]
         public JoinDataComplete UpArrow = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// AppleTv Nav Down
-        /// </summary>
         [JoinName("DnArrow")]
         public JoinDataComplete DnArrow = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// AppleTv Nav Left
-        /// </summary>
         [JoinName("LeftArrow")]
         public JoinDataComplete LeftArrow = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// AppleTv Nav Right
-        /// </summary>
         [JoinName("RightArrow")]
         public JoinDataComplete RightArrow = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// AppleTv Menu
-        /// </summary>
         [JoinName("Menu")]
         public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// AppleTv Select
-        /// </summary>
         [JoinName("Select")]
         public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// AppleTv Play/Pause
-        /// </summary>
         [JoinName("PlayPause")]
         public JoinDataComplete PlayPause = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "AppleTv Play/Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs

@@ -1,43 +1,29 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a C2nRthsControllerJoinMap
     /// </summary>
     public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// C2nRthsController Online status
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Temperature Format (C/F)
-        /// </summary>
         [JoinName("TemperatureFormat")]
         public JoinDataComplete TemperatureFormat = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Unit Format", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Temperature Sensor Feedbacks
-        /// </summary>
         [JoinName("Temperature")]
         public JoinDataComplete Temperature = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Temperature Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Humidity Sensor Feedbacks
-        /// </summary>
         [JoinName("Humidity")]
         public JoinDataComplete Humidity = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Humidity Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Temp Sensor Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Temp Sensor Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/CameraControllerJoinMap.cs

@@ -1,123 +1,53 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a CameraControllerJoinMap
     /// </summary>
     public class CameraControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Tilt Up
-        /// </summary>
         [JoinName("TiltUp")]
         public JoinDataComplete TiltUp = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata { Description = "Tilt Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Tilt Down
-        /// </summary>
         [JoinName("TiltDown")]
         public JoinDataComplete TiltDown = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata { Description = "Tilt Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Pan Left
-        /// </summary>
         [JoinName("PanLeft")]
         public JoinDataComplete PanLeft = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata { Description = "Pan Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Pan Right
-        /// </summary>
         [JoinName("PanRight")]
         public JoinDataComplete PanRight = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata { Description = "Pan Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Zoom In
-        /// </summary>
         [JoinName("ZoomIn")]
         public JoinDataComplete ZoomIn = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata { Description = "Zoom In", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Zoom Out
-        /// </summary>
         [JoinName("ZoomOut")]
         public JoinDataComplete ZoomOut = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata { Description = "Zoom Out", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Is Online
-        /// </summary>
+
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata { Description = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Power On
-        /// </summary>
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Power Off
-        /// </summary>
         [JoinName("PowerOff")]
         public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Number Of Presets
-        /// </summary>
+
         [JoinName("NumberOfPresets")]
         public JoinDataComplete NumberOfPresets = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata { Description = "Tells Essentials the number of defined presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Preset Recall Start
-        /// </summary>
         [JoinName("PresetRecallStart")]
         public JoinDataComplete PresetRecallStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Recall Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Preset Label Start
-        /// </summary>
         [JoinName("PresetLabelStart")]
         public JoinDataComplete PresetLabelStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Label Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// Preset Save Start
-        /// </summary>
         [JoinName("PresetSaveStart")]
         public JoinDataComplete PresetSaveStart = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Save Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Camera Mode Auto
-        /// </summary>
+
         [JoinName("CameraModeAuto")]
         public JoinDataComplete CameraModeAuto = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Auto", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Camera Mode Manual
-        /// </summary>
         [JoinName("CameraModeManual")]
         public JoinDataComplete CameraModeManual = new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Manual", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Camera Mode Off
-        /// </summary>
         [JoinName("CameraModeOff")]
         public JoinDataComplete CameraModeOff = new JoinDataComplete(new JoinData { JoinNumber = 53, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Supports Camera Mode Manual
-        /// </summary>
+
         [JoinName("SupportsCameraModeAuto")]
         public JoinDataComplete SupportsCameraModeAuto = new JoinDataComplete(new JoinData { JoinNumber = 55, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Camera Mode Auto", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Supports Camera Mode Off
-        /// </summary>
         [JoinName("SupportsCameraModeOff")]
         public JoinDataComplete SupportsCameraModeOff = new JoinDataComplete(new JoinData { JoinNumber = 56, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Camera Mode Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Supports Presets
-        /// </summary>
         [JoinName("SupportsPresets")]
         public JoinDataComplete SupportsPresets = new JoinDataComplete(new JoinData { JoinNumber = 57, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 

src/PepperDash.Essentials.Core/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs

@@ -1,6 +1,7 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a CenOdtOccupancySensorBaseJoinMap
@@ -9,226 +10,130 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         #region Digitals
 
-        /// <summary>
-        /// Online
-        /// </summary>
         [JoinName("Online")]
         public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Force Occupied
-        /// </summary>
+
         [JoinName("ForceOccupied")]
         public JoinDataComplete ForceOccupied = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Force Occupied", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Force Vacant
-        /// </summary>
         [JoinName("ForceVacant")]
         public JoinDataComplete ForceVacant = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Force Vacant", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Enable Raw States
-        /// </summary>
+
         [JoinName("EnableRawStates")]
         public JoinDataComplete EnableRawStates = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Raw States", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Disable Raw States
-        /// </summary>
+
         [JoinName("RoomOccupiedFeedback")]
         public JoinDataComplete RoomOccupiedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Room Occupied Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Grace Occupancy Detected Feedback
-        /// </summary>
+
         [JoinName("GraceOccupancyDetectedFeedback")]
         public JoinDataComplete GraceOccupancyDetectedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Grace Occupancy Detected Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Room Vacant Feedback
-        /// </summary>
+
         [JoinName("RoomVacantFeedback")]
         public JoinDataComplete RoomVacantFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Room Vacant Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Raw Occupancy Feedback
-        /// </summary>
+
         [JoinName("RawOccupancyFeedback")]
         public JoinDataComplete RawOccupancyFeedback = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Raw Occupancy Pir Feedback
-        /// </summary>
+
         [JoinName("RawOccupancyPirFeedback")]
         public JoinDataComplete RawOccupancyPirFeedback = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Pir Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Raw Occupancy Us Feedback
-        /// </summary>
+
         [JoinName("RawOccupancyUsFeedback")]
         public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Us Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Identity Mode On
-        /// </summary>
+
         [JoinName("IdentityModeOn")]
         public JoinDataComplete IdentityMode = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Identity Mode", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Identity Mode Off
-        /// </summary>
+
         [JoinName("IdentityModeFeedback")]
         public JoinDataComplete IdentityModeFeedback = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Identity Mode Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Enable Led Flash
-        /// </summary>
+
         [JoinName("EnableLedFlash")]
         public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Led Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Disable Led Flash
-        /// </summary>
+
         [JoinName("DisableLedFlash")]
         public JoinDataComplete DisableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Led Flash", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Enable Short Timeout
-        /// </summary>
+
         [JoinName("EnableShortTimeout")]
         public JoinDataComplete EnableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Short Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Disable Short Timeout
-        /// </summary>
+
         [JoinName("DisableShortTimeout")]
         public JoinDataComplete DisableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Short Timeout", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Or When Vacated
-        /// </summary>
+
         [JoinName("OrWhenVacated")]
         public JoinDataComplete OrWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Or When Vacated", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// And When Vacated
-        /// </summary>
+
         [JoinName("AndWhenVacated")]
         public JoinDataComplete AndWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "AndWhenVacated", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Enable Us A
-        /// </summary>
+
         [JoinName("EnableUsA")]
         public JoinDataComplete EnableUsA = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Us A", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Disable Us A
-        /// </summary>
+
         [JoinName("DisableUsA")]
         public JoinDataComplete DisableUsA = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Us A", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Enable Us B
-        /// </summary>
+
         [JoinName("EnableUsB")]
         public JoinDataComplete EnableUsB = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Us B", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Disable Us B
-        /// </summary>
+
         [JoinName("DisableUsB")]
         public JoinDataComplete DisableUsB = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Us B", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Enable Pir
-        /// </summary>
+
         [JoinName("EnablePir")]
         public JoinDataComplete EnablePir = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Pir", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Disable Pir
-        /// </summary>
+
         [JoinName("DisablePir")]
         public JoinDataComplete DisablePir = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Disable Pir", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Increment Us In Occupied State
-        /// </summary>
+
         [JoinName("IncrementUsInOccupiedState")]
         public JoinDataComplete IncrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "Increment Us In OccupiedState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Decrement Us In Occupied State
-        /// </summary>
+
         [JoinName("DecrementUsInOccupiedState")]
         public JoinDataComplete DecrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "Dencrement Us In Occupied State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Increment Us In Vacant State
-        /// </summary>
+
         [JoinName("IncrementUsInVacantState")]
         public JoinDataComplete IncrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Increment Us In VacantState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Decrement Us In Vacant State
-        /// </summary>
+
         [JoinName("DecrementUsInVacantState")]
         public JoinDataComplete DecrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "Decrement Us In VacantState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Increment Pir In Occupied State
-        /// </summary>
+
         [JoinName("IncrementPirInOccupiedState")]
         public JoinDataComplete IncrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "Increment Pir In Occupied State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Decrement Pir In Occupied State
-        /// </summary>
+
         [JoinName("DecrementPirInOccupiedState")]
         public JoinDataComplete DecrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "Decrement Pir In OccupiedState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Increment Pir In Vacant State
-        /// </summary>
+
         [JoinName("IncrementPirInVacantState")]
         public JoinDataComplete IncrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "Increment Pir In Vacant State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Decrement Pir In Vacant State
-        /// </summary>
+
         [JoinName("DecrementPirInVacantState")]
         public JoinDataComplete DecrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Decrement Pir In Vacant State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
@@ -236,51 +141,31 @@ namespace PepperDash.Essentials.Core.Bridges
         #endregion
 
         #region Analog
-        /// <summary>
-        /// Timeout
-        /// </summary>
+
         [JoinName("Timeout")]
         public JoinDataComplete Timeout = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Timeout Local Feedback
-        /// </summary>
+
         [JoinName("TimeoutLocalFeedback")]
         public JoinDataComplete TimeoutLocalFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Timeout Local Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Internal PhotoSensor Value
-        /// </summary>
+
         [JoinName("InternalPhotoSensorValue")]
         public JoinDataComplete InternalPhotoSensorValue = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Internal PhotoSensor Value", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// External PhotoSensor Value
-        /// </summary>
+
         [JoinName("UsSensitivityInOccupiedState")]
         public JoinDataComplete UsSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Us Sensitivity In Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Us Sensitivity In Vacant State
-        /// </summary>
+
         [JoinName("UsSensitivityInVacantState")]
         public JoinDataComplete UsSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Us Sensitivity In Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Pir Sensitivity In Occupied State
-        /// </summary>
+
         [JoinName("PirSensitivityInOccupiedState")]
         public JoinDataComplete PirSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Pir Sensitivity In Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Pir Sensitivity In Vacant State
-        /// </summary>
+
         [JoinName("PirSensitivityInVacantState")]
         public JoinDataComplete PirSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Pir Sensitivity In Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
@@ -289,9 +174,6 @@ namespace PepperDash.Essentials.Core.Bridges
 
         #region Serial
 
-        /// <summary>
-        /// Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DisplayControllerJoinMap.cs

@@ -1,113 +1,69 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a DisplayControllerJoinMap
     /// </summary>
     public class DisplayControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// Power Off
-        /// </summary>
+
         [JoinName("PowerOff")]
         public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Power On
-        /// </summary>
+
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Is Two Way Display
-        /// </summary>
+
         [JoinName("IsTwoWayDisplay")]
         public JoinDataComplete IsTwoWayDisplay = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Is Two Way Display", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Volume Up
-        /// </summary>
+
         [JoinName("VolumeUp")]
         public JoinDataComplete VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Volume Level
-        /// </summary>
+
         [JoinName("VolumeLevel")]
         public JoinDataComplete VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Volume Level", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Volume Down
-        /// </summary>
+
         [JoinName("VolumeDown")]
         public JoinDataComplete VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Volume Mute
-        /// </summary>
+
         [JoinName("VolumeMute")]
         public JoinDataComplete VolumeMute = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Mute", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Volume Mute On
-        /// </summary>
+
         [JoinName("VolumeMuteOn")]
         public JoinDataComplete VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Mute On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Volume Mute Off
-        /// </summary>
+
         [JoinName("VolumeMuteOff")]
         public JoinDataComplete VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Volume Mute Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Input Select Offset
-        /// </summary>
+
         [JoinName("InputSelectOffset")]
         public JoinDataComplete InputSelectOffset = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 }, 
             new JoinMetadata { Description = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Input Names Offset
-        /// </summary>
+
         [JoinName("InputNamesOffset")]
         public JoinDataComplete InputNamesOffset = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 }, 
             new JoinMetadata { Description = "Input Names Offset", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// Input Select
-        /// </summary>
+
         [JoinName("InputSelect")]
         public JoinDataComplete InputSelect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Button Visibility Offset
-        /// </summary>
+
         [JoinName("ButtonVisibilityOffset")]
         public JoinDataComplete ButtonVisibilityOffset = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 10 }, 
             new JoinMetadata { Description = "Button Visibility Offset", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalSerial });
-        
-        /// <summary>
-        /// Is Online
-        /// </summary>
+
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 }, 
             new JoinMetadata { Description = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs

@@ -1,91 +1,57 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges {
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
+{
     /// <summary>
     /// Represents a DmBladeChassisControllerJoinMap
     /// </summary>
     public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced {
 
-        /// <summary>
-        /// DM Blade Chassis Online status
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Blade Chassis Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Blade Input Video Sync
-        /// </summary>
+
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Blade Chassis Input Endpoint Online
-        /// </summary>
+
         [JoinName("InputEndpointOnline")]
         public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Blade Chassis Output Endpoint Online
-        /// </summary>
+
         [JoinName("OutputEndpointOnline")]
         public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Blade Chassis Tx Advanced Is Present
-        /// </summary>
+
         [JoinName("TxAdvancedIsPresent")]
         public JoinDataComplete TxAdvancedIsPresent = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Tx Advanced Is Present", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Blade Chassis Rx Advanced Is Present
-        /// </summary>
+
         [JoinName("OutputVideo")]
         public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Output Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Blade Chassis Input HDCP Support State
-        /// </summary>
+
         [JoinName("HdcpSupportState")]
         public JoinDataComplete HdcpSupportState = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input HDCP Support State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Blade Chassis Input HDCP Support Capability
-        /// </summary>
+
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Blade Chassis Input Names
-        /// </summary>
+
         [JoinName("InputNames")]
         public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Blade Chassis Output Names
-        /// </summary>
+
         [JoinName("OutputNames")]
         public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Blade Chassis Video Output Currently Routed Video Input Name
-        /// </summary>
+
         [JoinName("OutputCurrentVideoInputNames")]
         public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Blade Chassis Input Current Resolution
-        /// </summary>
+
         [JoinName("InputCurrentResolution")]
         public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 128 },
             new JoinMetadata { Description = "DM Blade Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -1,15 +1,13 @@
+using PepperDash.Essentials.Core.JoinMaps;
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a DmChassisControllerJoinMap
     /// </summary>
     public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// DM Chassis enable audio breakaway routing
-        /// </summary>
         [JoinName("EnableAudioBreakaway")]
         public JoinDataComplete EnableAudioBreakaway = new JoinDataComplete(
             new JoinData {JoinNumber = 4, JoinSpan = 1},
@@ -19,10 +17,7 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
-        
-        /// <summary>
-        /// DM Chassis enable USB breakaway routing
-        /// </summary>
+
         [JoinName("EnableUsbBreakaway")]
         public JoinDataComplete EnableUsbBreakaway = new JoinDataComplete(
             new JoinData { JoinNumber = 5, JoinSpan = 1 },
@@ -32,143 +27,83 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
-        
-        /// <summary>
-        /// DM Chassis Name
-        /// </summary>
+
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Chassis Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Chassis SystemId Get/Set/Trigger
-        /// </summary>
+
         [JoinName("SystemId")]
         public JoinDataComplete SystemId = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Chassis SystemId Get/Set/Trigger/", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalAnalog });
-        
-        /// <summary>
-        /// DM Chassis Online status
-        /// </summary>
+
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Chassis Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Input Video Sync
-        /// </summary>
+
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Chassis Input Endpoint Online
-        /// </summary>
+
         [JoinName("InputEndpointOnline")]
         public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Chassis Output Endpoint Online
-        /// </summary>
+
         [JoinName("OutputEndpointOnline")]
         public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Chassis Tx Advanced Is Present
-        /// </summary>
+
         [JoinName("TxAdvancedIsPresent")]
         public JoinDataComplete TxAdvancedIsPresent = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Tx Advanced Is Present", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Chassis Rx Advanced Is Present
-        /// </summary>
+
         [JoinName("OutputDisabledByHdcp")]
         public JoinDataComplete OutputDisabledByHdcp = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Disabled by HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Chassis Output Set / Get
-        /// </summary>
+
         [JoinName("OutputVideo")]
         public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Video Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis Output Audio Set / Get
-        /// </summary>
+
         [JoinName("OutputAudio")]
         public JoinDataComplete OutputAudio = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Audio Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis Input Set / Get
-        /// </summary>
+
         [JoinName("OutputUsb")]
         public JoinDataComplete OutputUsb = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output USB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis Input Set / Get
-        /// </summary>
+
         [JoinName("InputUsb")]
         public JoinDataComplete InputUsb = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Usb Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis Input HDCP Support State
-        /// </summary>
+
         [JoinName("HdcpSupportState")]
         public JoinDataComplete HdcpSupportState = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input HDCP Support State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis Input HDCP Support Capability
-        /// </summary>
+
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback
-        /// </summary>
+
         [JoinName("InputStreamCardState")]
         public JoinDataComplete InputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1501, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback
-        /// </summary>
+
         [JoinName("OutputStreamCardState")]
         public JoinDataComplete OutputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1601, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis No Route Name
-        /// </summary>
+
         [JoinName("NoRouteName")]
         public JoinDataComplete NoRouteName = new JoinDataComplete(new JoinData { JoinNumber = 100, JoinSpan = 1 },
             new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Chassis Input Names
-        /// </summary>
+
         [JoinName("InputNames")]
         public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Chassis Output Names
-        /// </summary>
+
         [JoinName("OutputNames")]
         public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Chassis Video Input Names
-        /// </summary>
+
         [JoinName("InputVideoNames")] public JoinDataComplete InputVideoNames =
             new JoinDataComplete(new JoinData {JoinNumber = 501, JoinSpan = 200},
                 new JoinMetadata
@@ -177,10 +112,7 @@ namespace PepperDash.Essentials.Core.Bridges
                     JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                     JoinType = eJoinType.Serial
                 });
-        
-        /// <summary>
-        /// DM Chassis Audio Input Names
-        /// </summary>
+
         [JoinName("InputAudioNames")]
         public JoinDataComplete InputAudioNames =
             new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 200 },
@@ -190,10 +122,6 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
-        
-        /// <summary>
-        /// DM Chassis Video Output Names
-        /// </summary>
         [JoinName("OutputVideoNames")]
         public JoinDataComplete OutputVideoNames =
             new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 200 },
@@ -203,10 +131,6 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
-        
-        /// <summary>
-        /// DM Chassis Audio Output Names
-        /// </summary>
         [JoinName("OutputAudioNames")]
         public JoinDataComplete OutputAudioNames =
             new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 200 },
@@ -216,24 +140,15 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
-        
-        /// <summary>
-        /// DM Chassis Video Output Currently Routed Video Input Name
-        /// </summary>
+
         [JoinName("OutputCurrentVideoInputNames")]
         public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Chassis Audio Output Currently Routed Audio Input Name
-        /// </summary>
+
         [JoinName("OutputCurrentAudioInputNames")]
         public JoinDataComplete OutputCurrentAudioInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Audio Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Chassis Input Current Resolution
-        /// </summary>
+
         [JoinName("InputCurrentResolution")]
         public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -1,120 +1,73 @@
+using PepperDash.Essentials.Core.JoinMaps;
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a DmRmcControllerJoinMap
     /// </summary>
     public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// DM RMC Online
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM RMC Mute Video
-        /// </summary>
+
         [JoinName("VideoMuteOn")]
         public JoinDataComplete VideoMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Mute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM RMC UnMute Video
-        /// </summary>
+
         [JoinName("VideoMuteOff")]
         public JoinDataComplete VideoMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC UnMute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM RMC Mute Video Toggle
-        /// </summary>
+
         [JoinName("VideoMuteToggle")]
         public JoinDataComplete VideoMuteToggle = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Mute Video Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM RMC Current Output Resolution
-        /// </summary>
+
         [JoinName("CurrentOutputResolution")]
         public JoinDataComplete CurrentOutputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Current Output Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM RMC EDID Manufacturer
-        /// </summary>
+
         [JoinName("EdidManufacturer")]
         public JoinDataComplete EdidManufacturer = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Manufacturer", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM RMC EDID Name
-        /// </summary>
+
         [JoinName("EdidName")]
         public JoinDataComplete EdidName = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM RMC EDID Preferred Timing
-        /// </summary>
+
         [JoinName("EdidPrefferedTiming")]
         public JoinDataComplete EdidPrefferedTiming = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Preferred Timing", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM RMC EDID Serial Number
-        /// </summary>
+
         [JoinName("EdidSerialNumber")]
         public JoinDataComplete EdidSerialNumber = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM RMC Name
-        /// </summary>
+
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM RMC Audio Video Source Set / Get
-        /// </summary>
+
         [JoinName("AudioVideoSource")]
         public JoinDataComplete AudioVideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Audio Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM RMC HDCP Support Capability
-        /// </summary>
+
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM RMC Port 1 (DM) HDCP State Set / Get
-        /// </summary>
+
         [JoinName("Port1HdcpState")]
         public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Port 1 (DM) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM RMC Port 2 (HDMI) HDCP State Set / Get
-        /// </summary>
+
         [JoinName("Port2HdcpState")]
         public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Port 2 (HDMI) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM RMC HDMI Input Sync
-        /// </summary>
+            new JoinMetadata { Description = "DM TX Port 2 (HDMI) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
         [JoinName("HdmiInputSync")]
         public JoinDataComplete HdmiInputSync = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC HDMI Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM RMC Number of Input Ports that support HDCP
-        /// </summary>
+
         [JoinName("HdcpInputPortCount")]
         public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -1,127 +1,77 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a DmTxControllerJoinMap
     /// </summary>
     public class DmTxControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// DM TX Online
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM TX Video Sync
-        /// </summary>
+
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM TX Enable Free Run Set / Get
-        /// </summary>
+
         [JoinName("FreeRunEnabled")]
         public JoinDataComplete FreeRunEnabled = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Enable Free Run Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Input 1 Video Sync Status
-        /// </summary>
+
         [JoinName("Input1VideoSyncStatus")]
         public JoinDataComplete Input1VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Input 1 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Input 2 Video Sync Status
-        /// </summary>
+
         [JoinName("Input2VideoSyncStatus")]
         public JoinDataComplete Input2VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Input 2 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Input 3 Video Sync Status
-        /// </summary>
+
         [JoinName("Input3VideoSyncStatus")]
         public JoinDataComplete Input3VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Input 3 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM TX Current Input Resolution
-        /// </summary>
+
         [JoinName("CurrentInputResolution")]
         public JoinDataComplete CurrentInputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Current Input Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM TX Name
-        /// </summary>
+
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM TX Video Input Set / Get
-        /// </summary>
+
         [JoinName("VideoInput")]
         public JoinDataComplete VideoInput = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Video Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM TX Audio Input Set / Get
-        /// </summary>
+
         [JoinName("AudioInput")]
         public JoinDataComplete AudioInput = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Audio Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM TX HDCP Support Capability
-        /// </summary>
+
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM TX Port 1 HDCP State Set / Get
-        /// </summary>
+
         [JoinName("Port1HdcpState")]
         public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Port 1 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM TX Port 2 HDCP State Set / Get
-        /// </summary>
+
         [JoinName("Port2HdcpState")]
         public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Port 2 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM TX VGA Brightness
-        /// </summary>
+
         [JoinName("VgaBrightness")]
         public JoinDataComplete VgaBrightness = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX VGA Brightness", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM TX VGA Contrast
-        /// </summary>
+
         [JoinName("VgaContrast")]
         public JoinDataComplete VgaContrast = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM TX Port 3 HDCP State Set / Get
-        /// </summary>
+
         [JoinName("Port3HdcpState")]
         public JoinDataComplete Port3HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Port 3 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM TX Number of Input Ports that support HDCP
-        /// </summary>
+
         [JoinName("HdcpInputPortCount")]
         public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

@@ -1,6 +1,7 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a DmpsAudioOutputControllerJoinMap
@@ -8,261 +9,150 @@ namespace PepperDash.Essentials.Core.Bridges
     public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced
     {
 
-        /// <summary>
-        /// Master Volume Level Signed dB Set / Get
-        /// </summary>
         [JoinName("MasterVolumeLevel")]
         public JoinDataComplete MasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Master Volume 16bit Scaled Set / Get
-        /// </summary>
+
         [JoinName("MasterVolumeLevelScaled")]
         public JoinDataComplete MasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Mixer Preset Recall Set
-        /// </summary>
+
         [JoinName("MixerPresetRecall")]
         public JoinDataComplete MixerPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Mixer Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Mixer Eq Preset Recall Set
-        /// </summary>
+
         [JoinName("MixerEqPresetRecall")]
         public JoinDataComplete MixerEqPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Mixer Eq Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Master Volume Mute On Set / Get
-        /// </summary>
+
         [JoinName("MasterVolumeMuteOn")]
         public JoinDataComplete MasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Master Volume Mute Off Set / Get
-        /// </summary>
+
         [JoinName("MasterVolumeMuteOff")]
         public JoinDataComplete MasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Master Volume Level Up
-        /// </summary>
+
         [JoinName("MasterVolumeUp")]
         public JoinDataComplete MasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Master Volume Level Down
-        /// </summary>
+
         [JoinName("MasterVolumeDown")]
         public JoinDataComplete MasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Master Volume Scaled Send Enable/Disable
-        /// </summary>
+
         [JoinName("MasterVolumeLevelScaledSend")]
         public JoinDataComplete MasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Source Volume Signed dB Set / Get
-        /// </summary>
+
         [JoinName("SourceVolumeLevel")]
         public JoinDataComplete SourceVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Source Volume 16bit Scaled Set / Get
-        /// </summary>
+
         [JoinName("SourceVolumeLevelScaled")]
         public JoinDataComplete SourceVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Source Volume Mute On Set / Get
-        /// </summary>
+
         [JoinName("SourceVolumeMuteOn")]
         public JoinDataComplete SourceVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Source Volume Mute Off Set / Get
-        /// </summary>
+
         [JoinName("SourceVolumeMuteOff")]
         public JoinDataComplete SourceVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Source Volume Level Up
-        /// </summary>
+
         [JoinName("SourceVolumeUp")]
         public JoinDataComplete SourceVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Source Volume Level Down
-        /// </summary>
+
         [JoinName("SourceVolumeDown")]
         public JoinDataComplete SourceVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Source Volume Scaled Send Enable/Disable
-        /// </summary>
+
         [JoinName("SourceVolumeLevelScaledSend")]
         public JoinDataComplete SourceVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Source Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec1 Volume Signed dB Set / Get
-        /// </summary>
+
         [JoinName("Codec1VolumeLevel")]
         public JoinDataComplete Codec1VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Codec1 Volume 16bit Scaled Set / Get
-        /// </summary>
+
         [JoinName("Codec1VolumeLevelScaled")]
         public JoinDataComplete Codec1VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Codec1 Volume Mute On Set / Get
-        /// </summary>
+
         [JoinName("Codec1VolumeMuteOn")]
         public JoinDataComplete Codec1VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec1 Volume Mute Off Set / Get
-        /// </summary>
+
         [JoinName("Codec1VolumeMuteOff")]
         public JoinDataComplete Codec1VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec1 Volume Level Up
-        /// </summary>
+
         [JoinName("Codec1VolumeUp")]
         public JoinDataComplete Codec1VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec1 Volume Level Down
-        /// </summary>
+
         [JoinName("Codec1VolumeDown")]
         public JoinDataComplete Codec1VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec1 Volume Scaled Send Enable/Disable
-        /// </summary>
+
         [JoinName("Codec1VolumeLevelScaledSend")]
         public JoinDataComplete Codec1VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec1 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec2 Volume Signed dB Set / Get
-        /// </summary>
+
         [JoinName("Codec2VolumeLevel")]
         public JoinDataComplete Codec2VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Codec2 Volume 16bit Scaled Set / Get
-        /// </summary>
+
         [JoinName("Codec2VolumeLevelScaled")]
         public JoinDataComplete Codec2VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Codec2 Volume Mute On Set / Get
-        /// </summary>
+
         [JoinName("Codec2VolumeMuteOn")]
         public JoinDataComplete Codec2VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec2 Volume Mute Off Set / Get
-        /// </summary>
+
         [JoinName("Codec2VolumeMuteOff")]
         public JoinDataComplete Codec2VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec2 Volume Level Up
-        /// </summary>
+
         [JoinName("Codec2VolumeUp")]
         public JoinDataComplete Codec2VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec2 Volume Level Down
-        /// </summary>
+
         [JoinName("Codec2VolumeDown")]
         public JoinDataComplete Codec2VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Codec2 Volume Scaled Send Enable/Disable
-        /// </summary>
+
         [JoinName("Codec2VolumeLevelScaledSend")]
         public JoinDataComplete Codec2VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
             new JoinMetadata { Description = "Codec2 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// MicsMaster Volume Signed dB Set / Get
-        /// </summary>
+
         [JoinName("MicsMasterVolumeLevel")]
         public JoinDataComplete MicsMasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// MicsMaster Volume 16bit Scaled Set / Get
-        /// </summary>
+
         [JoinName("MicsMasterVolumeLevelScaled")]
         public JoinDataComplete MicsMasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// MicsMaster Volume Mute On Set / Get
-        /// </summary>
+
         [JoinName("MicsMasterVolumeMuteOn")]
         public JoinDataComplete MicsMasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// MicsMaster Volume Mute Off Set / Get
-        /// </summary>
+
         [JoinName("MicsMasterVolumeMuteOff")]
         public JoinDataComplete MicsMasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// MicsMaster Volume Level Up
-        /// </summary>
+
         [JoinName("MicsMasterVolumeUp")]
         public JoinDataComplete MicsMasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// MicsMaster Volume Level Down
-        /// </summary>
+
         [JoinName("MicsMasterVolumeDown")]
         public JoinDataComplete MicsMasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 44, JoinSpan = 1 },
             new JoinMetadata { Description = "MicsMaster Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// MicsMaster Volume Scaled Send Enable/Disable
-        /// </summary>
+
         [JoinName("MicsMasterVolumeLevelScaledSend")]
         public JoinDataComplete MicsMasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 45, JoinSpan = 1 },
             new JoinMetadata { Description = "Mics Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsMicrophoneControllerJoinMap.cs

@@ -1,51 +1,33 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a DmpsMicrophoneControllerJoinMap
     /// </summary>
     public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
     {
-
-        /// <summary>
-        /// Mic Gain dB Set / Get
-        /// </summary>
         [JoinName("MicGain")]
         public JoinDataComplete MicGain = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Gain dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Mic Gain 16bit Scaled Set / Get
-        /// </summary>
+
         [JoinName("MicGainScaled")]
         public JoinDataComplete MicGainScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Gain 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Mic Mute On Set / Get
-        /// </summary>
+
         [JoinName("MicMuteOn")]
         public JoinDataComplete MicMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Mic Mute Off Set / Get
-        /// </summary>
+
         [JoinName("MicMuteOff")]
         public JoinDataComplete MicMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Mic Gain Scaled Send Enable/Disable
-        /// </summary>
+
         [JoinName("MicGainScaledSend")]
         public JoinDataComplete MicGainScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Gain Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Mic Name Get
-        /// </summary>
+
         [JoinName("MicName")]
         public JoinDataComplete MicName = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Mic Name Get", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs

@@ -1,112 +1,71 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a DmpsRoutingControllerJoinMap
     /// </summary>
     public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// DMPS Enable Audio and Video Routing
-        /// </summary>
         [JoinName("EnableRouting")]
         public JoinDataComplete EnableRouting = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS Enable Audio and Video Routing", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DMPS Disable Audio and Video Routing
-        /// </summary>
+
         [JoinName("SystemPowerOn")]
         public JoinDataComplete SystemPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS System Power On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DMPS Disable Audio and Video Routing
-        /// </summary>
+
         [JoinName("SystemPowerOff")]
         public JoinDataComplete SystemPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS System Power Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DMPS Front Panel Lock On Get/Set
-        /// </summary>
+
         [JoinName("FrontPanelLockOn")]
         public JoinDataComplete FrontPanelLockOn = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS Front Panel Lock On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DMPS Front Panel Lock  Off Get/Set
-        /// </summary>
+
         [JoinName("FrontPanelLockOff")]
         public JoinDataComplete FrontPanelLockOff = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "DMPS Front Panel Lock  Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Input Video Sync
-        /// </summary>
+
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Chassis Input Endpoint Online
-        /// </summary>
+
         [JoinName("InputEndpointOnline")]
         public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Chassis Output Endpoint Online
-        /// </summary>
+
         [JoinName("OutputEndpointOnline")]
         public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// DM Chassis Input Video Set / Get
-        /// </summary>
+
         [JoinName("OutputVideo")]
         public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Video Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis Input Audio Set / Get
-        /// </summary>
+
         [JoinName("OutputAudio")]
         public JoinDataComplete OutputAudio = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Audio Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// DM Chassis Input Name
-        /// </summary>
+
         [JoinName("InputNames")]
         public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Chassis Output Name
-        /// </summary>
+
         [JoinName("OutputNames")]
         public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// DM Chassis Video Input Name
-        /// </summary>
+
         [JoinName("InputVideoNames")]
         public JoinDataComplete InputVideoNames =
             new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
             new JoinMetadata
             {
-                Description = "DM Chassis Video Input Name",
+                Description = "Video Input Name",
                 JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Serial
             });
-       
-        /// <summary>
-        /// DM Chassis Audio Input Name
-        /// </summary>
+
         [JoinName("InputAudioNames")]
         public JoinDataComplete InputAudioNames =
             new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
@@ -116,10 +75,6 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Serial
             });
-       
-        /// <summary>
-        /// DM Chassis Video Output Name
-        /// </summary>
         [JoinName("OutputVideoNames")]
         public JoinDataComplete OutputVideoNames =
             new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 32 },
@@ -129,10 +84,6 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Serial
             });
-       
-        /// <summary>
-        /// DM Chassis Audio Output Name
-        /// </summary>    
         [JoinName("OutputAudioNames")]
         public JoinDataComplete OutputAudioNames =
             new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 32 },
@@ -142,24 +93,15 @@ namespace PepperDash.Essentials.Core.Bridges
                 JoinCapabilities = eJoinCapabilities.ToSIMPL,
                 JoinType = eJoinType.Serial
             });
-       
-        /// <summary>
-        /// DM Chassis Video Output Currently Routed Video Input Name
-        /// </summary>
+
         [JoinName("OutputCurrentVideoInputNames")]
         public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-       
-        /// <summary>
-        /// DM Chassis Audio Output Currently Routed Video Input Name
-        /// </summary>
+
         [JoinName("OutputCurrentAudioInputNames")]
         public JoinDataComplete OutputCurrentAudioInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Audio Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-       
-        /// <summary>
-        /// DM Chassis Input Current Resolution
-        /// </summary>
+
         [JoinName("InputCurrentResolution")]
         public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericIrControllerJoinMap.cs

@@ -1,15 +1,9 @@
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.JoinMaps;
 
 namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
-		/// <summary>
-		/// Represents a GenericIrControllerJoinMap
-		/// </summary>
 		public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
 		{
-			/// <summary>
-			/// PLAY
-			/// </summary>
 			[JoinName("PLAY")]
 			public JoinDataComplete Play = new JoinDataComplete(
 				new JoinData
@@ -23,10 +17,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// STOP
-			/// </summary>
+
 			[JoinName("STOP")]
 			public JoinDataComplete Stop = new JoinDataComplete(
 				new JoinData
@@ -40,10 +31,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// PAUSE
-			/// </summary>
+
 			[JoinName("PAUSE")]
 			public JoinDataComplete Pause = new JoinDataComplete(
 				new JoinData
@@ -58,9 +46,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-			/// <summary>
-			/// FSCAN
-			/// </summary>
 			[JoinName("FSCAN")]
 			public JoinDataComplete ForwardScan = new JoinDataComplete(
 				new JoinData
@@ -75,9 +60,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// RSCAN
-			/// </summary>
 			[JoinName("RSCAN")]
 			public JoinDataComplete ReverseScan = new JoinDataComplete(
 				new JoinData
@@ -91,10 +73,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// F_SKIP
-			/// </summary>
+
 			[JoinName("F_SKIP")]
 			public JoinDataComplete ForwardSkip = new JoinDataComplete(
 				new JoinData
@@ -109,9 +88,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// R_SKIP
-			/// </summary>
 			[JoinName("R_SKIP")]
 			public JoinDataComplete ReverseSkip = new JoinDataComplete(
 				new JoinData
@@ -125,10 +101,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// RECORD
-			/// </summary>
+
 			[JoinName("RECORD")]
 			public JoinDataComplete Record = new JoinDataComplete(
 				new JoinData
@@ -143,9 +116,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// POWER
-			/// </summary>
 			[JoinName("POWER")]
 			public JoinDataComplete Power = new JoinDataComplete(
 				new JoinData
@@ -160,9 +130,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// 0
-			/// </summary>
 			[JoinName("0")]
 			public JoinDataComplete Kp0 = new JoinDataComplete(
 				new JoinData
@@ -176,10 +143,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// 1
-			/// </summary>
+
 			[JoinName("1")]
 			public JoinDataComplete Kp1 = new JoinDataComplete(
 				new JoinData
@@ -193,10 +157,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// 2
-			/// </summary>
+
 			[JoinName("2")]
 			public JoinDataComplete Kp2 = new JoinDataComplete(
 				new JoinData
@@ -210,10 +171,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// 3
-			/// </summary>
+
 			[JoinName("3")]
 			public JoinDataComplete Kp3 = new JoinDataComplete(
 				new JoinData
@@ -227,10 +185,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// 4
-			/// </summary>
+
 			[JoinName("4")]
 			public JoinDataComplete Kp4 = new JoinDataComplete(
 				new JoinData
@@ -244,10 +199,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// 5
-			/// </summary>
+
 			[JoinName("5")]
 			public JoinDataComplete Kp5 = new JoinDataComplete(
 				new JoinData
@@ -261,10 +213,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// 6
-			/// </summary>
+
 			[JoinName("6")]
 			public JoinDataComplete Kp6 = new JoinDataComplete(
 				new JoinData
@@ -278,10 +227,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// 7
-			/// </summary>
+
 			[JoinName("7")]
 			public JoinDataComplete Kp7 = new JoinDataComplete(
 				new JoinData
@@ -295,10 +241,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// 8
-			/// </summary>
+
 			[JoinName("8")]
 			public JoinDataComplete Kp8 = new JoinDataComplete(
 				new JoinData
@@ -312,10 +255,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// 9
-			/// </summary>
+
 			[JoinName("9")]
 			public JoinDataComplete Kp9 = new JoinDataComplete(
 				new JoinData
@@ -343,10 +283,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			// 		JoinCapabilities = eJoinCapabilities.FromSIMPL,
 			// 		JoinType = eJoinType.Digital
 			// 	});
-
-			/// <summary>
-			/// ENTER
-			/// </summary>
+			
 			[JoinName("ENTER")]
 			public JoinDataComplete Enter = new JoinDataComplete(
 				new JoinData
@@ -360,10 +297,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// CH+
-			/// </summary>
+
 			[JoinName("CH+")]
 			public JoinDataComplete ChannelUp = new JoinDataComplete(
 				new JoinData
@@ -377,10 +311,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// CH-
-			/// </summary>
+
 			[JoinName("CH-")]
 			public JoinDataComplete ChannelDown = new JoinDataComplete(
 				new JoinData
@@ -394,10 +325,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-
-			/// <summary>
-			/// *
-			/// </summary>
+			
 			[JoinName("*")]
 			public JoinDataComplete KpStar = new JoinDataComplete(
 				new JoinData
@@ -411,10 +339,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// #
-			/// </summary>
+
 			[JoinName("#")]
 			public JoinDataComplete KpPound = new JoinDataComplete(
 				new JoinData
@@ -443,9 +368,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			// 		JoinType = eJoinType.Digital
 			// 	});
 
-			/// <summary>
-			/// POWER_ON
-			/// </summary>
 			[JoinName("POWER_ON")]
 			public JoinDataComplete PowerOn = new JoinDataComplete(
 				new JoinData
@@ -459,10 +381,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// POWER_OFF
-			/// </summary>
+
 			[JoinName("POWER_OFF")]
 			public JoinDataComplete PowerOff = new JoinDataComplete(
 				new JoinData
@@ -476,10 +395,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// PLAY_PAUSE
-			/// </summary>
+
 			[JoinName("PLAY_PAUSE")]
 			public JoinDataComplete PlayPause = new JoinDataComplete(
 				new JoinData
@@ -493,10 +409,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// LAST
-			/// </summary>
+
 			[JoinName("LAST")]
 			public JoinDataComplete Last = new JoinDataComplete(
 				new JoinData
@@ -511,9 +424,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// HOME
-			/// </summary>
 			[JoinName("HOME")]
 			public JoinDataComplete Home = new JoinDataComplete(
 				new JoinData
@@ -528,9 +438,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// BACK
-			/// </summary>
 			[JoinName("BACK")]
 			public JoinDataComplete Back = new JoinDataComplete(
 				new JoinData
@@ -545,9 +452,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-			/// <summary>
-			/// GUIDE
-			/// </summary>
+
 			[JoinName("GUIDE")]
 			public JoinDataComplete Guide = new JoinDataComplete(
 				new JoinData
@@ -561,10 +466,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// INFO
-			/// </summary>
+
 			[JoinName("INFO")]
 			public JoinDataComplete Info = new JoinDataComplete(
 				new JoinData
@@ -578,10 +480,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// MENU
-			/// </summary>
+
 			[JoinName("MENU")]
 			public JoinDataComplete Menu = new JoinDataComplete(
 				new JoinData
@@ -595,10 +494,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// UP_ARROW
-			/// </summary>
+
 			[JoinName("UP_ARROW")]
 			public JoinDataComplete DpadUp = new JoinDataComplete(
 				new JoinData
@@ -612,10 +508,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// DN_ARROW
-			/// </summary>
+
 			[JoinName("DN_ARROW")]
 			public JoinDataComplete DpadDown = new JoinDataComplete(
 				new JoinData
@@ -629,10 +522,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// LEFT_ARROW
-			/// </summary>
+
 			[JoinName("LEFT_ARROW")]
 			public JoinDataComplete DpadLeft = new JoinDataComplete(
 				new JoinData
@@ -646,10 +536,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// RIGHT_ARROW
-			/// </summary>
+
 			[JoinName("RIGHT_ARROW")]
 			public JoinDataComplete DpadRight = new JoinDataComplete(
 				new JoinData
@@ -663,10 +550,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// SELECT
-			/// </summary>
+
 			[JoinName("SELECT")]
 			public JoinDataComplete DpadSelect = new JoinDataComplete(
 				new JoinData
@@ -680,10 +564,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// OPTIONS
-			/// </summary>
+
 			[JoinName("OPTIONS")]
 			public JoinDataComplete Options = new JoinDataComplete(
 				new JoinData
@@ -697,10 +578,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// RETURN
-			/// </summary>
+
 			[JoinName("RETURN")]
 			public JoinDataComplete Return = new JoinDataComplete(
 				new JoinData
@@ -715,9 +593,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// DVR
-			/// </summary>
 			[JoinName("DVR")]
 			public JoinDataComplete Dvr = new JoinDataComplete(
 				new JoinData
@@ -732,9 +607,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// ON_DEMAND
-			/// </summary>
+
 			[JoinName("ON_DEMAND")]
 			public JoinDataComplete OnDemand = new JoinDataComplete(
 				new JoinData
@@ -749,9 +622,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// PAGE_UP
-			/// </summary>
+
 			[JoinName("PAGE_UP")]
 			public JoinDataComplete PageUp = new JoinDataComplete(
 				new JoinData
@@ -765,10 +636,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// PAGE_DOWN
-			/// </summary>
+
 			[JoinName("PAGE_DOWN")]
 			public JoinDataComplete PageDown = new JoinDataComplete(
 				new JoinData
@@ -782,10 +650,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// F_SRCH
-			/// </summary>
+
 			[JoinName("F_SRCH")]
 			public JoinDataComplete ForwardSearch = new JoinDataComplete(
 				new JoinData
@@ -799,10 +664,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// R_SRCH
-			/// </summary>
+
 			[JoinName("R_SRCH")]
 			public JoinDataComplete ReverseSearch = new JoinDataComplete(
 				new JoinData
@@ -816,10 +678,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// TRACK+
-			/// </summary>
+
 			[JoinName("TRACK+")]
 			public JoinDataComplete TrackPlus = new JoinDataComplete(
 				new JoinData
@@ -833,10 +692,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// TRACK-
-			/// </summary>
+
 			[JoinName("TRACK-")]
 			public JoinDataComplete TrackMinus = new JoinDataComplete(
 				new JoinData
@@ -851,9 +707,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 			
-			/// <summary>
-			/// A
-			/// </summary>
 			[JoinName("A")]
 			public JoinDataComplete KpA = new JoinDataComplete(
 				new JoinData
@@ -867,10 +720,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// B
-			/// </summary>
+
 			[JoinName("B")]
 			public JoinDataComplete KpB = new JoinDataComplete(
 				new JoinData
@@ -884,10 +734,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// C
-			/// </summary>
+
 			[JoinName("C")]
 			public JoinDataComplete KpC = new JoinDataComplete(
 				new JoinData
@@ -901,10 +748,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// D
-			/// </summary>
+
 			[JoinName("D")]
 			public JoinDataComplete KpD = new JoinDataComplete(
 				new JoinData
@@ -918,10 +762,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// RED
-			/// </summary>
+
 			[JoinName("RED")]
 			public JoinDataComplete KpRed = new JoinDataComplete(
 				new JoinData
@@ -935,10 +776,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// GREEN
-			/// </summary>
+
 			[JoinName("GREEN")]
 			public JoinDataComplete KpGreen = new JoinDataComplete(
 				new JoinData
@@ -952,10 +790,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// YELLOW
-			/// </summary>
+
 			[JoinName("YELLOW")]
 			public JoinDataComplete KpYellow = new JoinDataComplete(
 				new JoinData
@@ -969,10 +804,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinCapabilities = eJoinCapabilities.FromSIMPL,
 					JoinType = eJoinType.Digital
 				});
-			
-			/// <summary>
-			/// BLUE
-			/// </summary>
+
 			[JoinName("BLUE")]
 			public JoinDataComplete KpBlue = new JoinDataComplete(
 				new JoinData
@@ -987,10 +819,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 					JoinType = eJoinType.Digital
 				});
 
-			/// <summary>
-			/// Constructor
-			/// </summary>
-			/// <param name="joinStart">Join this join map will start at</param>
 			public GenericIrControllerJoinMap(uint joinStart)
 				: base(joinStart, typeof(GenericIrControllerJoinMap))
 			{

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericLightingJoinMap.cs

@@ -1,7 +1,8 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a GenericLightingJoinMap
@@ -9,37 +10,22 @@ namespace PepperDash.Essentials.Core.Bridges
     public class GenericLightingJoinMap : JoinMapBaseAdvanced
     {
 
-        /// <summary>
-        /// Lighting Controller Online
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Lighting Controller Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Select Scene By Index
-        /// </summary>
+
         [JoinName("SelectScene")]
         public JoinDataComplete SelectScene = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Lighting Controller Select Scene By Index", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Select Scene Direct
-        /// </summary>
+
         [JoinName("SelectSceneDirect")]
         public JoinDataComplete SelectSceneDirect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 },
             new JoinMetadata { Description = "Lighting Controller Select Scene", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalSerial });
-        
-        /// <summary>
-        /// Button Visibility
-        /// </summary>
+
         [JoinName("ButtonVisibility")]
         public JoinDataComplete ButtonVisibility = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 10 },
             new JoinMetadata { Description = "Lighting Controller Button Visibility", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Set Integration Id
-        /// </summary>
+
         [JoinName("IntegrationIdSet")]
         public JoinDataComplete IntegrationIdSet = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Lighting Controller Set Integration Id", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs

@@ -1,6 +1,7 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a GenericRelayControllerJoinMap
@@ -8,9 +9,6 @@ namespace PepperDash.Essentials.Core.Bridges
     public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
     {
 
-        /// <summary>
-        /// Device Relay State Set / Get
-        /// </summary>
         [JoinName("Relay")]
         public JoinDataComplete Relay = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Relay State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs

@@ -1,281 +1,165 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a GlsOccupancySensorBaseJoinMap
     /// </summary>
     public class GlsOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Occ Sensor Is Online
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Set to Occupied
-        /// </summary>
+
         [JoinName("ForceOccupied")]
         public JoinDataComplete ForceOccupied = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Set to Occupied", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Set to Vacant
-        /// </summary>
+
         [JoinName("ForceVacant")]
         public JoinDataComplete ForceVacant = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Set to Vacant", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Enable Raw
-        /// </summary>
+
         [JoinName("EnableRawStates")]
         public JoinDataComplete EnableRawStates = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable Raw", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Disable Raw
-        /// </summary>
+
         [JoinName("RoomOccupiedFeedback")]
         public JoinDataComplete RoomOccupiedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Room Is Occupied", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Grace Occupancy Detected
-        /// </summary>
+
         [JoinName("GraceOccupancyDetectedFeedback")]
         public JoinDataComplete GraceOccupancyDetectedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Grace Occupancy Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Room Is Vacant
-        /// </summary>
+
         [JoinName("RoomVacantFeedback")]
         public JoinDataComplete RoomVacantFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Room Is Vacant", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Raw Occupancy Detected
-        /// </summary>
+
         [JoinName("RawOccupancyFeedback")]
         public JoinDataComplete RawOccupancyFeedback = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Raw Occupancy Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Raw PIR Occupancy Detected
-        /// </summary>
+
         [JoinName("RawOccupancyPirFeedback")]
         public JoinDataComplete RawOccupancyPirFeedback = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Raw PIR Occupancy Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Raw US Occupancy Detected
-        /// </summary>
+
         [JoinName("RawOccupancyUsFeedback")]
         public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Raw US Occupancy Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Enable LED Flash
-        /// </summary>
+
         [JoinName("EnableLedFlash")]
         public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable LED Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Disable LED Flash
-        /// </summary>
+
         [JoinName("DisableLedFlash")]
         public JoinDataComplete DisableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable LED Flash", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Enable Short Timeout
-        /// </summary>
+
         [JoinName("EnableShortTimeout")]
         public JoinDataComplete EnableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable Short Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Disable Short Timeout
-        /// </summary>
+
         [JoinName("DisableShortTimeout")]
         public JoinDataComplete DisableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable Short Timeout", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Set To Vacant when Either Sensor is Vacant
-        /// </summary>
+
         [JoinName("OrWhenVacated")]
         public JoinDataComplete OrWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Set To Vacant when Either Sensor is Vacant", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Set To Vacant when Both Sensors are Vacant
-        /// </summary>
+
         [JoinName("AndWhenVacated")]
         public JoinDataComplete AndWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Set To Vacant when Both Sensors are Vacant", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Enable Ultrasonic Sensor A
-        /// </summary>
+
         [JoinName("EnableUsA")]
         public JoinDataComplete EnableUsA = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable Ultrasonic Sensor A", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Disable Ultrasonic Sensor A
-        /// </summary>
+
         [JoinName("DisableUsA")]
         public JoinDataComplete DisableUsA = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable Ultrasonic Sensor A", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Enable Ultrasonic Sensor B
-        /// </summary>
+
         [JoinName("EnableUsB")]
         public JoinDataComplete EnableUsB = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable Ultrasonic Sensor B", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Disable Ultrasonic Sensor B
-        /// </summary>
+
         [JoinName("DisableUsB")]
         public JoinDataComplete DisableUsB = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable Ultrasonic Sensor B", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Enable IR Sensor
-        /// </summary>
+
         [JoinName("EnablePir")]
         public JoinDataComplete EnablePir = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Enable IR Sensor", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Disable IR Sensor
-        /// </summary>
+
         [JoinName("DisablePir")]
         public JoinDataComplete DisablePir = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Disable IR Sensor", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Increment US Occupied State Sensitivity
-        /// </summary>
+
         [JoinName("IncrementUsInOccupiedState")]
         public JoinDataComplete IncrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Increment US Occupied State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Decrement US Occupied State Sensitivity
-        /// </summary>
+
         [JoinName("DecrementUsInOccupiedState")]
         public JoinDataComplete DecrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Decrement US Occupied State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Increment US Vacant State Sensitivity
-        /// </summary>
+
         [JoinName("IncrementUsInVacantState")]
         public JoinDataComplete IncrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Increment US Vacant State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Decrement US Vacant State Sensitivity
-        /// </summary>
+
         [JoinName("DecrementUsInVacantState")]
         public JoinDataComplete DecrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Decrement US Vacant State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Increment IR Occupied State Sensitivity
-        /// </summary>
+
         [JoinName("IncrementPirInOccupiedState")]
         public JoinDataComplete IncrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Increment IR Occupied State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Decrement IR Occupied State Sensitivity
-        /// </summary>
+
         [JoinName("DecrementPirInOccupiedState")]
         public JoinDataComplete DecrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Decrement IR Occupied State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Increment IR Vacant State Sensitivity
-        /// </summary>
+
         [JoinName("IncrementPirInVacantState")]
         public JoinDataComplete IncrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Increment IR Vacant State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Decrement IR Vacant State Sensitivity
-        /// </summary>
+
         [JoinName("DecrementPirInVacantState")]
         public JoinDataComplete DecrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Decrement IR Vacant State Sensitivity", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        
-        /// <summary>
-        /// Occ Sensor Timeout Value
-        /// </summary>
+
         [JoinName("Timeout")]
         public JoinDataComplete Timeout = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Timeout Value", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Occ Sensor Local Timeout Value
-        /// </summary>
+
         [JoinName("TimeoutLocalFeedback")]
         public JoinDataComplete TimeoutLocalFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Local Timeout Value", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Occ Sensor Internal PhotoSensor Value
-        /// </summary>
+
         [JoinName("InternalPhotoSensorValue")]
         public JoinDataComplete InternalPhotoSensorValue = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Internal PhotoSensor Value", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Occ Sensor External PhotoSensor Value
-        /// </summary>
+
         [JoinName("ExternalPhotoSensorValue")]
         public JoinDataComplete ExternalPhotoSensorValue = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor External PhotoSensor Value", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Occ Sensor Ultrasonic Sensitivity in Occupied State
-        /// </summary>
+
         [JoinName("UsSensitivityInOccupiedState")]
         public JoinDataComplete UsSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Ultrasonic Sensitivity in Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Occ Sensor Ultrasonic Sensitivity in Vacant State
-        /// </summary>
+
         [JoinName("UsSensitivityInVacantState")]
         public JoinDataComplete UsSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Ultrasonic Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Occ Sensor PIR Sensitivity in Occupied State
-        /// </summary>
+
         [JoinName("PirSensitivityInOccupiedState")]
         public JoinDataComplete PirSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor PIR Sensitivity in Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Occ Sensor PIR Sensitivity in Vacant State
-        /// </summary>
+
         [JoinName("PirSensitivityInVacantState")]
         public JoinDataComplete PirSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor PIR Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Occ Sensor Name
-        /// </summary>
+
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Occ Sensor Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsPartitionSensorJoinMap.cs

@@ -1,5 +1,5 @@
-using System;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
 namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
@@ -11,9 +11,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
         #region Digital
 
-        /// <summary>
-        /// Sensor Is Online
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(
             new JoinData
@@ -28,9 +25,7 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        /// <summary>
-        /// Sensor Enable
-        /// </summary>
+        
         [JoinName("Enable")]
         public JoinDataComplete Enable = new JoinDataComplete(
             new JoinData
@@ -45,9 +40,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        /// <summary>
-        /// Sensor Partition Sensed
-        /// </summary>
         [JoinName("PartitionSensed")]
         public JoinDataComplete PartitionSensed = new JoinDataComplete(
             new JoinData
@@ -62,9 +54,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        /// <summary>
-        /// Sensor Partition Not Sensed
-        /// </summary>
         [JoinName("PartitionNotSensed")]
         public JoinDataComplete PartitionNotSensed = new JoinDataComplete(
             new JoinData
@@ -79,9 +68,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        /// <summary>
-        /// Sensor Increase Sensitivity
-        /// </summary>
         [JoinName("IncreaseSensitivity")]
         public JoinDataComplete IncreaseSensitivity = new JoinDataComplete(
             new JoinData
@@ -96,9 +82,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        /// <summary>
-        /// Sensor Decrease Sensitivity
-        /// </summary>
         [JoinName("DecreaseSensitivity")]
         public JoinDataComplete DecreaseSensitivity = new JoinDataComplete(
             new JoinData
@@ -117,9 +100,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
         #region Analog
 
-        /// <summary>
-        /// Sensor Sensitivity
-        /// </summary>
         [JoinName("Sensitivity")]
         public JoinDataComplete Sensitivity = new JoinDataComplete(
             new JoinData
@@ -139,9 +119,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 
         #region Serial
 
-        /// <summary>
-        /// Sensor Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(
             new JoinData

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdNxM4kEControllerJoinMap.cs

@@ -1,78 +1,49 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a HdMdNxM4kEControllerJoinMap
     /// </summary>
     public class HdMdNxM4kEControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Device Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Enable Automatic Routing on 4x1 Switchers
-        /// </summary>
         [JoinName("EnableAutoRoute")]
         public JoinDataComplete EnableAutoRoute = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Automatic Routing on 4x1 Switchers", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Device Input Name
-        /// </summary>
         [JoinName("InputName")]
         public JoinDataComplete InputName = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 8 },
             new JoinMetadata { Description = "Device Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Device Input Sync
-        /// </summary>
         [JoinName("InputSync")]
         public JoinDataComplete InputSync = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 8 },
             new JoinMetadata { Description = "Device Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Device Output Name
-        /// </summary>
         [JoinName("OutputName")]
         public JoinDataComplete OutputName = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 2 },
             new JoinMetadata { Description = "Device Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Device Output Route Set/Get
-        /// </summary>
         [JoinName("OutputRoute")]
         public JoinDataComplete OutputRoute = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 2 },
             new JoinMetadata { Description = "Device Output Route Set/Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Device Output Route Name
-        /// </summary>
         [JoinName("OutputRoutedName")]
         public JoinDataComplete OutputRoutedName = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 2 },
             new JoinMetadata { Description = "Device Output Route Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Device Enable Input Hdcp
-        /// </summary>
         [JoinName("EnableInputHdcp")]
         public JoinDataComplete EnableInputHdcp = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 8 },
             new JoinMetadata { Description = "Device Enable Input Hdcp", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Device Disable Input Hdcp
-        /// </summary>
         [JoinName("DisableInputHdcp")]
         public JoinDataComplete DisableInputHdcp = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 8 },
             new JoinMetadata { Description = "Device Disnable Input Hdcp", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Device Online Status
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Onlne", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs

@@ -1,6 +1,7 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a HdMdxxxCEControllerJoinMap
@@ -8,85 +9,50 @@ namespace PepperDash.Essentials.Core.Bridges
     public class HdMdxxxCEControllerJoinMap : JoinMapBaseAdvanced
     {
 
-        /// <summary>
-        /// Device Online
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Remote End Detected
-        /// </summary>
         [JoinName("RemoteEndDetected")]
         public JoinDataComplete RemoteEndDetected = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Remote End Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Auto Route On
-        /// </summary>
         [JoinName("AutoRouteOn")]
         public JoinDataComplete AutoRouteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Auto Route On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Auto Route Off
-        /// </summary>
         [JoinName("AutoRouteOff")]
         public JoinDataComplete AutoRouteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Auto Route Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Priority Routing On
-        /// </summary>
         [JoinName("PriorityRoutingOn")]
         public JoinDataComplete PriorityRoutingOn = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Priority Routing On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Priority Routing Off
-        /// </summary>
         [JoinName("PriorityRoutingOff")]
         public JoinDataComplete PriorityRoutingOff = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Priority Routing Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Input On Screen Display Enabled
-        /// </summary>
         [JoinName("InputOnScreenDisplayEnabled")]
         public JoinDataComplete InputOnScreenDisplayEnabled = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Input OSD Enabled", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Input On Screen Display Disabled
-        /// </summary>
         [JoinName("InputOnScreenDisplayDisabled")]
         public JoinDataComplete InputOnScreenDisplayDisabled = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Device Input OSD Disabled", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Sync Detected
-        /// </summary>
         [JoinName("SyncDetected")]
         public JoinDataComplete SyncDetected = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 5 },
             new JoinMetadata { Description = "Device Sync Detected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Video Source
-        /// </summary>
         [JoinName("VideoSource")]
         public JoinDataComplete VideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 5 },
             new JoinMetadata { Description = "Device Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Source Count
-        /// </summary>
         [JoinName("SourceCount")]
         public JoinDataComplete SourceCount = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 5 },
             new JoinMetadata { Description = "Device Video Source Count", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        /// <summary>
-        /// Source Names
-        /// </summary>
+
         [JoinName("SourceNames")]
         public JoinDataComplete SourceNames = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 5 },
             new JoinMetadata { Description = "Device Video Source Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdPsXxxControllerJoinMap.cs

@@ -1,7 +1,7 @@
-using System;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
  /// <summary>
  /// Represents a HdPsXxxControllerJoinMap
@@ -11,9 +11,6 @@ namespace PepperDash.Essentials.Core.Bridges
 
 		#region Digital
 
-		/// <summary>
-		/// Enable Automatic Routing on Xx1 Switchers
-		/// </summary>
 		[JoinName("EnableAutoRoute")]
 		public JoinDataComplete EnableAutoRoute = new JoinDataComplete(
 			new JoinData
@@ -28,9 +25,7 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Digital
 			});
 
-		/// <summary>
-		/// Device Input Sync
-		/// </summary>
+
 		[JoinName("InputSync")]
 		public JoinDataComplete InputSync = new JoinDataComplete(
 			new JoinData
@@ -45,9 +40,7 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Digital
 			});
 
-		/// <summary>
-		/// Device Enable Input Hdcp
-		/// </summary>
+
 		[JoinName("EnableInputHdcp")]
 		public JoinDataComplete EnableInputHdcp = new JoinDataComplete(
 			new JoinData
@@ -62,9 +55,7 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Digital
 			});
 
-		/// <summary>
-		/// Device Disnable Input Hdcp
-		/// </summary>
+
 		[JoinName("DisableInputHdcp")]
 		public JoinDataComplete DisableInputHdcp = new JoinDataComplete(
 			new JoinData
@@ -79,9 +70,7 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Digital
 			});
 
-		/// <summary>
-		/// Device Onlne
-		/// </summary>
+
 		[JoinName("IsOnline")]
 		public JoinDataComplete IsOnline = new JoinDataComplete(
 			new JoinData
@@ -101,9 +90,6 @@ namespace PepperDash.Essentials.Core.Bridges
 
 		#region Analog
 
-		/// <summary>
-		/// Device Input Route Set/Get
-		/// </summary>
 		[JoinName("OutputRoute")]
 		public JoinDataComplete OutputRoute = new JoinDataComplete(
 			new JoinData
@@ -123,9 +109,6 @@ namespace PepperDash.Essentials.Core.Bridges
 
 		#region Serial
 
-		/// <summary>
-		/// Device Name
-		/// </summary>
 		[JoinName("Name")]
 		public JoinDataComplete Name = new JoinDataComplete(
 			new JoinData
@@ -140,9 +123,7 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Serial
 			});
 
-		/// <summary>
-		/// Device Input Name
-		/// </summary>
+
 		[JoinName("InputName")]
 		public JoinDataComplete InputName = new JoinDataComplete(
 			new JoinData
@@ -157,9 +138,7 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Serial
 			});
 
-		/// <summary>
-		/// Device Output Name
-		/// </summary>
+
 		[JoinName("OutputName")]
 		public JoinDataComplete OutputName = new JoinDataComplete(
 			new JoinData
@@ -174,9 +153,7 @@ namespace PepperDash.Essentials.Core.Bridges
 				JoinType = eJoinType.Serial
 			});
 
-		/// <summary>
-		/// Device Output Route Name
-		/// </summary>
+
 		[JoinName("OutputRoutedName")]
 		public JoinDataComplete OutputRoutedName = new JoinDataComplete(
 			new JoinData

src/PepperDash.Essentials.Core/Bridges/JoinMaps/Hrxxx0WirelessRemoteControllerJoinMap.cs

@@ -1,393 +1,229 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a Hrxxx0WirelessRemoteControllerJoinMap
     /// </summary>
     public class Hrxxx0WirelessRemoteControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Power
-        /// </summary>
         [JoinName("Power")]
         public JoinDataComplete Power = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Power", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Menu
-        /// </summary>
         [JoinName("Menu")]
         public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Menu", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Guide
-        /// </summary>
         [JoinName("Guide")]
         public JoinDataComplete Guide = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Guide", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Info
-        /// </summary>
         [JoinName("Info")]
         public JoinDataComplete Info = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Info", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// VolumeUp
-        /// </summary>
         [JoinName("VolumeUp")]
         public JoinDataComplete VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "VolumeUp", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// VolumeDown
-        /// </summary>
         [JoinName("VolumeDown")]
         public JoinDataComplete VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "VolumeDown", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// DialPadUp
-        /// </summary>
         [JoinName("DialPadUp")]
         public JoinDataComplete DialPadUp = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadUp", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// DialPadDown
-        /// </summary>
         [JoinName("DialPadDown")]
         public JoinDataComplete DialPadDown = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadDown", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// DialPadLeft
-        /// </summary>
         [JoinName("DialPadLeft")]
         public JoinDataComplete DialPadLeft = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadLeft", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// DialPadRight
-        /// </summary>
         [JoinName("DialPadRight")]
         public JoinDataComplete DialPadRight = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadRight", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// DialPadSelect
-        /// </summary>
         [JoinName("DialPadSelect")]
         public JoinDataComplete DialPadSelect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "DialPadSelect", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// ChannelUp
-        /// </summary>
         [JoinName("ChannelUp")]
         public JoinDataComplete ChannelUp = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "ChannelUp", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// ChannelDown
-        /// </summary>
         [JoinName("ChannelDown")]
         public JoinDataComplete ChannelDown = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "ChannelDown", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Mute
-        /// </summary>
         [JoinName("Mute")]
         public JoinDataComplete Mute = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Mute", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Exit
-        /// </summary>
         [JoinName("Exit")]
         public JoinDataComplete Exit = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Exit", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Last
-        /// </summary>
         [JoinName("Last")]
         public JoinDataComplete Last = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "Last", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Play
-        /// </summary>
         [JoinName("Play")]
         public JoinDataComplete Play = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "Play", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Pause
-        /// </summary>
         [JoinName("Pause")]
         public JoinDataComplete Pause = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "Pause", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Rewind
-        /// </summary>
         [JoinName("Rewind")]
         public JoinDataComplete Rewind = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "Rewind", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// FastForward
-        /// </summary>
         [JoinName("FastForward")]
         public JoinDataComplete FastForward = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "FastForward", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// PreviousTrack
-        /// </summary>
         [JoinName("PreviousTrack")]
         public JoinDataComplete PreviousTrack = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "PreviousTrack", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// NextTrack
-        /// </summary>
         [JoinName("NextTrack")]
         public JoinDataComplete NextTrack = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "NextTrack", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Stop
-        /// </summary>
         [JoinName("Stop")]
         public JoinDataComplete Stop = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "Stop", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Record
-        /// </summary>
         [JoinName("Record")]
         public JoinDataComplete Record = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "Record", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Dvr
-        /// </summary>
         [JoinName("Dvr")]
         public JoinDataComplete Dvr = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Dvr", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad1
-        /// </summary>
         [JoinName("Keypad1")]
         public JoinDataComplete Keypad1 = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad2Abc
-        /// </summary>
         [JoinName("Keypad2Abc")]
         public JoinDataComplete Keypad2 = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad2Abc", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad3Def
-        /// </summary>
         [JoinName("Keypad3Def")]
         public JoinDataComplete Keypad3Def = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad3Def", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad4Ghi
-        /// </summary>
         [JoinName("Keypad4Ghi")]
         public JoinDataComplete Keypad4Ghi = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad4Ghi", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad5Jkl
-        /// </summary>
         [JoinName("Keypad5Jkl")]
         public JoinDataComplete Keypad5Jkl = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad5Jkl", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad6Mno
-        /// </summary>
         [JoinName("Keypad6Mno")]
         public JoinDataComplete Keypad6Mno = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad6Mno", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad7Pqrs
-        /// </summary>
         [JoinName("Keypad7Pqrs")]
         public JoinDataComplete Keypad7Pqrs = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad7Pqrs", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad8Tuv
-        /// </summary>
         [JoinName("Keypad8Tuv")]
         public JoinDataComplete Keypad8Tuv = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad8Tuv", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad9Wxyz
-        /// </summary>
         [JoinName("Keypad9Wxyz")]
         public JoinDataComplete Keypad9Wxyz = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad9Wxyz", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad0
-        /// </summary>
         [JoinName("Keypad0")]
         public JoinDataComplete Keypad0 = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad0", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Clear
-        /// </summary>
         [JoinName("Clear")]
         public JoinDataComplete Clear = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
             new JoinMetadata { Description = "Clear", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Enter
-        /// </summary>
         [JoinName("Enter")]
         public JoinDataComplete Enter = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
             new JoinMetadata { Description = "Enter", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Red
-        /// </summary>
         [JoinName("Red")]
         public JoinDataComplete Red = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
             new JoinMetadata { Description = "Red", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Green
-        /// </summary>
         [JoinName("Green")]
         public JoinDataComplete Green = new JoinDataComplete(new JoinData { JoinNumber = 39, JoinSpan = 1 },
             new JoinMetadata { Description = "Green", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Yellow
-        /// </summary>
         [JoinName("Yellow")]
         public JoinDataComplete Yellow = new JoinDataComplete(new JoinData { JoinNumber = 40, JoinSpan = 1 },
             new JoinMetadata { Description = "Yellow", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Blue
-        /// </summary>
         [JoinName("Blue")]
         public JoinDataComplete Blue = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "Blue", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Custom1
-        /// </summary>
         [JoinName("Custom1")]
         public JoinDataComplete Custom1 = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Custom2
-        /// </summary>
         [JoinName("Custom2")]
         public JoinDataComplete Custom2 = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Custom3
-        /// </summary>
         [JoinName("Custom3")]
         public JoinDataComplete Custom3 = new JoinDataComplete(new JoinData { JoinNumber = 44, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom3", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Custom4
-        /// </summary>
         [JoinName("Custom4")]
         public JoinDataComplete Custom4 = new JoinDataComplete(new JoinData { JoinNumber = 45, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom4", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Custom5
-        /// </summary>
         [JoinName("Custom5")]
         public JoinDataComplete Custom5 = new JoinDataComplete(new JoinData { JoinNumber = 46, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom5", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Custom6
-        /// </summary>
         [JoinName("Custom6")]
         public JoinDataComplete Custom6 = new JoinDataComplete(new JoinData { JoinNumber = 47, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom6", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Custom7
-        /// </summary>
         [JoinName("Custom7")]
         public JoinDataComplete Custom7 = new JoinDataComplete(new JoinData { JoinNumber = 48, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom7", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Custom8
-        /// </summary>
         [JoinName("Custom8")]
         public JoinDataComplete Custom8 = new JoinDataComplete(new JoinData { JoinNumber = 49, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom8", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Custom9
-        /// </summary>
         [JoinName("Custom9")]
         public JoinDataComplete Custom9 = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 },
             new JoinMetadata { Description = "Custom9", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Fav
-        /// </summary>
         [JoinName("Fav")]
         public JoinDataComplete Fav = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 },
             new JoinMetadata { Description = "Fav", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Home
-        /// </summary>
         [JoinName("Home")]
         public JoinDataComplete Home = new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1 },
             new JoinMetadata { Description = "Home", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// BatteryLow
-        /// </summary>
         [JoinName("BatteryLow")]
         public JoinDataComplete BatteryLow = new JoinDataComplete(new JoinData { JoinNumber = 53, JoinSpan = 1 },
             new JoinMetadata { Description = "BatteryLow", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// BatteryCritical
-        /// </summary>
         [JoinName("BatteryCritical")]
         public JoinDataComplete BatteryCritical = new JoinDataComplete(new JoinData { JoinNumber = 54, JoinSpan = 1 },
             new JoinMetadata { Description = "BatteryCritical", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// BatteryVoltage
-        /// </summary>
         [JoinName("BatteryVoltage")]
         public JoinDataComplete BatteryVoltage = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "BatteryVoltage", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IAnalogInputJoinMap.cs

@@ -1,6 +1,7 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a IAnalogInputJoinMap
@@ -8,16 +9,9 @@ namespace PepperDash.Essentials.Core.Bridges
     public class IAnalogInputJoinMap : JoinMapBaseAdvanced
     {
 
-        /// <summary>
-        /// Input Value
-        /// </summary>
         [JoinName("InputValue")]
         public JoinDataComplete InputValue = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Input Value", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-        
-        /// <summary>
-        /// Minimum Change
-        /// </summary>
         [JoinName("MinimumChange")]
         public JoinDataComplete MinimumChange = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Minimum voltage change required to reflect a change", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs

@@ -1,50 +1,33 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a IBasicCommunicationJoinMap
     /// </summary>
     public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Text Received From Remote Device
-        /// </summary>
         [JoinName("TextReceived")]
         public JoinDataComplete TextReceived = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Text Received From Remote Device", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Text Sent To Remote Device
-        /// </summary>
         [JoinName("SendText")]
         public JoinDataComplete SendText = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Text Sent To Remote Device", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Set Port Config
-        /// </summary>
         [JoinName("SetPortConfig")]
         public JoinDataComplete SetPortConfig = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Set Port Config", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Connect
-        /// </summary>
         [JoinName("Connect")]
         public JoinDataComplete Connect = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Connect", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Disconnect
-        /// </summary>
         [JoinName("Connected")]
         public JoinDataComplete Connected = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Connected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Status
-        /// </summary>
         [JoinName("Status")]
         public JoinDataComplete Status = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalInputJoinMap.cs

@@ -1,15 +1,14 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a IDigitalInputJoinMap
     /// </summary>
     public class IDigitalInputJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Input State
-        /// </summary>
+
         [JoinName("InputState")]
         public JoinDataComplete InputState = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Input State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalOutputJoinMap.cs

@@ -1,15 +1,14 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a IDigitalOutputJoinMap
     /// </summary>
     public class IDigitalOutputJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Output State
-        /// </summary>
+
         [JoinName("OutputState")]
         public JoinDataComplete OutputState = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Get / Set state of Digital Input", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/IRBlurayBaseJoinMap.cs

@@ -1,341 +1,198 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Join map for IRBlurayBase devices
     /// </summary>
     public class IRBlurayBaseJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Power On
-        /// </summary>
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Power Off
-        /// </summary>
         [JoinName("PowerOff")]
         public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Power Toggle
-        /// </summary>
         [JoinName("PowerToggle")]
         public JoinDataComplete PowerToggle = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Power Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Nav Up
-        /// </summary>
         [JoinName("Up")]
         public JoinDataComplete Up = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Nav Down
-        /// </summary>
         [JoinName("Down")]
         public JoinDataComplete Down = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Nav Left
-        /// </summary>
         [JoinName("Left")]
         public JoinDataComplete Left = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Nav Right
-        /// </summary>
         [JoinName("Right")]
         public JoinDataComplete Right = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Select
-        /// </summary>
         [JoinName("Select")]
         public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Menu
-        /// </summary>
         [JoinName("Menu")]
         public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Exit
-        /// </summary>
         [JoinName("Exit")]
         public JoinDataComplete Exit = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
             new JoinMetadata { Description = "Exit", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 0
-        /// </summary>
         [JoinName("Digit0")]
         public JoinDataComplete Digit0 = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 0", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 1
-        /// </summary>
         [JoinName("Digit1")]
         public JoinDataComplete Digit1 = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 1", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 2
-        /// </summary>
         [JoinName("Digit2")]
         public JoinDataComplete Digit2 = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 2", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 3
-        /// </summary>
         [JoinName("Digit3")]
         public JoinDataComplete Digit3 = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 3", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 4
-        /// </summary>
         [JoinName("Digit4")]
         public JoinDataComplete Digit4 = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 4", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 5
-        /// </summary>
         [JoinName("Digit5")]
         public JoinDataComplete Digit5 = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 5", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 6
-        /// </summary>
         [JoinName("Digit6")]
         public JoinDataComplete Digit6 = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 6", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 7
-        /// </summary>
         [JoinName("Digit7")]
         public JoinDataComplete Digit7 = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 7", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 8
-        /// </summary>
         [JoinName("Digit8")]
         public JoinDataComplete Digit8 = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 8", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Digit 9
-        /// </summary>
         [JoinName("Digit9")]
         public JoinDataComplete Digit9 = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "Digit 9", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad Clear
-        /// </summary>
         [JoinName("KeypadClear")]
         public JoinDataComplete KeypadClear = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad Clear", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad Enter
-        /// </summary>
         [JoinName("KeypadEnter")]
         public JoinDataComplete KeypadEnter = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad Enter", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Channel Up
-        /// </summary>
         [JoinName("ChannelUp")]
         public JoinDataComplete ChannelUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Channel Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Channel Down
-        /// </summary>
         [JoinName("ChannelDown")]
         public JoinDataComplete ChannelDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Channel Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Last Channel
-        /// </summary>
         [JoinName("LastChannel")]
         public JoinDataComplete LastChannel = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "Last Channel", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Guide
-        /// </summary>
         [JoinName("Guide")]
         public JoinDataComplete Guide = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "Guide", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Info
-        /// </summary>
         [JoinName("Info")]
         public JoinDataComplete Info = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "Info", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Red
-        /// </summary>
         [JoinName("Red")]
         public JoinDataComplete Red = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "Red", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Green
-        /// </summary>
         [JoinName("Green")]
         public JoinDataComplete Green = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "Green", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Yellow
-        /// </summary>
         [JoinName("Yellow")]
         public JoinDataComplete Yellow = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "Yellow", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Blue
-        /// </summary>
         [JoinName("Blue")]
         public JoinDataComplete Blue = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "Blue", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Play
-        /// </summary>
+
         [JoinName("Play")]
         public JoinDataComplete Play = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
             new JoinMetadata { Description = "Play", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Pause
-        /// </summary>
         [JoinName("Pause")]
         public JoinDataComplete Pause = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
             new JoinMetadata { Description = "Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Stop
-        /// </summary>
         [JoinName("Stop")]
         public JoinDataComplete Stop = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
             new JoinMetadata { Description = "Stop", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Fast Forward
-        /// </summary>
         [JoinName("FFwd")]
         public JoinDataComplete FFwd = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
             new JoinMetadata { Description = "FFwd", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Rewind
-        /// </summary>
         [JoinName("Rewind")]
         public JoinDataComplete Rewind = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
             new JoinMetadata { Description = "Rewind", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Chapter Plus
-        /// </summary>
         [JoinName("ChapPlus")]
         public JoinDataComplete ChapPlus = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
             new JoinMetadata { Description = "Chapter Plus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Chapter Minus
-        /// </summary>
         [JoinName("ChapMinus")]
         public JoinDataComplete ChapMinus = new JoinDataComplete(new JoinData { JoinNumber = 39, JoinSpan = 1 },
             new JoinMetadata { Description = "Chapter Minus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Replay
-        /// </summary>
         [JoinName("Replay")]
         public JoinDataComplete Replay = new JoinDataComplete(new JoinData { JoinNumber = 40, JoinSpan = 1 },
             new JoinMetadata { Description = "Replay", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Record
-        /// </summary>
         [JoinName("Record")]
         public JoinDataComplete Record = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "Record", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Has Keypad Accessory Button 1
-        /// </summary>
         [JoinName("HasKeypadAccessoryButton1")]
         public JoinDataComplete HasKeypadAccessoryButton1 = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "Has Keypad Accessory Button 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Has Keypad Accessory Button 2
-        /// </summary>
         [JoinName("HasKeypadAccessoryButton2")]
         public JoinDataComplete HasKeypadAccessoryButton2 = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "Has Keypad Accessory Button 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad Accessory Button 1 Press
-        /// </summary>
         [JoinName("KeypadAccessoryButton1Press")]
         public JoinDataComplete KeypadAccessoryButton1Press = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 2 },
             new JoinMetadata { Description = "Keypad Accessory Button 1 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad Accessory Button 2 Press
-        /// </summary>
         [JoinName("KeypadAccessoryButton2Press")]
         public JoinDataComplete KeypadAccessoryButton2Press = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 2 },
             new JoinMetadata { Description = "Keypad Accessory Button 2 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Keypad Accessory Button 1 Label
-        /// </summary>
         [JoinName("KeypadAccessoryButton1Label")]
         public JoinDataComplete KeypadAccessoryButton1Label = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Keypad Accessory Button 2 Label
-        /// </summary>
         [JoinName("KeypadAccessoryButton2Label")]
         public JoinDataComplete KeypadAccessoryButton2Label = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/PduJoinMapBase.cs

@@ -1,64 +1,41 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a PduJoinMapBase
     /// </summary>
     public class PduJoinMapBase : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// PDU Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// PDU Online Status
-        /// </summary>
         [JoinName("Online")]
         public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Number of Controlled Outlets
-        /// </summary>
         [JoinName("OutletCount")]
         public JoinDataComplete OutletCount = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Number of COntrolled Outlets", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Outlet Name
-        /// </summary>
         [JoinName("OutletName")]
         public JoinDataComplete OutletName = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Outlet Enabled Status
-        /// </summary>
         [JoinName("OutletEnabled")]
         public JoinDataComplete OutletEnabled = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Enabled", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Outlet Power State
-        /// </summary>
         [JoinName("OutletPowerCycle")]
         public JoinDataComplete OutletPowerCycle = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Power Cycle", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Outlet Power On
-        /// </summary>
         [JoinName("OutletPowerOn")]
         public JoinDataComplete OutletPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
         
-        /// <summary>
-        /// Outlet Power Off
-        /// </summary>
         [JoinName("OutletPowerOff")]
         public JoinDataComplete OutletPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Outlet Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs

@@ -1,380 +1,222 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a SetTopBoxControllerJoinMap
     /// </summary>
     public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// STB Power On
-        /// </summary>
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Power On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Power Off
-        /// </summary>
         [JoinName("PowerOff")]
         public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Power Toggle
-        /// </summary>
         [JoinName("PowerToggle")]
         public JoinDataComplete PowerToggle = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Power Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Has DPad
-        /// </summary>
         [JoinName("HasDpad")]
         public JoinDataComplete HasDpad = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has DPad", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Nav Up
-        /// </summary>
         [JoinName("Up")]
         public JoinDataComplete Up = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Nav Down
-        /// </summary>
         [JoinName("Down")]
         public JoinDataComplete Down = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Nav Left
-        /// </summary>
         [JoinName("Left")]
         public JoinDataComplete Left = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Nav Right
-        /// </summary>
         [JoinName("Right")]
         public JoinDataComplete Right = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Select
-        /// </summary>
         [JoinName("Select")]
         public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Menu
-        /// </summary>
         [JoinName("Menu")]
         public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Exit
-        /// </summary>
         [JoinName("Exit")]
         public JoinDataComplete Exit = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Exit", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Has Numeric
-        /// </summary>
         [JoinName("HasNumeric")]
         public JoinDataComplete HasNumeric = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has Numeric", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 0
-        /// </summary>
         [JoinName("Digit0")]
         public JoinDataComplete Digit0 = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 0", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 1
-        /// </summary>
         [JoinName("Digit1")]
         public JoinDataComplete Digit1 = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 1", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 2
-        /// </summary>
         [JoinName("Digit2")]
         public JoinDataComplete Digit2 = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 2", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 3
-        /// </summary>
         [JoinName("Digit3")]
         public JoinDataComplete Digit3 = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 3", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 4
-        /// </summary>
         [JoinName("Digit4")]
         public JoinDataComplete Digit4 = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 4", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 5
-        /// </summary>
         [JoinName("Digit5")]
         public JoinDataComplete Digit5 = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 5", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 6
-        /// </summary>
         [JoinName("Digit6")]
         public JoinDataComplete Digit6 = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 6", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 7
-        /// </summary>
         [JoinName("Digit7")]
         public JoinDataComplete Digit7 = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 7", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 8
-        /// </summary>
         [JoinName("Digit8")]
         public JoinDataComplete Digit8 = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 8", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Digit 9
-        /// </summary>
         [JoinName("Digit9")]
         public JoinDataComplete Digit9 = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Digit 9", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Dash
-        /// </summary>
         [JoinName("Dash")]
         public JoinDataComplete Dash = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Dash", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Keypad Enter
-        /// </summary>
         [JoinName("KeypadEnter")]
         public JoinDataComplete KeypadEnter = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Keypad Enter", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Channel Up
-        /// </summary>
         [JoinName("ChannelUp")]
         public JoinDataComplete ChannelUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Channel Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Channel Down
-        /// </summary>
         [JoinName("ChannelDown")]
         public JoinDataComplete ChannelDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Channel Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Last Channel
-        /// </summary>
         [JoinName("LastChannel")]
         public JoinDataComplete LastChannel = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Last Channel", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Guide
-        /// </summary>
         [JoinName("Guide")]
         public JoinDataComplete Guide = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Guide", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Info
-        /// </summary>
         [JoinName("Info")]
         public JoinDataComplete Info = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Info", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Red
-        /// </summary>
         [JoinName("Red")]
         public JoinDataComplete Red = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Red", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Green
-        /// </summary>
         [JoinName("Green")]
         public JoinDataComplete Green = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Green", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Yellow
-        /// </summary>
         [JoinName("Yellow")]
         public JoinDataComplete Yellow = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Yellow", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Blue
-        /// </summary>
         [JoinName("Blue")]
         public JoinDataComplete Blue = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Blue", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Has DVR
-        /// </summary>
         [JoinName("HasDvr")]
         public JoinDataComplete HasDvr = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has DVR", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Dvr List
-        /// </summary>
         [JoinName("DvrList")]
         public JoinDataComplete DvrList = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
             new JoinMetadata { Description = "STB DvrList", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Play
-        /// </summary>
         [JoinName("Play")]
         public JoinDataComplete Play = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Play", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Pause
-        /// </summary>
         [JoinName("Pause")]
         public JoinDataComplete Pause = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Stop
-        /// </summary>
         [JoinName("Stop")]
         public JoinDataComplete Stop = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Stop", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB FFwd
-        /// </summary>
         [JoinName("FFwd")]
         public JoinDataComplete FFwd = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
             new JoinMetadata { Description = "STB FFwd", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Rewind
-        /// </summary>
         [JoinName("Rewind")]
         public JoinDataComplete Rewind = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Rewind", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Chapter Plus
-        /// </summary>
         [JoinName("ChapPlus")]
         public JoinDataComplete ChapPlus = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Chapter Plus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Chapter Minus
-        /// </summary>
         [JoinName("ChapMinus")]
         public JoinDataComplete ChapMinus = new JoinDataComplete(new JoinData { JoinNumber = 39, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Chapter Minus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Replay
-        /// </summary>
         [JoinName("Replay")]
         public JoinDataComplete Replay = new JoinDataComplete(new JoinData { JoinNumber = 40, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Replay", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Record
-        /// </summary>
         [JoinName("Record")]
         public JoinDataComplete Record = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Record", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Has Keypad Accessory Button 1
-        /// </summary>
         [JoinName("HasKeypadAccessoryButton1")]
         public JoinDataComplete HasKeypadAccessoryButton1 = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has Keypad Accessory Button 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Has Keypad Accessory Button 2
-        /// </summary>
         [JoinName("HasKeypadAccessoryButton2")]
         public JoinDataComplete HasKeypadAccessoryButton2 = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Has Keypad Accessory Button 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Keypad Accessory Button 1 Press
-        /// </summary>
         [JoinName("KeypadAccessoryButton1Press")]
         public JoinDataComplete KeypadAccessoryButton1Press = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 2 },
             new JoinMetadata { Description = "STB Keypad Accessory Button 1 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Keypad Accessory Button 2 Press
-        /// </summary>
         [JoinName("KeypadAccessoryButton2Press")]
         public JoinDataComplete KeypadAccessoryButton2Press = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 2 },
             new JoinMetadata { Description = "STB Keypad Accessory Button 2 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Keypad Accessory Button 1 Label
-        /// </summary>
         [JoinName("KeypadAccessoryButton1Label")]
         public JoinDataComplete KeypadAccessoryButton1Label = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// STB Keypad Accessory Button 2 Label
-        /// </summary>
         [JoinName("KeypadAccessoryButton2Label")]
         public JoinDataComplete KeypadAccessoryButton2Label = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// STB Load Presets
-        /// </summary>
         [JoinName("LoadPresets")]
         public JoinDataComplete LoadPresets = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Load Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// STB Has Presets
-        /// </summary>
         [JoinName("HasPresets")]
         public JoinDataComplete HasPresets = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Load Presets", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/StatusSignControllerJoinMap.cs

@@ -1,64 +1,41 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a StatusSignControllerJoinMap
     /// </summary>
     public class StatusSignControllerJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Status Sign Online
-        /// </summary>
         [JoinName("IsOnline")]
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Sign Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Status Sign Name
-        /// </summary>
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Sign Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Red LED Control
-        /// </summary>
         [JoinName("RedControl")]
         public JoinDataComplete RedControl = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Red LED Enable / Disable", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Red LED Intensity
-        /// </summary>
         [JoinName("RedLed")]
         public JoinDataComplete RedLed = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Red LED Intensity", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Green LED Control
-        /// </summary>
         [JoinName("GreenControl")]
         public JoinDataComplete GreenControl = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Green LED Enable / Disable", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Green LED Intensity
-        /// </summary>
         [JoinName("GreenLed")]
         public JoinDataComplete GreenLed = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Green LED Intensity", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Blue LED Control
-        /// </summary>
         [JoinName("BlueControl")]
         public JoinDataComplete BlueControl = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Blue LED Enable / Disable", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Blue LED Intensity
-        /// </summary>
         [JoinName("BlueLed")]
         public JoinDataComplete BlueLed = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Status Blue LED Intensity", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });

src/PepperDash.Essentials.Core/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -1,260 +1,153 @@
-using System;
+using PepperDash.Essentials.Core.JoinMaps;
+using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     /// <summary>
     /// Represents a SystemMonitorJoinMap
     /// </summary>
     public class SystemMonitorJoinMap : JoinMapBaseAdvanced
     {
-        /// <summary>
-        /// Processor Timezone
-        /// </summary>
         [JoinName("TimeZone")]
         public JoinDataComplete TimeZone = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Timezone", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
-        /// <summary>
-        /// Processor Timezone Name
-        /// </summary>
         [JoinName("TimeZoneName")]
         public JoinDataComplete TimeZoneName = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Timezone Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor OS Version
-        /// </summary>
         [JoinName("IOControllerVersion")]
         public JoinDataComplete IOControllerVersion = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor IO Controller Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor SNMP App Version
-        /// </summary>
         [JoinName("SnmpAppVersion")]
         public JoinDataComplete SnmpAppVersion = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor SNMP App Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor BACNet App Version
-        /// </summary>
         [JoinName("BACnetAppVersion")]
         public JoinDataComplete BACnetAppVersion = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor BACNet App Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Controller Version
-        /// </summary>
         [JoinName("ControllerVersion")]
         public JoinDataComplete ControllerVersion = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Controller Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Serial Number
-        /// </summary>
         [JoinName("SerialNumber")]
         public JoinDataComplete SerialNumber = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Model
-        /// </summary>
         [JoinName("Model")]
         public JoinDataComplete Model = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Model", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Uptime
-        /// </summary>
         [JoinName("Uptime")]
         public JoinDataComplete Uptime = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Uptime", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Last Boot Time
-        /// </summary>
         [JoinName("LastBoot")]
         public JoinDataComplete LastBoot = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Last Boot", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Program Offset Join
-        /// </summary>
         [JoinName("ProgramOffsetJoin")]
         public JoinDataComplete ProgramOffsetJoin = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 5 },
             new JoinMetadata { Description = "All Program Data is offset between slots by 5 - First Joins Start at 11", JoinCapabilities = eJoinCapabilities.None, JoinType = eJoinType.None });
 		
-        /// <summary>
-        /// Processor Program Start
-        /// </summary>
         [JoinName("ProgramStart")]
         public JoinDataComplete ProgramStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Start / Fb", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Processor Program Stop
-        /// </summary>
         [JoinName("ProgramStop")]
         public JoinDataComplete ProgramStop = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Stop / Fb", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Processor Program Register
-        /// </summary>
         [JoinName("ProgramRegister")]
         public JoinDataComplete ProgramRegister = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Register / Fb", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Processor Program Unregister
-        /// </summary>
         [JoinName("ProgramUnregister")]
         public JoinDataComplete ProgramUnregister = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program UnRegister / Fb", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Processor Program Name
-        /// </summary>
         [JoinName("ProgramName")]
         public JoinDataComplete ProgramName = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Program Version
-        /// </summary>
         [JoinName("ProgramCompiledTime")]
         public JoinDataComplete ProgramCompiledTime = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Compile Time", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Program Crestron Database Version
-        /// </summary>
         [JoinName("ProgramCrestronDatabaseVersion")]
         public JoinDataComplete ProgramCrestronDatabaseVersion = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Database Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Program Environment Version
-        /// </summary>
         [JoinName("ProgramEnvironmentVersion")]
         public JoinDataComplete ProgramEnvironmentVersion = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Environment Version", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Program Aggregate Info
-        /// </summary>
         [JoinName("AggregatedProgramInfo")]
         public JoinDataComplete AggregatedProgramInfo = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Program Aggregate Info Json", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Ethernet Offset Join
-        /// </summary>
         [JoinName("EthernetOffsetJoin")]
         public JoinDataComplete EthernetOffsetJoin = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata { Description = "All Ethernet Data is offset between Nics by 5 - First Joins Start at 76", JoinCapabilities = eJoinCapabilities.None, JoinType = eJoinType.None });
 
-        /// <summary>
-        /// Processor Ethernet Hostname
-        /// </summary>
         [JoinName("HostName")]
         public JoinDataComplete HostName = new JoinDataComplete(new JoinData { JoinNumber = 76, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Hostname", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Current Ip Address
-        /// </summary>
         [JoinName("CurrentIpAddress")]
         public JoinDataComplete CurrentIpAddress = new JoinDataComplete(new JoinData { JoinNumber = 77, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Current Ip Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Current Subnet Mask
-        /// </summary>
         [JoinName("CurrentSubnetMask")]
         public JoinDataComplete CurrentSubnetMask = new JoinDataComplete(new JoinData { JoinNumber = 78, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Current Subnet Mask", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Current Default Gateway
-        /// </summary>
         [JoinName("CurrentDefaultGateway")]
         public JoinDataComplete CurrentDefaultGateway = new JoinDataComplete(new JoinData { JoinNumber = 79, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Current Default Gateway", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Static Ip Address
-        /// </summary>
         [JoinName("StaticIpAddress")]
         public JoinDataComplete StaticIpAddress = new JoinDataComplete(new JoinData { JoinNumber = 80, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Static Ip Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Static Subnet Mask
-        /// </summary>
         [JoinName("StaticSubnetMask")]
         public JoinDataComplete StaticSubnetMask = new JoinDataComplete(new JoinData { JoinNumber = 81, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Static Subnet Mask", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Static Default Gateway
-        /// </summary>
         [JoinName("StaticDefaultGateway")]
         public JoinDataComplete StaticDefaultGateway = new JoinDataComplete(new JoinData { JoinNumber = 82, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Static Default Gateway", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Domain
-        /// </summary>
         [JoinName("Domain")]
         public JoinDataComplete Domain = new JoinDataComplete(new JoinData { JoinNumber = 83, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Domain", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Dns Server
-        /// </summary>
         [JoinName("DnsServer")]
         public JoinDataComplete DnsServer = new JoinDataComplete(new JoinData { JoinNumber = 84, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Dns Server", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Mac Address
-        /// </summary>
         [JoinName("MacAddress")]
         public JoinDataComplete MacAddress = new JoinDataComplete(new JoinData { JoinNumber = 85, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Mac Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Ethernet Dhcp Status
-        /// </summary>
         [JoinName("DhcpStatus")]
         public JoinDataComplete DhcpStatus = new JoinDataComplete(new JoinData { JoinNumber = 86, JoinSpan = 1 },
             new JoinMetadata { Description = "Processor Ethernet Dhcp Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        /// <summary>
-        /// Processor Reboot
-        /// </summary>
 		[JoinName("ProcessorRebot")]
 		public JoinDataComplete ProcessorReboot = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
 			new JoinMetadata { Description = "Reboot processor", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Is Appliance Fb
-        /// </summary>
 		[JoinName("IsAppliance")]
 		public JoinDataComplete IsAppliance = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
 			new JoinMetadata { Description = "Is appliance Fb", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Is Server Fb
-        /// </summary>
 		[JoinName("IsServer")]
 		public JoinDataComplete IsServer = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
 			new JoinMetadata { Description = "Is server Fb", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        /// <summary>
-        /// Program Reset
-        /// </summary>
 		[JoinName("ProgramReset")]
 		public JoinDataComplete ProgramReset = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
 			new JoinMetadata { Description = "Resets the program", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

src/PepperDash.Essentials.Core/Bridges/SigHelper.cs

@@ -0,0 +1,72 @@
+using System;
+using Crestron.SimplSharpPro;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    /// <summary>
+    /// Helper class for various Sig events
+    /// </summary>
+    public class SigHelper
+    {
+        /// <summary>
+        /// Runs action when Sig is pressed
+        /// </summary>
+        /// <param name="sig"></param>
+        public static void Pressed(Sig sig, Action act) { if (sig.BoolValue) act(); }
+
+        /// <summary>
+        /// Runs action when Sig is released
+        /// </summary>
+        public static void Released(Sig sig, Action act) { if (!sig.BoolValue) act(); }
+
+        /// <summary>
+        /// SetBoolOutAction method
+        /// </summary>
+        public static void SetBoolOutAction(BoolOutputSig sig, Action<bool> a)
+        {
+            if (sig != null)
+                sig.UserObject = a;
+        }
+
+        /// <summary>
+        /// Safely clears action of non-null sig.
+        /// </summary>
+        public static void ClearBoolOutAction(BoolOutputSig sig)
+        {
+            if (sig != null)
+                sig.UserObject = null;
+        }
+
+        /// <summary>
+        /// Does a timed ramp, where the time is scaled proportional to the 
+        /// remaining range to cover
+        /// </summary>
+        /// <param name="sig">Ushort sig to scale</param>
+        /// <param name="newLevel">Level to go to</param>
+        /// <param name="time">In ms (not hundredths like Crestron Sig ramp function)</param>
+        /// <summary>
+        /// RampTimeScaled method
+        /// </summary>
+        public static void RampTimeScaled(Sig sig, ushort newLevel, uint time)
+        {
+            var level = sig.UShortValue;
+            var diff = Math.Abs(level - newLevel);
+            var scaledTime = (uint)(diff * time / 65535);
+            Ramp(sig, newLevel, scaledTime);
+        }
+
+        /// <summary>
+        /// Ramps signal
+        /// </summary>
+        /// <param name="sig"></param>
+        /// <param name="level"></param>
+        /// <param name="time">In ms (not hundredths like Crestron Sig ramp function)</param>
+        /// <summary>
+        /// Ramp method
+        /// </summary>
+        public static void Ramp(Sig sig, ushort level, uint time)
+        {
+            sig.CreateRamp(level, time / 10);
+        }
+    }
+}

src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs

@@ -1,228 +0,0 @@
-using System;
-using System.Text;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Core.Logging;
-using Serilog.Events;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// Represents a ComPortController
-	/// </summary>
-	public class ComPortController : Device, IBasicCommunicationWithStreamDebugging
-	{
-		/// <summary>
-		/// Gets or sets the StreamDebugging
-		/// </summary>
-		public CommunicationStreamDebugging StreamDebugging { get; private set; }
-
-		/// <summary>
-		/// Event fired when bytes are received
-		/// </summary>
-		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-
-		/// <summary>
-		/// Event fired when text is received
-		/// </summary>
-		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
-
-		/// <summary>
-		/// Gets or sets the IsConnected
-		/// </summary>
-		public bool IsConnected { get { return true; } }
-
-		ComPort Port;
-		ComPort.ComPortSpec Spec;
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="key"></param>
-		/// <param name="postActivationFunc"></param>
-		/// <param name="spec"></param>
-		/// <param name="config"></param>
-		public ComPortController(string key, Func<EssentialsControlPropertiesConfig, ComPort> postActivationFunc,
-			ComPort.ComPortSpec spec, EssentialsControlPropertiesConfig config) : base(key)
-		{
-			StreamDebugging = new CommunicationStreamDebugging(key);
-
-			Spec = spec;
-
-			AddPostActivationAction(() =>
-			{
-				Port = postActivationFunc(config);
-
-				RegisterAndConfigureComPort();
-			});
-		}
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="key">Device key</param>
-		/// <param name="port">COM port instance</param>
-		/// <param name="spec">COM port specification</param>
-		public ComPortController(string key, ComPort port, ComPort.ComPortSpec spec)
-			: base(key)
-		{
-			if (port == null)
-			{
-				Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Invalid com port, continuing but comms will not function");
-				return;
-			}
-
-			Port = port;
-			Spec = spec;
-			//IsConnected = new BoolFeedback(CommonBoolCue.IsConnected, () => true);
-
-			RegisterAndConfigureComPort();
-		}
-
-		private void RegisterAndConfigureComPort()
-		{
-			if (Port == null)
-			{
-				this.LogInformation($"Configured {Port.Parent.GetType().Name}-comport-{Port.ID} for {Key} does not exist.");
-				return;
-			}
-
-
-			if (Port.Parent is CrestronControlSystem || Port.Parent is CenIoCom102)
-			{
-				var result = Port.Register();
-				if (result != eDeviceRegistrationUnRegistrationResponse.Success)
-				{
-					this.LogError($"Cannot register {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
-					return;
-				}
-				this.LogInformation($"Successfully registered {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {result})");
-			}
-
-			var specResult = Port.SetComPortSpec(Spec);
-			if (specResult != 0)
-			{
-				this.LogError($"Cannot set comspec for {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {specResult})");
-				return;
-			}
-			this.LogInformation($"Successfully set comspec for {Key} using {Port.Parent.GetType().Name}-comport-{Port.ID} (result == {specResult})");
-
-			Port.SerialDataReceived += Port_SerialDataReceived;
-		}
-
-		/// <summary>
-		/// Destructor
-		/// </summary>
-		~ComPortController()
-		{
-			Port.SerialDataReceived -= Port_SerialDataReceived;
-		}
-
-		void Port_SerialDataReceived(ComPort ReceivingComPort, ComPortSerialDataEventArgs args)
-		{
-			OnDataReceived(args.SerialData);
-		}
-
-		void OnDataReceived(string s)
-		{
-			var eventSubscribed = false;
-
-			var bytesHandler = BytesReceived;
-			if (bytesHandler != null)
-			{
-				var bytes = Encoding.GetEncoding(28591).GetBytes(s);
-				this.PrintReceivedBytes(bytes);
-				bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
-				eventSubscribed = true;
-			}
-			var textHandler = TextReceived;
-			if (textHandler != null)
-			{
-				this.PrintReceivedText(s);
-				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
-				eventSubscribed = true;
-			}
-
-			if (!eventSubscribed) Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
-		}
-
-		/// <summary>
-		/// Deactivate method
-		/// </summary>
-		/// <inheritdoc />
-		public override bool Deactivate()
-		{
-			return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
-		}
-
-		#region IBasicCommunication Members
-
-		/// <summary>
-		/// SendText method
-		/// </summary>
-		public void SendText(string text)
-		{
-			if (Port == null)
-				return;
-
-			this.PrintSentText(text);
-			Port.Send(text);
-		}
-
-		/// <summary>
-		/// SendBytes method
-		/// </summary>
-		public void SendBytes(byte[] bytes)
-		{
-			if (Port == null)
-				return;
-			var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
-			this.PrintSentBytes(bytes);
-
-			Port.Send(text);
-		}
-
-		/// <summary>
-		/// Connect method
-		/// </summary>
-		public void Connect()
-		{
-		}
-
-		/// <summary>
-		/// Disconnect method
-		/// </summary>
-		public void Disconnect()
-		{
-		}
-
-		#endregion
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="s"></param>
-		/// <summary>
-		/// SimulateReceive method
-		/// </summary>
-		public void SimulateReceive(string s)
-		{
-			// split out hex chars and build string
-			var split = Regex.Split(s, @"(\\[Xx][0-9a-fA-F][0-9a-fA-F])");
-			StringBuilder b = new StringBuilder();
-			foreach (var t in split)
-			{
-				if (t.StartsWith(@"\") && t.Length == 4)
-					b.Append((char)(Convert.ToByte(t.Substring(2, 2), 16)));
-				else
-					b.Append(t);
-			}
-
-			OnDataReceived(b.ToString());
-		}
-	}
-}

src/PepperDash.Essentials.Core/Comm and IR/CommBridge.cs

@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Crestron.SimplSharp.CrestronSockets;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Core.Logging;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Devices;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Implements IBasicCommunication and sends all communication through an EISC
-    /// </summary>
-    [Description("Generic communication wrapper class for any IBasicCommunication type")]
-    public class CommBridge : EssentialsBridgeableDevice, IBasicCommunication
-    {
-        private EiscApiAdvanced eisc;
-
-        private IBasicCommunicationJoinMap joinMap;
-
-        /// <summary>
-        /// Event triggered when text is received through the communication bridge.
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
-
-        /// <summary>
-        /// Event triggered when bytes are received through the communication bridge.
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-
-        /// <summary>
-        /// Indicates whether the communication bridge is currently connected.
-        /// </summary>
-        public bool IsConnected { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommBridge"/> class.
-        /// </summary>
-        /// <param name="key">The unique key for the communication bridge.</param>
-        /// <param name="name">The display name for the communication bridge.</param>
-        public CommBridge(string key, string name)
-            : base(key, name)
-        {
-
-        }
-
-        /// <summary>
-        /// Sends a byte array through the communication bridge.
-        /// </summary>
-        /// <param name="bytes">The byte array to send.</param>
-        public void SendBytes(byte[] bytes)
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot send bytes.");
-                return;
-            }
-            eisc.Eisc.SetString(joinMap.SendText.JoinNumber, Encoding.ASCII.GetString(bytes, 0, bytes.Length));
-        }
-
-        /// <summary>
-        /// Sends a text string through the communication bridge.
-        /// </summary>
-        /// <param name="text">The text string to send.</param>
-        public void SendText(string text)
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot send text.");
-                return;
-            }
-            eisc.Eisc.SetString(joinMap.SendText.JoinNumber, text);
-        }
-
-        /// <summary>
-        /// Initiates a connection through the communication bridge.
-        /// </summary>
-        public void Connect()
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot connect.");
-                return;
-            }
-            eisc.Eisc.SetBool(joinMap.Connect.JoinNumber, true);
-        }
-
-        /// <summary>
-        /// Terminates the connection through the communication bridge.
-        /// </summary>
-        public void Disconnect()
-        {
-            if (eisc == null)
-            {
-                this.LogWarning("EISC is null, cannot disconnect.");
-                return;
-            }
-            eisc.Eisc.SetBool(joinMap.Connect.JoinNumber, false);
-        }
-
-        /// <inheritdoc />
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            joinMap = new IBasicCommunicationJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<IBasicCommunicationJoinMap>(joinMapSerialized);
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-            else
-            {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            eisc = bridge;
-
-            trilist.SetBoolSigAction(joinMap.Connected.JoinNumber, (b) => IsConnected = b);
-
-            trilist.SetStringSigAction(joinMap.TextReceived.JoinNumber, (s) =>
-            {
-                TextReceived?.Invoke(this, new GenericCommMethodReceiveTextArgs(s));
-                BytesReceived?.Invoke(this, new GenericCommMethodReceiveBytesArgs(Encoding.ASCII.GetBytes(s)));
-            });
-        }
-    }
-}

src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs

@@ -1,307 +0,0 @@
-
-
-using System;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-using Serilog.Events;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public class CommFactory
-	{
-		/// <summary>
-		/// GetControlPropertiesConfig method
-		/// </summary>
-		/// <param name="deviceConfig">The Device config object</param>
-		/// <returns>EssentialsControlPropertiesConfig object</returns>
-		public static EssentialsControlPropertiesConfig GetControlPropertiesConfig(DeviceConfig deviceConfig)
-		{
-			try
-			{
-				return JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
-					(deviceConfig.Properties["control"].ToString());
-				//Debug.LogMessage(LogEventLevel.Verbose, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
-			}
-			catch (Exception e)
-			{
-
-				Debug.LogMessage(LogEventLevel.Information, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
-				return null;
-			}
-		}
-
-
-		/// <summary>
-		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
-		/// </summary>
-		/// <param name="deviceConfig">The Device config object</param>
-		/// <summary>
-		/// CreateCommForDevice method
-		/// </summary>
-		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
-		{
-			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
-			if (controlConfig == null)
-				return null;
-
-			IBasicCommunication comm = null;
-			try
-			{
-				var c = controlConfig.TcpSshProperties;
-				switch (controlConfig.Method)
-				{
-					case eControlMethod.Com:
-						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams.Value, controlConfig);
-						break;
-					case eControlMethod.ComBridge:
-						comm = new CommBridge(deviceConfig.Key + "-simpl", deviceConfig.Name + " Simpl");
-						break;
-					case eControlMethod.Cec:
-						comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
-						break;
-					case eControlMethod.IR:
-						break;
-					case eControlMethod.Ssh:
-						{
-							var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password)
-							{
-								AutoReconnect = c.AutoReconnect,
-								DisableEcho = c.DisableSshEcho
-							};
-							if (ssh.AutoReconnect)
-								ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							comm = ssh;
-							break;
-						}
-					case eControlMethod.Tcpip:
-						{
-							var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize)
-							{
-								AutoReconnect = c.AutoReconnect
-							};
-							if (tcp.AutoReconnect)
-								tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							comm = tcp;
-							break;
-						}
-					case eControlMethod.Udp:
-						{
-							var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-							comm = udp;
-							break;
-						}
-					case eControlMethod.Telnet:
-						break;
-					case eControlMethod.SecureTcpIp:
-						{
-							var secureTcp = new GenericSecureTcpIpClient(deviceConfig.Key + "-secureTcp", c.Address, c.Port, c.BufferSize)
-							{
-								AutoReconnect = c.AutoReconnect
-							};
-							if (secureTcp.AutoReconnect)
-								secureTcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							comm = secureTcp;
-							break;
-						}
-					default:
-						break;
-				}
-			}
-			catch (Exception e)
-			{
-				Debug.LogMessage(LogEventLevel.Information, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
-					deviceConfig.Properties.ToString(), e);
-			}
-
-			// put it in the device manager if it's the right flavor
-			if (comm is Device comDev)
-				DeviceManager.AddDevice(comDev);
-			return comm;
-		}
-
-		/// <summary>
-		/// GetComPort method
-		/// </summary>
-		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
-		{
-			var comPar = config.ComParams;
-			var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey);
-			if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts)
-				return dev.ComPorts[config.ControlPortNumber.Value];
-			Debug.LogMessage(LogEventLevel.Information, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
-			return null;
-		}
-
-		/// <summary>
-		///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
-		/// </summary>
-		/// <param name="config"></param>
-		/// <returns></returns>
-		/// <summary>
-		/// GetCecPort method
-		/// </summary>
-		public static ICec GetCecPort(ControlPropertiesConfig config)
-		{
-			try
-			{
-				var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
-
-				Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
-					? "is not valid, failed to get cec port"
-					: "found in device manager, attempting to get cec port");
-
-				if (dev == null)
-					return null;
-
-				if (String.IsNullOrEmpty(config.ControlPortName))
-				{
-					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
-					return null;
-				}
-
-
-				var inputsOutputs = dev as IRoutingInputsOutputs;
-				if (inputsOutputs == null)
-				{
-					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not support IRoutingInputsOutputs, failed to get CEC port called '{1}'",
-						config.ControlPortDevKey, config.ControlPortName);
-
-					return null;
-				}
-
-				var inputPort = inputsOutputs.InputPorts[config.ControlPortName];
-				if (inputPort != null && inputPort.Port is ICec)
-					return inputPort.Port as ICec;
-
-
-				var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
-				if (outputPort != null && outputPort.Port is ICec)
-					return outputPort.Port as ICec;
-			}
-			catch (Exception ex)
-			{
-				Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
-				Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
-				if (ex.InnerException != null)
-					Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);
-			}
-
-			Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not have a CEC port called '{1}'",
-					config.ControlPortDevKey, config.ControlPortName);
-
-			return null;
-		}
-
-		/// <summary>
-		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
-		/// return the ControlSystem object from the Global class.
-		/// </summary>
-		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
-		/// <summary>
-		/// GetIComPortsDeviceFromManagedDevice method
-		/// </summary>
-		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
-		{
-			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
-				|| ComPortDevKey.Equals("processor", System.StringComparison.OrdinalIgnoreCase))
-				&& Global.ControlSystem is IComPorts)
-				return Global.ControlSystem;
-			else
-			{
-				var dev = DeviceManager.GetDeviceForKey(ComPortDevKey) as IComPorts;
-				if (dev == null)
-					Debug.LogMessage(LogEventLevel.Information, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
-				return dev;
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents a EssentialsControlPropertiesConfig
-	/// </summary>
-	public class EssentialsControlPropertiesConfig :
-			ControlPropertiesConfig
-	{
-		/// <summary>
-		/// Gets or sets the ComParams
-		/// </summary>
-		[JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
-		[JsonConverter(typeof(ComSpecJsonConverter))]
-		public ComPort.ComPortSpec? ComParams { get; set; }
-
-		/// <summary>
-		/// Gets or sets the CresnetId
-		/// </summary>
-		[JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
-		public string CresnetId { get; set; }
-
-		/// <summary>
-		/// Attempts to provide uint conversion of string CresnetId
-		/// </summary>
-		[JsonIgnore]
-		public uint CresnetIdInt
-		{
-			get
-			{
-				try
-				{
-					return Convert.ToUInt32(CresnetId, 16);
-				}
-				catch (Exception)
-				{
-					throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the InfinetId
-		/// </summary>
-		[JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
-		public string InfinetId { get; set; }
-
-		/// <summary>
-		/// Attepmts to provide uiont conversion of string InifinetId
-		/// </summary>
-		[JsonIgnore]
-		public uint InfinetIdInt
-		{
-			get
-			{
-				try
-				{
-					return Convert.ToUInt32(InfinetId, 16);
-				}
-				catch (Exception)
-				{
-					throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
-				}
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents a IrControlSpec
-	/// </summary>
-	public class IrControlSpec
-	{
-		/// <summary>
-		/// Gets or sets the PortDeviceKey
-		/// </summary>
-		public string PortDeviceKey { get; set; }
-		/// <summary>
-		/// Gets or sets the PortNumber
-		/// </summary>
-		public uint PortNumber { get; set; }
-		/// <summary>
-		/// Gets or sets the File
-		/// </summary>
-		public string File { get; set; }
-	}
-}

src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs

@@ -1,28 +0,0 @@
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public interface IComPortsDevice
-	{
-		/// <summary>
-		/// Gets the Device
-		/// </summary>
-		IComPorts Device { get; }
-	}
-}

src/PepperDash.Essentials.Core/Comm and IR/GenericHttpClient.cs

@@ -1,184 +0,0 @@
-using Crestron.SimplSharp.Net.Http;
-using PepperDash.Core;
-using System;
-
-namespace PepperDash.Essentials.Core
-{
-	
-	/// <summary>
-	/// Represents a GenericHttpClient
-	/// </summary>
-    [Obsolete("Please use the builtin HttpClient class instead: https://learn.microsoft.com/en-us/dotnet/fundamentals/networking/http/httpclient-guidelines")]
-	public class GenericHttpClient : Device, IBasicCommunication
-	{
-		private readonly HttpClient Client;
-
-		/// <summary>
-		/// Event raised when response is received
-		/// </summary>
-		public event EventHandler<GenericHttpClientEventArgs> ResponseRecived;
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="key">key of the device</param>
-		/// <param name="name">name of the device</param>
-		/// <param name="hostname">hostname for the HTTP client</param>
-		public GenericHttpClient(string key, string name, string hostname)
-			: base(key, name)
-		{
-            Client = new HttpClient
-            {
-                HostName = hostname
-            };
-
-
-        }
-
-		/// <summary>
-		/// SendText method
-		/// </summary>
-		/// <param name="path">the path to send the request to</param>
-		public void SendText(string path)
-		{
-			HttpClientRequest request = new HttpClientRequest();
-			string url = string.Format("http://{0}/{1}", Client.HostName, path);
-			request.Url = new UrlParser(url);
-			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request); 
-		}
-
-		/// <summary>
-		/// SendText method
-		/// </summary>
-		/// <param name="format">format for the items</param>
-		/// <param name="items">items to format</param>
-		public void SendText(string format, params object[] items)
-		{
-			HttpClientRequest request = new HttpClientRequest();
-			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
-			request.Url = new UrlParser(url);
-			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request);
-		}
-
-		/// <summary>
-		/// SendTextNoResponse method
-		/// </summary>
-		/// <param name="format">format for the items</param>
-		/// <param name="items">items to format</param>
-		public void SendTextNoResponse(string format, params object[] items)
-		{
-			HttpClientRequest request = new HttpClientRequest();
-			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
-			request.Url = new UrlParser(url);
-			Client.Dispatch(request);
-		}
-
-		/// <summary>
-		/// Response method
-		/// </summary>
-		/// <param name="response">response received from the HTTP client</param>
-		/// <param name="error">error status of the HTTP callback</param>
-		/// <param name="request">original HTTP client request</param>
-		private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request)
-		{
-			if (error == HTTP_CALLBACK_ERROR.COMPLETED)
-			{
-				var responseReceived = response;
-
-				if (responseReceived.ContentString.Length > 0)
-				{
-                    ResponseRecived?.Invoke(this, new GenericHttpClientEventArgs(responseReceived.ContentString, (request as HttpClientRequest).Url.ToString(), error));
-                }
-			}
-
-		}
-
-
-		#region IBasicCommunication Members
-
-		/// <summary>
-		/// SendBytes method
-		/// </summary>
-		/// <param name="bytes">bytes to send</param>
-		public void SendBytes(byte[] bytes)
-		{
-			throw new NotImplementedException();
-		}
-
-
-
-		#endregion
-
-		#region ICommunicationReceiver Members
-
-		/// <summary>
-		/// BytesReceived event
-		/// </summary>
-		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-
-		/// <summary>
-		/// Connect method
-		/// </summary>
-		public void Connect()
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <summary>
-		/// Disconnect method
-		/// </summary>
-		public void Disconnect()
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <summary>
-		/// IsConnected property
-		/// </summary>
-		public bool IsConnected
-		{
-			get { return true; }
-		}
-
-		/// <summary>
-		/// TextReceived event
-		/// </summary>
-		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
-
-		#endregion
-	}
-
-	/// <summary>
-	/// Represents a GenericHttpClientEventArgs
-	/// </summary>
-	public class GenericHttpClientEventArgs : EventArgs
-	{
-		/// <summary>
-		/// Gets or sets the ResponseText
-		/// </summary>
-		public string ResponseText { get; private set; }
-
-		/// <summary>
-		/// Gets or sets the RequestPath
-		/// </summary>
-		public string RequestPath { get; private set; }
-
-		/// <summary>
-		/// Gets or sets the Error
-		/// </summary>
-		public HTTP_CALLBACK_ERROR Error { get; set; }
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="response">response text</param>
-		/// <param name="request">request path</param>
-		/// <param name="error">error status</param>
-		public GenericHttpClientEventArgs(string response, string request, HTTP_CALLBACK_ERROR error)
-		{
-			ResponseText = response;
-			RequestPath = request;
-			Error = error;
-		}
-	}
-}

src/PepperDash.Essentials.Core/Communications/CecPortController.cs

@@ -1,35 +1,22 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DM;
-
-using PepperDash.Core;
 using Serilog.Events;
 
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core.Communications
 {
-    /// <summary>
-    /// Represents a CecPortController
-    /// </summary>
-    public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
+ /// <summary>
+ /// Represents a CecPortController
+ /// </summary>
+	public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
     {
-        /// <summary>
-        /// Gets or sets the StreamDebugging
-        /// </summary>
-        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+  /// <summary>
+  /// Gets or sets the StreamDebugging
+  /// </summary>
+		public CommunicationStreamDebugging StreamDebugging { get; private set; }
 
-        /// <summary>
-        /// Event raised when bytes are received
-        /// </summary>
         public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-
-        /// <summary>
-        /// Event raised when text is received
-        /// </summary>
         public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
         /// <summary>
@@ -39,30 +26,19 @@ namespace PepperDash.Essentials.Core
 
         ICec Port;
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key">key of the device</param>
-        /// <param name="postActivationFunc">post activation function for the device</param>
-        /// <param name="config">configuration for the device</param>
         public CecPortController(string key, Func<EssentialsControlPropertiesConfig, ICec> postActivationFunc,
-            EssentialsControlPropertiesConfig config) : base(key)
+            EssentialsControlPropertiesConfig config):base(key)
         {
-            StreamDebugging = new CommunicationStreamDebugging(key);
+			StreamDebugging = new CommunicationStreamDebugging(key);
 
             AddPostActivationAction(() =>
             {
                 Port = postActivationFunc(config);
 
                 Port.StreamCec.CecChange += StreamCec_CecChange;
-            });
+            });            
         }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key">key of the device</param>
-        /// <param name="port">CEC port</param>
         public CecPortController(string key, ICec port)
             : base(key)
         {
@@ -76,25 +52,27 @@ namespace PepperDash.Essentials.Core
             if (args.EventId == CecEventIds.CecMessageReceivedEventId)
                 OnDataReceived(cecDevice.Received.StringValue);
             else if (args.EventId == CecEventIds.ErrorFeedbackEventId)
-                if (cecDevice.ErrorFeedback.BoolValue)
+                if(cecDevice.ErrorFeedback.BoolValue)
                     Debug.LogMessage(LogEventLevel.Verbose, this, "CEC NAK Error");
         }
 
         void OnDataReceived(string s)
         {
-            var bytesHandler = BytesReceived;
+			var bytesHandler = BytesReceived;
             if (bytesHandler != null)
             {
                 var bytes = Encoding.GetEncoding(28591).GetBytes(s);
-                this.PrintReceivedBytes(bytes);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
             var textHandler = TextReceived;
-            if (textHandler != null)
-            {
-                this.PrintReceivedText(s);
-                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
-            }
+			if (textHandler != null)
+			{
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
+				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+			}
         }
 
         #region IBasicCommunication Members
@@ -106,7 +84,8 @@ namespace PepperDash.Essentials.Core
         {
             if (Port == null)
                 return;
-            this.PrintSentText(text);
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} characters of text: '{1}'", text.Length, text);
             Port.StreamCec.Send.StringValue = text;
         }
 
@@ -118,8 +97,8 @@ namespace PepperDash.Essentials.Core
             if (Port == null)
                 return;
             var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
-            this.PrintSentBytes(bytes);
-            Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
             Port.StreamCec.Send.StringValue = text;
         }
 
@@ -154,7 +133,7 @@ namespace PepperDash.Essentials.Core
             foreach (var t in split)
             {
                 if (t.StartsWith(@"\") && t.Length == 4)
-                    b.Append((char)(Convert.ToByte(t.Substring(2, 2), 16)));
+                    b.Append((char)Convert.ToByte(t.Substring(2, 2), 16));
                 else
                     b.Append(t);
             }

src/PepperDash.Essentials.Core/Communications/ComPortController.cs

@@ -0,0 +1,200 @@
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharpPro;
+using Serilog.Events;
+
+
+namespace PepperDash.Essentials.Core.Communications
+{
+ /// <summary>
+ /// Represents a ComPortController
+ /// </summary>
+	public class ComPortController : Device, IBasicCommunicationWithStreamDebugging
+	{
+        /// <summary>
+        /// Gets or sets the StreamDebugging
+        /// </summary>
+        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+
+		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+  /// <summary>
+  /// Gets or sets the IsConnected
+  /// </summary>
+		public bool IsConnected { get { return true; } }
+
+		ComPort Port;
+		ComPort.ComPortSpec Spec;
+
+	    public ComPortController(string key, Func<EssentialsControlPropertiesConfig, ComPort> postActivationFunc,
+	        ComPort.ComPortSpec spec, EssentialsControlPropertiesConfig config) : base(key)
+	    {
+            StreamDebugging = new CommunicationStreamDebugging(key);
+
+	        Spec = spec;
+
+            AddPostActivationAction(() =>
+            {
+                Port = postActivationFunc(config);
+
+                RegisterAndConfigureComPort();
+            });
+	    }
+
+		public ComPortController(string key, ComPort port, ComPort.ComPortSpec spec)
+			: base(key)
+		{
+			if (port == null)
+			{
+				Debug.LogMessage(LogEventLevel.Information, this,  "ERROR: Invalid com port, continuing but comms will not function");
+				return;
+			}
+
+			Port = port;
+			Spec = spec;
+			//IsConnected = new BoolFeedback(CommonBoolCue.IsConnected, () => true);
+
+			RegisterAndConfigureComPort();
+		}
+
+	    private void RegisterAndConfigureComPort()
+	    {
+	        if (Port == null)
+	        {
+	            Debug.LogMessage(LogEventLevel.Information, this, "Configured com Port for this device does not exist.");
+	            return;
+	        }
+            if (Port.Parent is CrestronControlSystem)
+            {
+                var result = Port.Register();
+                if (result != eDeviceRegistrationUnRegistrationResponse.Success)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Cannot register Com port: {0}", result);
+                    return; // false
+                }
+            }
+
+	        var specResult = Port.SetComPortSpec(Spec);
+	        if (specResult != 0)
+	        {
+	            Debug.LogMessage(LogEventLevel.Information, this, "WARNING: Cannot set comspec");
+	            return;
+	        }
+	        Port.SerialDataReceived += Port_SerialDataReceived;
+	    }
+
+	    ~ComPortController()
+		{
+			Port.SerialDataReceived -= Port_SerialDataReceived;
+		}
+
+		void Port_SerialDataReceived(ComPort ReceivingComPort, ComPortSerialDataEventArgs args)
+		{
+            OnDataReceived(args.SerialData);
+		}
+
+        void OnDataReceived(string s)
+        {
+			var eventSubscribed = false;
+
+            var bytesHandler = BytesReceived;
+            if (bytesHandler != null)
+            {
+                var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
+                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+				eventSubscribed = true;
+            }
+            var textHandler = TextReceived;
+            if (textHandler != null)
+            {
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
+                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+				eventSubscribed = true;
+            }
+
+			if(!eventSubscribed) Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
+        }
+
+  /// <summary>
+  /// Deactivate method
+  /// </summary>
+  /// <inheritdoc />
+		public override bool Deactivate()
+		{
+			return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
+		}
+
+		#region IBasicCommunication Members
+
+  /// <summary>
+  /// SendText method
+  /// </summary>
+		public void SendText(string text)
+		{
+			if (Port == null)
+				return;
+
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} characters of text: '{1}'", text.Length, text);
+            Port.Send(text);
+		}
+
+  /// <summary>
+  /// SendBytes method
+  /// </summary>
+		public void SendBytes(byte[] bytes)
+		{
+			if (Port == null)
+				return;
+			var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+
+			Port.Send(text);
+		}
+
+  /// <summary>
+  /// Connect method
+  /// </summary>
+		public void Connect()
+		{		
+		}
+
+  /// <summary>
+  /// Disconnect method
+  /// </summary>
+		public void Disconnect()
+		{
+		}
+
+		#endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="s"></param>
+        /// <summary>
+        /// SimulateReceive method
+        /// </summary>
+        public void SimulateReceive(string s)
+        {
+            // split out hex chars and build string
+            var split = Regex.Split(s, @"(\\[Xx][0-9a-fA-F][0-9a-fA-F])");
+            var b = new StringBuilder();
+            foreach (var t in split)
+            {
+                if (t.StartsWith(@"\") && t.Length == 4)
+                    b.Append((char)Convert.ToByte(t.Substring(2, 2), 16));
+                else
+                    b.Append(t);
+            }
+
+            OnDataReceived(b.ToString());
+        }
+	}
+}

src/PepperDash.Essentials.Core/Communications/ComSpecJsonConverter.cs

@@ -1,19 +1,12 @@
 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
 
 
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core.Communications
 {
     /// <summary>
     /// This converter creates a proper ComPort.ComPortSpec struct from more-friendly JSON values.  It uses
@@ -21,14 +14,6 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public class ComSpecJsonConverter : JsonConverter
     {
-        /// <summary>
-        /// ReadJson method
-        /// </summary>
-        /// <param name="reader">reader to use</param>
-        /// <param name="objectType">type of the object being read</param>
-        /// <param name="existingValue">existing value of the object being read</param>
-        /// <param name="serializer">serializer to use</param>
-        /// <returns>deserialized object</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
             if (objectType == typeof(ComPort.ComPortSpec?))
@@ -50,9 +35,6 @@ namespace PepperDash.Essentials.Core
             return objectType == typeof(ComPort.ComPortSpec?);
         }
 
-        /// <summary>
-        /// Gets or sets the CanRead
-        /// </summary>
         public override bool CanRead { get { return true; } }
 
         /// <summary>

src/PepperDash.Essentials.Core/Communications/ComTextHelper.cs

@@ -0,0 +1,49 @@
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class ComTextHelper
+	{
+        /// <summary>
+        /// Gets escaped text for a byte array
+        /// </summary>
+        /// <param name="bytes"></param>
+        /// <returns></returns>
+		public static string GetEscapedText(byte[] bytes)
+		{
+			return string.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
+		}
+
+        /// <summary>
+        /// Gets escaped text for a string
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+  /// <summary>
+  /// GetEscapedText method
+  /// </summary>
+		public static string GetEscapedText(string text)
+		{
+			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+			return string.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
+		}
+
+        /// <summary>
+        /// Gets debug text for a string
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        /// <summary>
+        /// GetDebugText method
+        /// </summary>
+        public static string GetDebugText(string text)
+        {
+            return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
+        }
+	}
+}

src/PepperDash.Essentials.Core/Communications/CommFactory.cs

@@ -0,0 +1,289 @@
+
+
+using System;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Routing;
+using Serilog.Events;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class CommFactory
+	{
+		public static EssentialsControlPropertiesConfig GetControlPropertiesConfig(DeviceConfig deviceConfig)
+		{
+			try
+			{
+				return JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
+					(deviceConfig.Properties["control"].ToString());
+				//Debug.LogMessage(LogEventLevel.Verbose, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
+			}
+			catch (Exception e)
+			{
+
+				Debug.LogMessage(LogEventLevel.Information, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
+				return null;
+			}
+		}
+
+
+		/// <summary>
+		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
+		/// </summary>
+		/// <param name="deviceConfig">The Device config object</param>
+  /// <summary>
+  /// CreateCommForDevice method
+  /// </summary>
+		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
+		{
+			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
+			if (controlConfig == null)
+				return null;
+
+			IBasicCommunication comm = null;
+			try
+			{
+				var c = controlConfig.TcpSshProperties;
+				switch (controlConfig.Method)
+				{
+					case eControlMethod.Com:
+						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams.Value, controlConfig);
+						break;
+                    case eControlMethod.Cec:
+                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
+                        break;
+					case eControlMethod.IR:
+						break;
+                    case eControlMethod.Ssh:
+                        {
+                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
+                            ssh.AutoReconnect = c.AutoReconnect;
+                            if(ssh.AutoReconnect)
+                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = ssh;
+                            break;
+                        }
+                    case eControlMethod.Tcpip:
+                        {
+                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
+                            tcp.AutoReconnect = c.AutoReconnect;
+                            if (tcp.AutoReconnect)
+                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = tcp;
+                            break;
+                        }
+                    case eControlMethod.Udp:
+                        {
+                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
+                            comm = udp;
+                            break;
+                        }
+					case eControlMethod.Telnet:
+						break;
+					case eControlMethod.SecureTcpIp:
+						{
+							var secureTcp = new GenericSecureTcpIpClient(deviceConfig.Key + "-secureTcp", c.Address, c.Port, c.BufferSize);
+							secureTcp.AutoReconnect = c.AutoReconnect;
+							if (secureTcp.AutoReconnect)
+								secureTcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+							comm = secureTcp;
+							break;
+						}
+					default:
+						break;
+				}				
+			}
+			catch (Exception e)
+			{
+				Debug.LogMessage(LogEventLevel.Information, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
+					deviceConfig.Properties.ToString(), e);
+			}
+
+			// put it in the device manager if it's the right flavor
+			var comDev = comm as Device;
+			if (comDev != null)
+				DeviceManager.AddDevice(comDev);
+			return comm;
+		}
+
+  /// <summary>
+  /// GetComPort method
+  /// </summary>
+		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
+		{
+			var comPar = config.ComParams;
+			var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey);
+			if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts)
+				return dev.ComPorts[config.ControlPortNumber.Value];
+			Debug.LogMessage(LogEventLevel.Information, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
+			return null;
+		}
+
+        /// <summary>
+        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
+        /// </summary>
+        /// <param name="config"></param>
+        /// <returns></returns>
+        /// <summary>
+        /// GetCecPort method
+        /// </summary>
+        public static ICec GetCecPort(ControlPropertiesConfig config)
+        {
+	        try
+	        {
+		        var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
+
+		        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
+			        ? "is not valid, failed to get cec port"
+			        : "found in device manager, attempting to get cec port");
+
+		        if (dev == null)
+			        return null;
+
+		        if (string.IsNullOrEmpty(config.ControlPortName))
+		        {
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+			        return null;
+		        }
+
+
+		        var inputsOutputs = dev as IRoutingInputsOutputs;
+		        if (inputsOutputs == null)
+		        {
+					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not support IRoutingInputsOutputs, failed to get CEC port called '{1}'",
+						config.ControlPortDevKey, config.ControlPortName);
+
+			        return null;
+		        }
+
+				var inputPort = inputsOutputs.InputPorts[config.ControlPortName];
+		        if (inputPort != null && inputPort.Port is ICec)
+					return inputPort.Port as ICec;
+		        
+
+		        var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
+		        if (outputPort != null && outputPort.Port is ICec)
+					return outputPort.Port as ICec;		        
+	        }
+	        catch (Exception ex)
+	        {
+		        Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
+		        Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
+		        if (ex.InnerException != null)
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);				
+	        }
+
+			Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not have a CEC port called '{1}'",
+					config.ControlPortDevKey, config.ControlPortName);
+
+			return null;
+        }
+
+		/// <summary>
+		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
+		/// return the ControlSystem object from the Global class.
+		/// </summary>
+		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
+  /// <summary>
+  /// GetIComPortsDeviceFromManagedDevice method
+  /// </summary>
+		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
+		{
+			if ((ComPortDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
+				|| ComPortDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
+				&& Global.ControlSystem is IComPorts)
+				return Global.ControlSystem;
+			else
+			{
+				var dev = DeviceManager.GetDeviceForKey(ComPortDevKey) as IComPorts;
+				if (dev == null)
+					Debug.LogMessage(LogEventLevel.Information, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
+				return dev;
+			}
+		}
+	}
+
+    /// <summary>
+    /// Represents a EssentialsControlPropertiesConfig
+    /// </summary>
+    public class EssentialsControlPropertiesConfig :
+        ControlPropertiesConfig
+    {
+
+        [JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ComSpecJsonConverter))]
+        public ComPort.ComPortSpec? ComParams { get; set; }
+
+        [JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
+        public string CresnetId { get; set; }
+
+        /// <summary>
+        /// Attempts to provide uint conversion of string CresnetId
+        /// </summary>
+        [JsonIgnore]
+        public uint CresnetIdInt
+        {
+            get
+            {
+                try
+                {
+                    return Convert.ToUInt32(CresnetId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
+                }
+            }
+        }
+
+        [JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
+        /// <summary>
+        /// Gets or sets the InfinetId
+        /// </summary>
+        public string InfinetId { get; set; }
+
+        /// <summary>
+        /// Attepmts to provide uiont conversion of string InifinetId
+        /// </summary>
+        [JsonIgnore]
+        public uint InfinetIdInt
+        {
+            get
+            {
+                try
+                {
+                    return Convert.ToUInt32(InfinetId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Represents a IrControlSpec
+    /// </summary>
+    public class IrControlSpec
+    {
+        /// <summary>
+        /// Gets or sets the PortDeviceKey
+        /// </summary>
+        public string PortDeviceKey { get; set; }
+        /// <summary>
+        /// Gets or sets the PortNumber
+        /// </summary>
+        public uint PortNumber { get; set; }
+        /// <summary>
+        /// Gets or sets the File
+        /// </summary>
+        public string File { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/Communications/CommunicationExtras.cs

@@ -0,0 +1,91 @@
+using System;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum eGenericCommMethodStatusChangeType
+	{
+        /// <summary>
+        /// Connected
+        /// </summary>
+		Connected,
+        /// <summary>
+        /// Disconnected
+        /// </summary>
+        Disconnected
+	}
+
+	/// <summary>
+	/// This delegate defines handler for IBasicCommunication status changes
+	/// </summary>
+	/// <param name="comm">Device firing the status change</param>
+	/// <param name="status"></param>
+	public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class GenericCommMethodReceiveBytesArgs : EventArgs
+	{
+  /// <summary>
+  /// Gets or sets the Bytes
+  /// </summary>
+		public byte[] Bytes { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="bytes"></param>
+		public GenericCommMethodReceiveBytesArgs(byte[] bytes)
+		{
+			Bytes = bytes;
+		}
+
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericCommMethodReceiveBytesArgs() { }
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class GenericCommMethodReceiveTextArgs : EventArgs
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public string Text { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Delimiter { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="text"></param>
+		public GenericCommMethodReceiveTextArgs(string text)
+		{
+			Text = text;
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="delimiter"></param>
+        public GenericCommMethodReceiveTextArgs(string text, string delimiter)
+            :this(text)
+        {
+            Delimiter = delimiter;
+        }
+
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericCommMethodReceiveTextArgs() { }
+	}
+}

src/PepperDash.Essentials.Core/Communications/CommunicationGather.cs

@@ -0,0 +1,173 @@
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+
+
+namespace PepperDash.Essentials.Core.Communications
+{
+	/// <summary>
+	/// Defines the string event handler for line events on the gather
+	/// </summary>
+	/// <param name="text"></param>
+	public delegate void LineReceivedHandler(string text);
+
+	/// <summary>
+	/// Attaches to IBasicCommunication as a text gather
+	/// </summary>
+	public class CommunicationGather
+	{
+		/// <summary>
+		/// Event that fires when a line is received from the IBasicCommunication source.
+		/// The event merely contains the text, not an EventArgs type class.
+		/// </summary>
+		public event EventHandler<GenericCommMethodReceiveTextArgs> LineReceived;
+
+		/// <summary>
+		/// The communication port that this gathers on
+		/// </summary>
+        public ICommunicationReceiver Port { get; private set; }
+
+		/// <summary>
+		/// Default false. If true, the delimiter will be included in the line output
+		/// events
+		/// </summary>
+		public bool IncludeDelimiter { get; set; }
+
+		/// <summary>
+		///	For receive buffer
+		/// </summary>
+		StringBuilder ReceiveBuffer = new StringBuilder();
+
+		/// <summary>
+		/// Delimiter, like it says!
+		/// </summary>
+		char Delimiter;
+
+		string[] StringDelimiters;
+
+		/// <summary>
+		/// Constructor for using a char delimiter
+		/// </summary>
+		/// <param name="port"></param>
+		/// <param name="delimiter"></param>
+		public CommunicationGather(ICommunicationReceiver port, char delimiter)
+		{
+			Port = port;
+			Delimiter = delimiter;
+			port.TextReceived += new EventHandler<GenericCommMethodReceiveTextArgs>(Port_TextReceived);
+		}
+
+		/// <summary>
+		/// Constructor for using a single string delimiter
+		/// </summary>
+		/// <param name="port"></param>
+		/// <param name="delimiter"></param>
+        public CommunicationGather(ICommunicationReceiver port, string delimiter)
+            :this(port, new string[] { delimiter} )
+		{
+		}
+
+        /// <summary>
+        /// Constructor for using an array of string delimiters
+        /// </summary>
+        /// <param name="port"></param>
+        /// <param name="delimiters"></param>
+        public CommunicationGather(ICommunicationReceiver port, string[] delimiters)
+        {
+            Port = port;
+            StringDelimiters = delimiters;
+            port.TextReceived += Port_TextReceivedStringDelimiter;
+        }
+
+  /// <summary>
+  /// Stop method
+  /// </summary>
+		public void Stop()
+		{
+			Port.TextReceived -= Port_TextReceived;
+			Port.TextReceived -= Port_TextReceivedStringDelimiter;
+		}
+
+		/// <summary>
+		/// Handler for raw data coming from port 
+		/// </summary>
+		void Port_TextReceived(object sender, GenericCommMethodReceiveTextArgs args)
+		{
+			var handler = LineReceived;
+			if (handler != null)
+			{
+				ReceiveBuffer.Append(args.Text);
+				var str = ReceiveBuffer.ToString();
+				var lines = str.Split(Delimiter);
+				if (lines.Length > 0)
+				{
+					for (int i = 0; i < lines.Length - 1; i++)
+					{
+						string strToSend = null;
+						if (IncludeDelimiter)
+							strToSend = lines[i] + Delimiter;
+						else
+							strToSend = lines[i];
+						handler(this, new GenericCommMethodReceiveTextArgs(strToSend));
+					}
+					ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="args"></param>
+		void Port_TextReceivedStringDelimiter(object sender, GenericCommMethodReceiveTextArgs args)
+		{
+			var handler = LineReceived;
+			if (handler != null)
+			{
+				// Receive buffer should either be empty or not contain the delimiter
+				// If the line does not have a delimiter, append the 
+				ReceiveBuffer.Append(args.Text);
+				var str = ReceiveBuffer.ToString();
+
+                // Case: Receiving DEVICE get version\x0d\0x0a+OK "value":"1234"\x0d\x0a
+
+                // RX: DEV
+                //  Split: (1) "DEV"
+                // RX: I
+                //  Split: (1) "DEVI"
+                // RX: CE get version
+                //  Split: (1) "DEVICE get version"
+                // RX: \x0d\x0a+OK "value":"1234"\x0d\x0a
+                //  Split: (2) DEVICE get version, +OK "value":"1234"
+
+                // Iterate the delimiters and fire an event for any matching delimiter
+                foreach (var delimiter in StringDelimiters)
+                {
+                    var lines = Regex.Split(str, delimiter);
+                    if (lines.Length == 1)
+                        continue;
+                  
+                    for (int i = 0; i < lines.Length - 1; i++)
+                    {
+                        string strToSend = null;
+                        if (IncludeDelimiter)
+                            strToSend = lines[i] + delimiter;
+                        else
+                            strToSend = lines[i];
+                        handler(this, new GenericCommMethodReceiveTextArgs(strToSend, delimiter));
+                    }
+                    ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]);          
+                }
+			}
+		}
+
+		/// <summary>
+		/// Deconstructor.  Disconnects from port TextReceived events.
+		/// </summary>
+		~CommunicationGather()
+		{
+			Stop();
+		}
+	}
+}

src/PepperDash.Essentials.Core/Communications/CommunicationStreamDebugging.cs

@@ -0,0 +1,182 @@
+using System;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Controls the ability to disable/enable debugging of TX/RX data sent to/from a device with a built in timer to disable
+    /// </summary>
+    public class CommunicationStreamDebugging
+    {
+        /// <summary>
+        /// Device Key that this instance configures
+        /// </summary>
+        public string ParentDeviceKey { get; private set; }
+
+        /// <summary>
+        /// Timer to disable automatically if not manually disabled
+        /// </summary>
+        private CTimer DebugExpiryPeriod;
+
+        /// <summary>
+        /// Gets or sets the DebugSetting
+        /// </summary>
+        public eStreamDebuggingSetting DebugSetting { get; private set; }
+
+        private uint _DebugTimeoutInMs;
+        private const uint _DefaultDebugTimeoutMin = 30;
+
+        /// <summary>
+        /// Timeout in Minutes
+        /// </summary>
+        public uint DebugTimeoutMinutes
+        {
+            get
+            {
+                return _DebugTimeoutInMs/60000;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the RxStreamDebuggingIsEnabled
+        /// </summary>
+        public bool RxStreamDebuggingIsEnabled{ get; private set; }
+
+        /// <summary>
+        /// Indicates that transmit stream debugging is enabled
+        /// </summary>
+        public bool TxStreamDebuggingIsEnabled { get; private set; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="parentDeviceKey"></param>
+        public CommunicationStreamDebugging(string parentDeviceKey)
+        {
+            ParentDeviceKey = parentDeviceKey;
+        }
+
+
+        /// <summary>
+        /// Sets the debugging setting and if not setting to off, assumes the default of 30 mintues
+        /// </summary>
+        /// <param name="setting"></param>
+        /// <summary>
+        /// SetDebuggingWithDefaultTimeout method
+        /// </summary>
+        public void SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting setting)
+        {
+            if (setting == eStreamDebuggingSetting.Off)
+            {
+                DisableDebugging();
+                return;
+            }
+
+            SetDebuggingWithSpecificTimeout(setting, _DefaultDebugTimeoutMin);
+        }
+
+        /// <summary>
+        /// Sets the debugging setting for the specified number of minutes
+        /// </summary>
+        /// <param name="setting"></param>
+        /// <param name="minutes"></param>
+        /// <summary>
+        /// SetDebuggingWithSpecificTimeout method
+        /// </summary>
+        public void SetDebuggingWithSpecificTimeout(eStreamDebuggingSetting setting, uint minutes)
+        {
+            if (setting == eStreamDebuggingSetting.Off)
+            {
+                DisableDebugging();
+                return;
+            }
+
+            _DebugTimeoutInMs = minutes * 60000;
+
+            StopDebugTimer();
+
+            DebugExpiryPeriod = new CTimer((o) => DisableDebugging(), _DebugTimeoutInMs);
+
+            if ((setting & eStreamDebuggingSetting.Rx) == eStreamDebuggingSetting.Rx)
+                RxStreamDebuggingIsEnabled = true;
+
+            if ((setting & eStreamDebuggingSetting.Tx) == eStreamDebuggingSetting.Tx)
+                TxStreamDebuggingIsEnabled = true;
+
+            Debug.SetDeviceDebugSettings(ParentDeviceKey, setting);
+        
+        }
+
+        /// <summary>
+        /// Disabled debugging
+        /// </summary>
+        private void DisableDebugging()
+        {
+            StopDebugTimer();
+
+            Debug.SetDeviceDebugSettings(ParentDeviceKey, eStreamDebuggingSetting.Off);
+        }
+
+        private void StopDebugTimer()
+        {
+            RxStreamDebuggingIsEnabled = false;
+            TxStreamDebuggingIsEnabled = false;
+
+            if (DebugExpiryPeriod == null)
+            {
+                return;
+            }
+
+            DebugExpiryPeriod.Stop();
+            DebugExpiryPeriod.Dispose();
+            DebugExpiryPeriod = null;
+        }
+    }
+
+    /// <summary>
+    /// The available settings for stream debugging
+    /// </summary>
+    [Flags]
+    /// <summary>
+    /// Enumeration of eStreamDebuggingSetting values
+    /// </summary>
+    public enum eStreamDebuggingSetting
+    {
+        /// <summary>
+        /// Debug off
+        /// </summary>
+        Off = 0,
+        /// <summary>
+        /// Debug received data
+        /// </summary>
+        Rx = 1, 
+        /// <summary>
+        /// Debug transmitted data
+        /// </summary>
+        Tx = 2,
+        /// <summary>
+        /// Debug both received and transmitted data
+        /// </summary>
+        Both = Rx | Tx
+    }
+
+    /// <summary>
+    /// The available settings for stream debugging response types
+    /// </summary>
+    [Flags]
+    public enum eStreamDebuggingDataTypeSettings
+    {
+        /// <summary>
+        /// Debug data in byte format
+        /// </summary>
+        Bytes = 0,
+        /// <summary>
+        /// Debug data in text format
+        /// </summary>
+        Text = 1,
+        /// <summary>
+        /// Debug data in both byte and text formats
+        /// </summary>
+        Both = Bytes | Text,
+    }
+}

src/PepperDash.Essentials.Core/Communications/ConsoleCommMockDevice.cs

@@ -1,15 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using Crestron.SimplSharp;
-
-using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Monitoring;
 using Serilog.Events;
 
 
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core.Communications
 {
  /// <summary>
  /// Represents a ConsoleCommMockDevice
@@ -39,13 +36,6 @@ namespace PepperDash.Essentials.Core
   /// </summary>
 		public bool ShowHexResponse { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the ConsoleCommMockDevice class.
-        /// </summary>
-        /// <param name="key">The key of the device.</param>
-        /// <param name="name">The name of the device.</param>
-        /// <param name="props">The properties configuration for the device.</param>
-        /// <param name="comm">The communication method for the device.</param>
 		public ConsoleCommMockDevice(string key, string name, ConsoleCommMockDevicePropertiesConfig props, IBasicCommunication comm)
 			:base(key, name)
 		{
@@ -79,24 +69,20 @@ namespace PepperDash.Essentials.Core
 		}
 	}
 
-    /// <summary>
-    /// Represents a ConsoleCommMockDevicePropertiesConfig
-    /// </summary>
+ /// <summary>
+ /// Represents a ConsoleCommMockDevicePropertiesConfig
+ /// </summary>
 	public class ConsoleCommMockDevicePropertiesConfig
 	{
-        /// <summary>
-        /// Gets or sets the LineEnding
-        /// </summary>
+  /// <summary>
+  /// Gets or sets the LineEnding
+  /// </summary>
 		public string LineEnding { get; set; }
-
-        /// <summary>
-        /// Gets or sets the CommunicationMonitorProperties
-        /// </summary>
+  /// <summary>
+  /// Gets or sets the CommunicationMonitorProperties
+  /// </summary>
 		public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the ConsoleCommMockDevicePropertiesConfig class.
-        /// </summary>
 		public ConsoleCommMockDevicePropertiesConfig()
 		{
 			LineEnding = "\x0a";
@@ -108,9 +94,6 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public class ConsoleCommMockDeviceFactory : EssentialsDeviceFactory<ConsoleCommMockDevice>
     {
-        /// <summary>
-        /// Initializes a new instance of the ConsoleCommMockDeviceFactory class.
-        /// </summary>
         public ConsoleCommMockDeviceFactory()
         {
             TypeNames = new List<string>() { "commmock" };

src/PepperDash.Essentials.Core/Communications/ControlPropertiesConfig.cs

@@ -0,0 +1,92 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Represents a ControlPropertiesConfig
+    /// </summary>
+    public class ControlPropertiesConfig
+    {
+        /// <summary>
+        /// The method of control
+        /// </summary>
+        [JsonProperty("method")]
+        [JsonConverter(typeof(StringEnumConverter))]
+        public eControlMethod Method { get; set; }
+
+        /// <summary>
+        /// The key of the device that contains the control port
+        /// </summary>
+        [JsonProperty("controlPortDevKey", NullValueHandling = NullValueHandling.Ignore)]
+        public string ControlPortDevKey { get; set; }
+
+        /// <summary>
+        /// The number of the control port on the device specified by ControlPortDevKey
+        /// </summary>
+        [JsonProperty("controlPortNumber", NullValueHandling = NullValueHandling.Ignore)] // In case "null" is present in config on this value
+        public uint? ControlPortNumber { get; set; }
+
+        /// <summary>
+        /// The name of the control port on the device specified by ControlPortDevKey
+        /// </summary>
+        [JsonProperty("controlPortName", NullValueHandling = NullValueHandling.Ignore)] // In case "null" is present in config on this value
+        public string ControlPortName { get; set; }
+
+        /// <summary>
+        /// Properties for ethernet based communications
+        /// </summary>
+        [JsonProperty("tcpSshProperties", NullValueHandling = NullValueHandling.Ignore)]
+        public TcpSshPropertiesConfig TcpSshProperties { get; set; }
+
+        /// <summary>
+        /// The filename and path for the IR file
+        /// </summary>
+        [JsonProperty("irFile", NullValueHandling = NullValueHandling.Ignore)]
+        public string IrFile { get; set; }
+
+        /// <summary>
+        /// The IpId of a Crestron device
+        /// </summary>
+        [JsonProperty("ipId", NullValueHandling = NullValueHandling.Ignore)]
+        public string IpId { get; set; }
+
+        /// <summary>
+        /// Readonly uint representation of the IpId
+        /// </summary>
+        [JsonIgnore]
+        public uint IpIdInt { get { return Convert.ToUInt32(IpId, 16); } }
+
+        /// <summary>
+        /// Char indicating end of line
+        /// </summary>
+        [JsonProperty("endOfLineChar", NullValueHandling = NullValueHandling.Ignore)]
+        public char EndOfLineChar { get; set; }
+
+        /// <summary>
+        /// Defaults to Environment.NewLine;
+        /// </summary>
+        [JsonProperty("endOfLineString", NullValueHandling = NullValueHandling.Ignore)]
+        public string EndOfLineString { get; set; }
+
+        /// <summary>
+        /// Indicates 
+        /// </summary>
+        [JsonProperty("deviceReadyResponsePattern", NullValueHandling = NullValueHandling.Ignore)]
+        public string DeviceReadyResponsePattern { get; set; }
+
+        /// <summary>
+        /// Used when communcating to programs running in VC-4
+        /// </summary>
+        [JsonProperty("roomId", NullValueHandling = NullValueHandling.Ignore)]
+        public string RoomId { get; set; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public ControlPropertiesConfig()
+        {            
+        }
+    }
+}

src/PepperDash.Essentials.Core/Communications/EventArgs.cs

@@ -0,0 +1,247 @@
+/*PepperDash Technology Corp.
+Copyright:		2017
+------------------------------------
+***Notice of Ownership and Copyright***
+The material in which this notice appears is the property of PepperDash Technology Corporation, 
+which claims copyright under the laws of the United States of America in the entire body of material 
+and in all parts thereof, regardless of the use to which it is being put.  Any use, in whole or in part, 
+of this material by another party without the express written permission of PepperDash Technology Corporation is prohibited.  
+PepperDash Technology Corporation reserves all rights under applicable laws.
+------------------------------------ */
+using System;
+using Crestron.SimplSharp.CrestronSockets;
+
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Delegate for notifying of socket status changes
+    /// </summary>
+    /// <param name="client"></param>
+    public delegate void GenericSocketStatusChangeEventDelegate(ISocketStatus client);
+
+    /// <summary>
+    /// EventArgs class for socket status changes
+    /// </summary>
+	public class GenericSocketStatusChageEventArgs : EventArgs
+	{
+  /// <summary>
+  /// Gets or sets the Client
+  /// </summary>
+		public ISocketStatus Client { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="client"></param>
+		public GenericSocketStatusChageEventArgs(ISocketStatus client)
+		{
+			Client = client;
+		}
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericSocketStatusChageEventArgs() { }
+    }
+
+    /// <summary>
+    /// Delegate for notifying of TCP Server state changes
+    /// </summary>
+    /// <param name="state"></param>
+    public delegate void GenericTcpServerStateChangedEventDelegate(ServerState state);
+
+    /// <summary>
+    /// EventArgs class for TCP Server state changes
+    /// </summary>
+    public class GenericTcpServerStateChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the State
+        /// </summary>
+        public ServerState State { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="state"></param>
+        public GenericTcpServerStateChangedEventArgs(ServerState state)
+        {
+            State = state;
+        }
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericTcpServerStateChangedEventArgs() { }
+    }
+
+    /// <summary>
+    /// Delegate for TCP Server socket status changes
+    /// </summary>
+    /// <param name="socket"></param>
+    /// <param name="clientIndex"></param>
+    /// <param name="clientStatus"></param>
+    public delegate void GenericTcpServerSocketStatusChangeEventDelegate(object socket, uint clientIndex, SocketStatus clientStatus);
+    /// <summary>
+    /// EventArgs for TCP server socket status changes
+    /// </summary>
+    public class GenericTcpServerSocketStatusChangeEventArgs : EventArgs
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public object Socket { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public uint ReceivedFromClientIndex { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public SocketStatus ClientStatus { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="socket"></param>
+        /// <param name="clientStatus"></param>
+        public GenericTcpServerSocketStatusChangeEventArgs(object socket, SocketStatus clientStatus)
+        {
+            Socket = socket;
+            ClientStatus = clientStatus;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="socket"></param>
+        /// <param name="clientIndex"></param>
+        /// <param name="clientStatus"></param>
+        public GenericTcpServerSocketStatusChangeEventArgs(object socket, uint clientIndex, SocketStatus clientStatus)
+        {
+            Socket = socket;
+            ReceivedFromClientIndex = clientIndex;
+            ClientStatus = clientStatus;
+        }
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericTcpServerSocketStatusChangeEventArgs() { }
+    }
+
+    /// <summary>
+    /// EventArgs for TCP server com method receive text
+    /// </summary>
+    public class GenericTcpServerCommMethodReceiveTextArgs : EventArgs
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public uint ReceivedFromClientIndex { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort ReceivedFromClientIndexShort
+		{
+			get
+			{
+				return (ushort)ReceivedFromClientIndex;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the Text
+        /// </summary>
+        public string Text { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="text"></param>
+        public GenericTcpServerCommMethodReceiveTextArgs(string text)
+        {
+            Text = text;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="clientIndex"></param>
+        public GenericTcpServerCommMethodReceiveTextArgs(string text, uint clientIndex)
+        {
+            Text = text;
+            ReceivedFromClientIndex = clientIndex;
+        }
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericTcpServerCommMethodReceiveTextArgs() { }
+    }
+
+    /// <summary>
+    /// EventArgs for TCP server client ready for communication
+    /// </summary>
+    public class GenericTcpServerClientReadyForcommunicationsEventArgs : EventArgs
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool IsReady;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="isReady"></param>
+        public GenericTcpServerClientReadyForcommunicationsEventArgs(bool isReady)
+        {
+            IsReady = isReady;
+        }
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericTcpServerClientReadyForcommunicationsEventArgs() { }
+    }
+
+    /// <summary>
+    /// EventArgs for UDP connected
+    /// </summary>
+    public class GenericUdpConnectedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public ushort UConnected;
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool Connected;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public GenericUdpConnectedEventArgs() { }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="uconnected"></param>
+        public GenericUdpConnectedEventArgs(ushort uconnected)
+        {
+            UConnected = uconnected;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="connected"></param>
+        public GenericUdpConnectedEventArgs(bool connected)
+        {
+            Connected = connected;
+        }
+
+    }
+
+   
+
+}

src/PepperDash.Essentials.Core/Communications/GenericComm.cs

@@ -1,19 +1,19 @@
-
-
-using System;
+using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp.CrestronSockets;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
-
-using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
+using PepperDash.Essentials.Core.Bridges.JoinMaps;
+using PepperDash.Essentials.Core.JoinMaps;
+using PepperDash.Essentials.Core.Config.Essentials;
+using PepperDash.Essentials.Core.Touchpanels;
 
 
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core.Communications
 {
     /// <summary>
     /// Serves as a generic wrapper class for all styles of IBasicCommuncation ports
@@ -23,15 +23,8 @@ namespace PepperDash.Essentials.Core
     {
         EssentialsControlPropertiesConfig PropertiesConfig;
 
-        /// <summary>
-        /// Gets the CommPort
-        /// </summary>
         public IBasicCommunication CommPort { get; private set; }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="config">the config of the device</param>
         public GenericComm(DeviceConfig config)
             : base(config)
         {
@@ -40,7 +33,7 @@ namespace PepperDash.Essentials.Core
 
             var commPort = CommFactory.CreateCommForDevice(config);
 
-            //Fixing decision to require '-comPorts' in declaration for DGE in order to get a device with comports included
+            //Fixing decision to require '-comPorts' in delcaration for DGE in order to get a device with comports included
             if (commPort == null)
             {
                 config.Key = config.Key + "-comPorts";
@@ -77,10 +70,6 @@ namespace PepperDash.Essentials.Core
             }
         }
 
-        /// <summary>
-        /// CustomSetConfig method
-        /// </summary>
-        /// <param name="config">the new device configuration</param>
         protected override void CustomSetConfig(DeviceConfig config)
         {
             PropertiesConfig = CommFactory.GetControlPropertiesConfig(config);
@@ -131,7 +120,7 @@ namespace PepperDash.Essentials.Core
             if (sComm == null) return;
             sComm.ConnectionChange += (s, a) =>
             {
-                trilist.SetUshort(joinMap.Status.JoinNumber, (ushort)(a.Client.ClientStatus));
+                trilist.SetUshort(joinMap.Status.JoinNumber, (ushort)a.Client.ClientStatus);
                 trilist.SetBool(joinMap.Connected.JoinNumber, a.Client.ClientStatus ==
                                                    SocketStatus.SOCKET_STATUS_CONNECTED);
             };
@@ -155,9 +144,6 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public class GenericCommFactory : EssentialsDeviceFactory<GenericComm>
     {
-        /// <summary>
-        /// Initializes a new instance of the GenericCommFactory class.
-        /// </summary>
         public GenericCommFactory()
         {
             TypeNames = new List<string>() { "genericComm" };

src/PepperDash.Essentials.Core/Communications/GenericHttpClient.cs

@@ -0,0 +1,141 @@
+using Crestron.SimplSharp.Net.Http;
+using System;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    [Obsolete("Please use the builtin HttpClient class instead: https://learn.microsoft.com/en-us/dotnet/fundamentals/networking/http/httpclient-guidelines")]
+ /// <summary>
+ /// Represents a GenericHttpClient
+ /// </summary>
+	public class GenericHttpClient : Device, IBasicCommunication
+	{
+		private readonly HttpClient Client;
+		public event EventHandler<GenericHttpClientEventArgs> ResponseRecived;
+
+		public GenericHttpClient(string key, string name, string hostname)
+			: base(key, name)
+		{
+            Client = new HttpClient
+            {
+                HostName = hostname
+            };
+
+
+        }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="path"></param>
+  /// <summary>
+  /// SendText method
+  /// </summary>
+		public void SendText(string path)
+		{
+			var request = new HttpClientRequest();
+			var url = string.Format("http://{0}/{1}", Client.HostName, path);
+			request.Url = new UrlParser(url);
+			var error = Client.DispatchAsyncEx(request, Response, request); 
+		}
+		public void SendText(string format, params object[] items)
+		{
+			var request = new HttpClientRequest();
+			var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
+			request.Url = new UrlParser(url);
+			var error = Client.DispatchAsyncEx(request, Response, request);
+		}
+
+  /// <summary>
+  /// SendTextNoResponse method
+  /// </summary>
+		public void SendTextNoResponse(string format, params object[] items)
+		{
+			var request = new HttpClientRequest();
+			var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
+			request.Url = new UrlParser(url);
+			Client.Dispatch(request);
+		}
+
+		private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request)
+		{
+			if (error == HTTP_CALLBACK_ERROR.COMPLETED)
+			{
+				var responseReceived = response;
+
+				if (responseReceived.ContentString.Length > 0)
+				{
+                    ResponseRecived?.Invoke(this, new GenericHttpClientEventArgs(responseReceived.ContentString, (request as HttpClientRequest).Url.ToString(), error));
+                }
+			}
+
+		}
+
+
+		#region IBasicCommunication Members
+
+  /// <summary>
+  /// SendBytes method
+  /// </summary>
+		public void SendBytes(byte[] bytes)
+		{
+			throw new NotImplementedException();
+		}
+
+
+
+		#endregion
+
+		#region ICommunicationReceiver Members
+
+		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+
+  /// <summary>
+  /// Connect method
+  /// </summary>
+		public void Connect()
+		{
+			throw new NotImplementedException();
+		}
+
+  /// <summary>
+  /// Disconnect method
+  /// </summary>
+		public void Disconnect()
+		{
+			throw new NotImplementedException();
+		}
+
+		public bool IsConnected
+		{
+			get { return true; }
+		}
+
+		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+		#endregion
+	}
+ /// <summary>
+ /// Represents a GenericHttpClientEventArgs
+ /// </summary>
+	public class GenericHttpClientEventArgs : EventArgs
+	{
+  /// <summary>
+  /// Gets or sets the ResponseText
+  /// </summary>
+		public string ResponseText { get; private set; }
+  /// <summary>
+  /// Gets or sets the RequestPath
+  /// </summary>
+		public string RequestPath { get; private set; }
+  /// <summary>
+  /// Gets or sets the Error
+  /// </summary>
+		public HTTP_CALLBACK_ERROR Error { get; set; }
+		public GenericHttpClientEventArgs(string response, string request, HTTP_CALLBACK_ERROR error)
+		{
+			ResponseText = response;
+			RequestPath = request;
+			Error = error;
+		}
+	}
+}

src/PepperDash.Essentials.Core/Communications/IAutoReconnect.cs

@@ -0,0 +1,21 @@
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Describes a device that can automatically attempt to reconnect
+    /// </summary>
+    public interface IAutoReconnect
+	{
+        /// <summary>
+        /// Enable automatic recconnect
+        /// </summary>
+        [JsonProperty("autoReconnect")]
+		bool AutoReconnect { get; set; }
+        /// <summary>
+        /// Interval in ms to attempt automatic recconnections
+        /// </summary>
+        [JsonProperty("autoReconnectIntervalMs")]
+		int AutoReconnectIntervalMs { get; set; }
+	}
+}

src/PepperDash.Essentials.Core/Communications/IBasicCommunication.cs

@@ -0,0 +1,20 @@
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Defines the contract for IBasicCommunication
+    /// </summary>
+    public interface IBasicCommunication : ICommunicationReceiver
+	{
+        /// <summary>
+        /// Send text to the device
+        /// </summary>
+        /// <param name="text"></param>
+		void SendText(string text);
+
+        /// <summary>
+        /// Send bytes to the device
+        /// </summary>
+        /// <param name="bytes"></param>
+		void SendBytes(byte[] bytes);
+	}
+}

src/PepperDash.Essentials.Core/Communications/IBasicCommunicationWithStreamDebugging.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Represents a device that implements IBasicCommunication and IStreamDebugging
+    /// </summary>
+    public interface IBasicCommunicationWithStreamDebugging : IBasicCommunication, IStreamDebugging
+    {
+
+    }
+}

src/PepperDash.Essentials.Core/Communications/IComPortsDevice.cs

@@ -0,0 +1,13 @@
+using Crestron.SimplSharpPro;
+
+
+namespace PepperDash.Essentials.Core.Communications
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public interface IComPortsDevice
+	{
+		IComPorts Device { get; }
+	}
+}

src/PepperDash.Essentials.Core/Communications/ICommunicationReceiver.cs

@@ -0,0 +1,34 @@
+using System;
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// An incoming communication stream
+    /// </summary>
+    public interface ICommunicationReceiver : IKeyed
+    {
+        /// <summary>
+        /// Notifies of bytes received
+        /// </summary>
+        event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+        /// <summary>
+        /// Notifies of text received
+        /// </summary>
+        event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+        /// <summary>
+        /// Indicates connection status
+        /// </summary>
+        [JsonProperty("isConnected")]
+        bool IsConnected { get; }
+        /// <summary>
+        /// Connect to the device
+        /// </summary>
+        void Connect();
+        /// <summary>
+        /// Disconnect from the device
+        /// </summary>
+        void Disconnect();
+    }
+}

src/PepperDash.Essentials.Core/Communications/IRPortHelper.cs

@@ -1,27 +1,21 @@
 
 
 using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
 using Serilog.Events;
 
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core.Communications
 {
 	/// <summary>
-	/// Helper class for IR port operations
+	/// 
 	/// </summary>
 	public static class IRPortHelper
 	{
-		/// <summary>
-		/// Gets the IrDriverPathPrefix
-		/// </summary>
 		public static string IrDriverPathPrefix
 		{
 			get
@@ -34,7 +28,7 @@ namespace PepperDash.Essentials.Core
 		/// Finds either the ControlSystem or a device controller that contains IR ports and
 		/// returns a port from the hardware device
 		/// </summary>
-		/// <param name="propsToken">JSON token containing properties</param>
+		/// <param name="propsToken"></param>
 		/// <returns>IrPortConfig object.  The port and or filename will be empty/null 
 		/// if valid values don't exist on config</returns>
 		public static IrOutPortConfig GetIrPort(JToken propsToken)
@@ -86,11 +80,9 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-		/// <summary>
-		/// GetIrOutputPort method
-		/// </summary>
-		/// <param name="dc">DeviceConfig to get the IR port for</param>
-		/// <returns>IROutputPort or null if not found</returns>
+     /// <summary>
+     /// GetIrOutputPort method
+     /// </summary>
 	    public static IROutputPort GetIrOutputPort(DeviceConfig dc)
 	    {
 	        var irControllerKey = dc.Key + "-ir";
@@ -150,11 +142,9 @@ namespace PepperDash.Essentials.Core
 	        return port;
 	    }
 
-		/// <summary>
-		/// GetIrOutputPortController method
-		/// </summary>
-		/// <param name="config">DeviceConfig to create the IrOutputPortController for</param>
-		/// <returns>IrOutputPortController object</returns>
+     /// <summary>
+     /// GetIrOutputPortController method
+     /// </summary>
 	    public static IrOutputPortController GetIrOutputPortController(DeviceConfig config)
 	    {
             Debug.LogMessage(LogEventLevel.Debug, "Attempting to create new Ir Port Controller");
@@ -235,32 +225,23 @@ namespace PepperDash.Essentials.Core
         }*/
 	}
 
-	/// <summary>
-	/// Represents a IrOutPortConfig
-	/// </summary>
+ /// <summary>
+ /// Represents a IrOutPortConfig
+ /// </summary>
 	public class IrOutPortConfig
 	{
-		/// <summary>
-		/// Gets or sets the Port
-		/// </summary>
 		[JsonProperty("port")]
-  		public IROutputPort Port { get; set; }
-
-		/// <summary>
-		/// Gets or sets the FileName
-		/// </summary>		
+  /// <summary>
+  /// Gets or sets the Port
+  /// </summary>
+		public IROutputPort Port { get; set; }
+		
 		[JsonProperty("fileName")]
 		public string FileName { get; set; }
 
-		/// <summary>
-		/// Gets or sets a value indicating whether to use bridge join map
-		/// </summary>
 		[JsonProperty("useBridgeJoinMap")]
 		public bool UseBridgeJoinMap { get; set; }
 
-		/// <summary>
-		/// Constructor
-		/// </summary>
 		public IrOutPortConfig()
 		{
 			FileName = "";			

src/PepperDash.Essentials.Core/Communications/ISocketStatus.cs

@@ -0,0 +1,25 @@
+using System;
+using Crestron.SimplSharp.CrestronSockets;
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
+    /// GenericTcpIpClient
+    /// </summary>
+    public interface ISocketStatus : IBasicCommunication
+	{
+        /// <summary>
+        /// Notifies of socket status changes
+        /// </summary>
+		event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+
+        /// <summary>
+        /// The current socket status of the client
+        /// </summary>
+        [JsonProperty("clientStatus")]
+        [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
+        SocketStatus ClientStatus { get; }
+	}
+}

src/PepperDash.Essentials.Core/Communications/ISocketStatusWithStreamDebugging.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Describes a device that implements ISocketStatus and IStreamDebugging
+    /// </summary>
+    public interface ISocketStatusWithStreamDebugging : ISocketStatus, IStreamDebugging
+    {
+
+    }
+}

src/PepperDash.Essentials.Core/Communications/IStreamDebugging.cs

@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Represents a device with stream debugging capablities
+    /// </summary>
+    public interface IStreamDebugging
+    {
+        /// <summary>
+        /// Object to enable stream debugging
+        /// </summary>
+        [JsonProperty("streamDebugging")]
+        CommunicationStreamDebugging StreamDebugging { get; }
+    }
+}

src/PepperDash.Essentials.Core/Communications/TcpClientConfigObject.cs

@@ -0,0 +1,59 @@
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Represents a TcpClientConfigObject
+    /// </summary>
+    public class TcpClientConfigObject
+    {
+        /// <summary>
+        /// TcpSsh Properties 
+        /// </summary>
+        [JsonProperty("control")]
+        public ControlPropertiesConfig Control { get; set; }
+
+        /// <summary>
+        /// Bool value for secure. Currently not implemented in TCP sockets as they are not dynamic
+        /// </summary>
+        [JsonProperty("secure")]
+        public bool Secure { get; set; }
+
+        /// <summary>
+        /// Require a shared key that both server and client negotiate. If negotiation fails server disconnects the client
+        /// </summary>
+        [JsonProperty("sharedKeyRequired")]
+        public bool SharedKeyRequired { get; set; }
+
+        /// <summary>
+        /// The shared key that must match on the server and client
+        /// </summary>
+        [JsonProperty("sharedKey")]
+        public string SharedKey { get; set; }
+
+        /// <summary>
+        /// Require a heartbeat on the client/server connection that will cause the server/client to disconnect if the heartbeat is not received. 
+        /// heartbeats do not raise received events. 
+        /// </summary>
+        [JsonProperty("heartbeatRequired")]
+        public bool HeartbeatRequired { get; set; }
+
+        /// <summary>
+        /// The interval in seconds for the heartbeat from the client. If not received client is disconnected
+        /// </summary>
+        [JsonProperty("heartbeatRequiredIntervalInSeconds")]
+        public ushort HeartbeatRequiredIntervalInSeconds { get; set; }
+
+        /// <summary>
+        /// HeartbeatString that will be checked against the message received. defaults to heartbeat if no string is provided. 
+        /// </summary>
+        [JsonProperty("heartbeatStringToMatch")]
+        public string HeartbeatStringToMatch { get; set; }
+
+        /// <summary>
+        /// Receive Queue size must be greater than 20 or defaults to 20
+        /// </summary>
+        [JsonProperty("receiveQueueSize")]
+        public int ReceiveQueueSize { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/Communications/TcpServerConfigObject.cs

@@ -0,0 +1,54 @@
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Tcp Server Config object with properties for a tcp server with shared key and heartbeat capabilities
+    /// </summary>
+    public class TcpServerConfigObject
+    {
+        /// <summary>
+        /// Uique key
+        /// </summary>
+        public string Key { get; set; }
+        /// <summary>
+        /// Max Clients that the server will allow to connect. 
+        /// </summary>
+        public ushort MaxClients { get; set; }
+        /// <summary>
+        /// Bool value for secure. Currently not implemented in TCP sockets as they are not dynamic
+        /// </summary>
+        public bool Secure { get; set; }
+        /// <summary>
+        /// Port for the server to listen on
+        /// </summary>
+        public int Port { get; set; }
+        /// <summary>
+        /// Require a shared key that both server and client negotiate. If negotiation fails server disconnects the client
+        /// </summary>
+        public bool SharedKeyRequired { get; set; }
+        /// <summary>
+        /// The shared key that must match on the server and client
+        /// </summary>
+        public string SharedKey { get; set; }
+        /// <summary>
+        /// Require a heartbeat on the client/server connection that will cause the server/client to disconnect if the heartbeat is not received. 
+        /// heartbeats do not raise received events. 
+        /// </summary>
+        public bool HeartbeatRequired { get; set; }
+        /// <summary>
+        /// The interval in seconds for the heartbeat from the client. If not received client is disconnected
+        /// </summary>
+        public ushort HeartbeatRequiredIntervalInSeconds { get; set; }
+        /// <summary>
+        /// HeartbeatString that will be checked against the message received. defaults to heartbeat if no string is provided. 
+        /// </summary>
+        public string HeartbeatStringToMatch { get; set; }
+        /// <summary>
+        /// Client buffer size. See Crestron help. defaults to 2000 if not greater than 2000
+        /// </summary>
+        public int BufferSize { get; set; }
+        /// <summary>
+        /// Receive Queue size must be greater than 20 or defaults to 20
+        /// </summary>
+        public int ReceiveQueueSize { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/Communications/TcpSshPropertiesConfig.cs

@@ -0,0 +1,59 @@
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Represents a TcpSshPropertiesConfig
+    /// </summary>
+    public class TcpSshPropertiesConfig
+    {
+        /// <summary>
+        /// Address to connect to
+        /// </summary>
+		[JsonProperty(Required = Required.Always)]
+        public string Address { get; set; }
+
+        /// <summary>
+        /// Port to connect to
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public int Port { get; set; }
+
+        /// <summary>
+        /// Username credential
+        /// </summary>
+        public string Username { get; set; }
+        /// <summary>
+        /// Gets or sets the Password
+        /// </summary>
+        public string Password { get; set; }
+
+        /// <summary>
+        /// Defaults to 32768
+        /// </summary>
+        public int BufferSize { get; set; }
+
+        /// <summary>
+        /// Gets or sets the AutoReconnect
+        /// </summary>
+        public bool AutoReconnect { get; set; }
+
+        /// <summary>
+        /// Gets or sets the AutoReconnectIntervalMs
+        /// </summary>
+        public int AutoReconnectIntervalMs { get; set; }
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+		public TcpSshPropertiesConfig()
+        {
+            BufferSize = 32768;
+            AutoReconnect = true;
+            AutoReconnectIntervalMs = 5000;
+            Username = "";
+            Password = "";
+        }
+
+    }
+}

src/PepperDash.Essentials.Core/Communications/eControlMethod.cs

@@ -0,0 +1,73 @@
+namespace PepperDash.Essentials.Core.Communications
+{
+    /// <summary>
+    /// Crestron Control Methods for a comm object
+    /// </summary>
+    public enum eControlMethod
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// RS232/422/485
+        /// </summary>
+        Com,
+        /// <summary>
+        /// Crestron IpId (most Crestron ethernet devices)
+        /// </summary>
+        IpId,
+        /// <summary>
+        /// Crestron IpIdTcp (HD-MD series, etc.)
+        /// </summary>
+        IpidTcp,
+        /// <summary>
+        /// Crestron IR control
+        /// </summary>
+        IR,
+        /// <summary>
+        /// SSH client
+        /// </summary>
+        Ssh,
+        /// <summary>
+        /// TCP/IP client
+        /// </summary>
+        Tcpip,
+        /// <summary>
+        /// Telnet
+        /// </summary>
+        Telnet,
+        /// <summary>
+        /// Crestnet device
+        /// </summary>
+        Cresnet,
+        /// <summary>
+        /// CEC Control, via a DM HDMI port
+        /// </summary>
+        Cec,
+        /// <summary>
+        /// UDP Server
+        /// </summary>
+        Udp,
+        /// <summary>
+        /// HTTP client
+        /// </summary>
+        Http,
+        /// <summary>
+        /// HTTPS client
+        /// </summary>
+        Https,
+        /// <summary>
+        /// Websocket client
+        /// </summary>
+        Ws,
+        /// <summary>
+        /// Secure Websocket client 
+        /// </summary>
+        Wss,
+        /// <summary>
+        /// Secure TCP/IP
+        /// </summary>
+        SecureTcpIp
+    }
+}

src/PepperDash.Essentials.Core/Config/AudioControlPointListItem.cs

@@ -1,10 +1,6 @@
-using Crestron.SimplSharpPro;
-using Newtonsoft.Json;
-using System;
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core.Devices;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PepperDash.Essentials.Core.Config
 {
@@ -13,15 +9,9 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     public class AudioControlPointListItem
     {
-        /// <summary>
-        /// Level controls for this audio control point
-        /// </summary>
         [JsonProperty("levelControls")]
         public Dictionary<string, LevelControlListItem> LevelControls { get; set; } = new Dictionary<string, LevelControlListItem>();
 
-        /// <summary>
-        /// Presets for this audio control point
-        /// </summary>
         [JsonProperty("presets")]
         public Dictionary<string, PresetListItem> Presets { get; set; } = new Dictionary<string, PresetListItem>();
 

src/PepperDash.Essentials.Core/Config/BaseStreamingDeviceProperties.cs

@@ -1,29 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core.Config
-{
-  /// <summary>
-  /// Represents the base properties for a streaming device.
-  /// </summary>
-  public class BaseStreamingDeviceProperties
-  {
-    /// <summary>
-    /// The multicast video address for the streaming device.
-    /// </summary>
-    [JsonProperty("multicastVideoAddress", NullValueHandling = NullValueHandling.Ignore)]
-    public string MulticastVideoAddress { get; set; }
-
-    /// <summary>
-    /// The multicast audio address for the streaming device.
-    /// </summary>
-    [JsonProperty("multicastAudioAddress", NullValueHandling = NullValueHandling.Ignore)]
-    public string MulticastAudioAddress { get; set; }
-
-    /// <summary>
-    /// The URL for the streaming device's media stream.
-    /// </summary>
-    [JsonProperty("streamUrl", NullValueHandling = NullValueHandling.Ignore)]
-    public string StreamUrl { get; set; }
-  }
-}

src/PepperDash.Essentials.Core/Config/BasicConfig.cs

@@ -6,6 +6,7 @@ using Newtonsoft.Json;
 
 using Newtonsoft.Json.Linq;
 using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Routing;
 
 namespace PepperDash.Essentials.Core.Config
 {
@@ -14,57 +15,33 @@ namespace PepperDash.Essentials.Core.Config
 	/// </summary>
 	public class BasicConfig
 	{
-        /// <summary>
-        /// Gets or sets the Info
-        /// </summary>
 		[JsonProperty("info")]
 		public InfoConfig Info { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Devices
-        /// </summary>
 		[JsonProperty("devices")]
 		public List<DeviceConfig> Devices { get; set; }
 
-        /// <summary>
-        /// Gets or sets the SourceLists
-        /// </summary>
 		[JsonProperty("sourceLists")]
 		public Dictionary<string, Dictionary<string, SourceListItem>> SourceLists { get; set; }
 
-        /// <summary>
-        /// Gets or sets the DestinationLists
-        /// </summary>
         [JsonProperty("destinationLists")]
         public Dictionary<string, Dictionary<string, DestinationListItem>> DestinationLists { get; set; }
 
-        /// <summary>
-        /// Gets or sets the AudioControlPointLists
-        /// </summary>
         [JsonProperty("audioControlPointLists")]
         public Dictionary<string, AudioControlPointListItem> AudioControlPointLists { get; set; }
 
-        /// <summary>
-        /// Gets or sets the CameraLists
-        /// </summary>
         [JsonProperty("cameraLists")]
         public Dictionary<string, Dictionary<string, CameraListItem>> CameraLists { get; set; }
 
-        /// <summary>
-        /// Gets or sets the TieLines
-        /// </summary>
         [JsonProperty("tieLines")]
-  		public List<TieLineConfig> TieLines { get; set; }
+  /// <summary>
+  /// Gets or sets the TieLines
+  /// </summary>
+		public List<TieLineConfig> TieLines { get; set; }
 
-        /// <summary>
-        /// Gets or sets the JoinMaps
-        /// </summary>
         [JsonProperty("joinMaps")]
         public Dictionary<string, JObject> JoinMaps { get; set; }
 
-        /// <summary>
-        /// BasicConfig Constructor
-        /// </summary>
         public BasicConfig()
         {
             Info = new InfoConfig();
@@ -122,7 +99,6 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// Checks CameraLists for a given list and returns it if found. Otherwise, returns null
         /// </summary>
-        /// <param name="key">Key of desired camera list</param>
         public Dictionary<string, CameraListItem> GetCameraListForKey(string key)
         {
             if (CameraLists == null || string.IsNullOrEmpty(key) || !CameraLists.ContainsKey(key))
@@ -135,6 +111,10 @@ namespace PepperDash.Essentials.Core.Config
         /// Checks Devices for an item with a Key that matches and returns it if found. Otherwise, retunes null
         /// </summary>
         /// <param name="key">Key of desired device</param>
+        /// <returns></returns>
+        /// <summary>
+        /// GetDeviceForKey method
+        /// </summary>
         public DeviceConfig GetDeviceForKey(string key)
         {
             if (string.IsNullOrEmpty(key))

src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs

@@ -1,15 +1,4 @@
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-using PepperDash.Core;
-using Newtonsoft.Json.Linq;
-
-namespace PepperDash.Essentials.Core.Config
+namespace PepperDash.Essentials.Core.Config
 {
     /// <summary>
     /// Represents a ConfigPropertiesHelpers

src/PepperDash.Essentials.Core/Config/DeviceConfig.cs

@@ -1,15 +1,9 @@
 
 
 using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core.Config
 {
@@ -18,47 +12,43 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     public class DeviceConfig
     {
+        [JsonProperty("key")]
         /// <summary>
         /// Gets or sets the Key
         /// </summary>
-        [JsonProperty("key")]
         public string Key { get; set; }
 
+        [JsonProperty("uid")]
         /// <summary>
         /// Gets or sets the Uid
         /// </summary>
-        [JsonProperty("uid")]
         public int Uid { get; set; }
 
+        [JsonProperty("name")]
         /// <summary>
         /// Gets or sets the Name
         /// </summary>
-        [JsonProperty("name")]
         public string Name { get; set; }
 
+        [JsonProperty("group")]
         /// <summary>
         /// Gets or sets the Group
         /// </summary>
-        [JsonProperty("group")]
         public string Group { get; set; }
 
+        [JsonProperty("type")]
         /// <summary>
         /// Gets or sets the Type
         /// </summary>
-        [JsonProperty("type")]
         public string Type { get; set; }
 
+        [JsonProperty("properties")]
+        [JsonConverter(typeof(DevicePropertiesConverter))]
         /// <summary>
         /// Gets or sets the Properties
         /// </summary>
-        [JsonProperty("properties")]
-        [JsonConverter(typeof(DevicePropertiesConverter))]
         public JToken Properties { get; set; }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="dc">device config</param>
         public DeviceConfig(DeviceConfig dc)
         {
             Key = dc.Key;
@@ -72,10 +62,7 @@ namespace PepperDash.Essentials.Core.Config
             //Properties = JToken.FromObject(dc.Properties);
         }
 
-        /// <summary>
-        /// Default Constructor
-        /// </summary>
-        public DeviceConfig() { }
+        public DeviceConfig() {}
     }
 
     /// <summary>
@@ -92,14 +79,6 @@ namespace PepperDash.Essentials.Core.Config
             return objectType == typeof(JToken);
         }
 
-        /// <summary>
-        /// ReadJson method
-        /// </summary>
-        /// <param name="reader">reader to use</param>
-        /// <param name="objectType">type of object being read</param>
-        /// <param name="existingValue">existing value for the object</param>
-        /// <param name="serializer">serializer to use</param>
-        /// <returns></returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
             return JToken.ReadFrom(reader);

src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs

@@ -5,36 +5,27 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Core.Config;
 using Serilog.Events;
 
-namespace PepperDash.Essentials.Core.Config
+namespace PepperDash.Essentials.Core.Config.Essentials
 {
 	/// <summary>
 	/// Loads the ConfigObject from the file
 	/// </summary>
 	public class ConfigReader
 	{
-        /// <summary>
-        /// Local Config Present Message
-        /// </summary>
 	    public const string LocalConfigPresent =
             @"
 ***************************************************
 ************* Using Local config file *************
 ***************************************************";
 
-        /// <summary>
-        /// The loaded config object
-        /// </summary>
 		public static EssentialsConfig ConfigObject { get; private set; }
 
-        /// <summary>
-        /// LoadConfig2 method
-        /// </summary>
+  /// <summary>
+  /// LoadConfig2 method
+  /// </summary>
 		public static bool LoadConfig2()
 		{
 			Debug.LogMessage(LogEventLevel.Information, "Loading unmerged system/template portal configuration file.");
@@ -43,7 +34,7 @@ namespace PepperDash.Essentials.Core.Config
                 // Check for local config file first
                 var filePath = Global.FilePathPrefix + ConfigWriter.LocalConfigFolder + Global.DirectorySeparator + Global.ConfigFileName;
 
-                bool localConfigFound = false;
+                var localConfigFound = false;
 
                 Debug.LogMessage(LogEventLevel.Information, "Attempting to load Local config file: '{0}'", filePath);
 
@@ -119,7 +110,7 @@ namespace PepperDash.Essentials.Core.Config
 			    }
 
                 // Read the file
-                using (StreamReader fs = new StreamReader(filePath))
+                using (var fs = new StreamReader(filePath))
                 {
                     Debug.LogMessage(LogEventLevel.Information, "Loading config file: '{0}'", filePath);
 
@@ -130,35 +121,22 @@ namespace PepperDash.Essentials.Core.Config
                         Debug.LogMessage(LogEventLevel.Information, "Successfully Loaded Local Config");
 
                         return true;
-                    }                   
+                    }
                     else
                     {
-                        var parsedConfig = JObject.Parse(fs.ReadToEnd());
-
-                        // Check if it's a v2 config (check for "version" node)
-                        // this means it's already merged by the Portal API
-                        // from the v2 config tool
-                        var isV2Config = parsedConfig["versions"] != null;
-                        
-                        if (isV2Config)
-                        {
-                            Debug.LogMessage(LogEventLevel.Information, "Config file is a v2 format, no merge necessary.");
-                            ConfigObject = parsedConfig.ToObject<EssentialsConfig>();
-                            Debug.LogMessage(LogEventLevel.Information, "Successfully Loaded v2 Config");
-                            return true;
-                        }
+                        var doubleObj = JObject.Parse(fs.ReadToEnd());
+                        ConfigObject = PortalConfigReader.MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
 
                         // Extract SystemUrl and TemplateUrl into final config output
-                        ConfigObject = PortalConfigReader.MergeConfigs(parsedConfig).ToObject<EssentialsConfig>();
 
-                        if (parsedConfig["system_url"] != null)
+                        if (doubleObj["system_url"] != null)
                         {
-                            ConfigObject.SystemUrl = parsedConfig["system_url"].Value<string>();
+                            ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
                         }
 
-                        if (parsedConfig["template_url"] != null)
+                        if (doubleObj["template_url"] != null)
                         {
-                            ConfigObject.TemplateUrl = parsedConfig["template_url"].Value<string>();
+                            ConfigObject.TemplateUrl = doubleObj["template_url"].Value<string>();
                         }
                     }
 
@@ -177,8 +155,11 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// Returns all the files from the directory specified.
         /// </summary>
-        /// <param name="filePath">path to the directory</param>
-        /// <returns>config files</returns>
+        /// <param name="filePath"></param>
+        /// <returns></returns>
+        /// <summary>
+        /// GetConfigFiles method
+        /// </summary>
         public static FileInfo[] GetConfigFiles(string filePath)
         {
             // Get the directory
@@ -209,8 +190,11 @@ namespace PepperDash.Essentials.Core.Config
 		/// <summary>
 		/// Returns the group for a given device key in config
 		/// </summary>
-		/// <param name="key">Key of the device</param>
-		/// <returns>Group name if the device is found, null otherwise</returns>
+		/// <param name="key"></param>
+		/// <returns></returns>
+        /// <summary>
+        /// GetGroupForDeviceKey method
+        /// </summary>
         public static string GetGroupForDeviceKey(string key)
         {
             var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
@@ -226,7 +210,7 @@ namespace PepperDash.Essentials.Core.Config
             {
                 debugStringWidth = 51;
             }
-            var qualifier = (filePathLength % 2 != 0)
+            var qualifier = filePathLength % 2 != 0
                 ? " Using Local Config File "
                 : " Using Local  Config File ";
             var bookend1 = (debugStringWidth - qualifier.Length) / 2;

src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs

@@ -1,35 +1,21 @@
 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Crestron.SimplSharp.Net.Http;
-using Crestron.SimplSharpPro.Diagnostics;
-
-using PepperDash.Core;
 using Serilog.Events;
 
-namespace PepperDash.Essentials.Core.Config
+namespace PepperDash.Essentials.Core.Config.Essentials
 {
-    /// <summary>
-    /// ConfigUpdater class
-    /// </summary>
     public static class ConfigUpdater
     {
-        /// <summary>
-        /// ConfigStatusChanged event
-        /// </summary>
         public static event EventHandler<ConfigStatusEventArgs> ConfigStatusChanged;
 
         /// <summary>
         /// GetConfigFromServer method
         /// </summary>
-        /// <param name="url">URL of the config server</param>
         public static void GetConfigFromServer(string url)
         {
             Debug.LogMessage(LogEventLevel.Information, "Attempting to get new config from '{0}'", url);
@@ -153,7 +139,7 @@ namespace PepperDash.Essentials.Core.Config
                 {
                     Debug.LogMessage(LogEventLevel.Information, "{0} Existing files found in archive folder.  Deleting.", archivedConfigFiles.Length);
 
-                    for (int i = 0; i < archivedConfigFiles.Length; i++ )
+                    for (var i = 0; i < archivedConfigFiles.Length; i++ )
                     {
                         var file = archivedConfigFiles[i];
                         Debug.LogMessage(LogEventLevel.Information, "Deleting archived file: '{0}'", file.FullName);
@@ -203,7 +189,7 @@ namespace PepperDash.Essentials.Core.Config
 
             OnStatusUpdate(eUpdateStatus.RestartingProgram);
 
-            string response = string.Empty;
+            var response = string.Empty;
 
             CrestronConsole.SendControlSystemCommand(string.Format("progreset -p:{0}", InitialParametersClass.ApplicationNumber), ref response);
 
@@ -217,44 +203,13 @@ namespace PepperDash.Essentials.Core.Config
         /// </summary>
         public enum eUpdateStatus
     {
-        /// <summary>
-        /// UpdateStarted status
-        /// </summary>
         UpdateStarted,
-
-        /// <summary>
-        /// ConfigFileReceived status
-        /// </summary>
         ConfigFileReceived,
-
-        /// <summary>
-        /// ArchivingConfigs status
-        /// </summary>
         ArchivingConfigs,
-
-        /// <summary>
-        /// DeletingLocalConfig status
-        /// </summary>
         DeletingLocalConfig,
-
-        /// <summary>
-        /// WritingConfigFile status
-        /// </summary>
         WritingConfigFile,
-
-        /// <summary>
-        /// RestartingProgram status
-        /// </summary>
         RestartingProgram,
-
-        /// <summary>
-        /// UpdateSucceeded status
-        /// </summary>
         UpdateSucceeded,
-
-        /// <summary>
-        /// UpdateFailed status
-        /// </summary>
         UpdateFailed
     }
 
@@ -268,10 +223,6 @@ namespace PepperDash.Essentials.Core.Config
         /// </summary>
         public eUpdateStatus UpdateStatus { get; private set; }
 
-        /// <summary>
-        /// ConfigStatusEventArgs Constructor
-        /// </summary>
-        /// <param name="status"></param>
         public ConfigStatusEventArgs(eUpdateStatus status)
         {
             UpdateStatus = status;

src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs

@@ -1,49 +1,39 @@
 
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using PepperDash.Core;
 using Serilog.Events;
 
-namespace PepperDash.Essentials.Core.Config
+namespace PepperDash.Essentials.Core.Config.Essentials
 {
     /// <summary>
     /// Responsible for updating config at runtime, and writing the updates out to a local file
     /// </summary>
     public class ConfigWriter
     {
-        /// <summary>
-        /// LocalConfigFolder constant
-        /// </summary>
         public const string LocalConfigFolder = "LocalConfig";
 
-        /// <summary>
-        /// WriteTimeout constant
-        /// </summary>
         public const long WriteTimeout = 30000;
 
-        /// <summary>
-        /// WriteTimer variable
-        /// </summary>
         public static CTimer WriteTimer;
-
 		static CCriticalSection fileLock = new CCriticalSection();
 
         /// <summary>
         /// Updates the config properties of a device
         /// </summary>
-        /// <param name="deviceKey">The key of the device to update</param>
-        /// <param name="properties">The new properties for the device</param>
-        /// <returns>True if the update was successful, otherwise false</returns>
+        /// <param name="deviceKey"></param>
+        /// <param name="properties"></param>
+        /// <returns></returns>
+        /// <summary>
+        /// UpdateDeviceProperties method
+        /// </summary>
         public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
         {
-            bool success = false;
+            var success = false;
 
             // Get the current device config
             var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(deviceKey));
@@ -66,11 +56,9 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// UpdateDeviceConfig method
         /// </summary>
-        /// <param name="config">The new device config</param>
-        /// <returns>True if the update was successful, otherwise false</returns>
         public static bool UpdateDeviceConfig(DeviceConfig config)
         {
-            bool success = false;
+            var success = false;
 
             var deviceConfigIndex = ConfigReader.ConfigObject.Devices.FindIndex(d => d.Key.Equals(config.Key));
 
@@ -91,11 +79,9 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// UpdateRoomConfig method
         /// </summary>
-        /// <param name="config">The new room config</param>
-        /// <returns>True if the update was successful, otherwise false</returns>
         public static bool UpdateRoomConfig(DeviceConfig config)
         {
-            bool success = false;
+            var success = false;
 
 			var roomConfigIndex = ConfigReader.ConfigObject.Rooms.FindIndex(d => d.Key.Equals(config.Key));
 
@@ -129,6 +115,7 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// Writes the current config to a file in the LocalConfig subfolder
         /// </summary>
+        /// <returns></returns>
         private static void WriteConfigFile(object o)
         {
             var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
@@ -139,10 +126,13 @@ namespace PepperDash.Essentials.Core.Config
         }
 
         /// <summary>
-        /// Writes the current config data to a file
+        /// Writes
+        /// </summary>
+        /// <param name="filepath"></param>
+        /// <param name="o"></param>
+        /// <summary>
+        /// WriteFile method
         /// </summary>
-        /// <param name="filePath">The file path to write to</param>
-        /// <param name="configData">The config data to write</param>
         public static void WriteFile(string filePath, string configData)
         {
             if (WriteTimer != null)
@@ -156,7 +146,7 @@ namespace PepperDash.Essentials.Core.Config
             {
                 if (fileLock.TryEnter())
                 {
-                    using (StreamWriter sw = new StreamWriter(filePath))
+                    using (var sw = new StreamWriter(filePath))
                     {
                         sw.Write(configData);
                         sw.Flush();

src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs

@@ -1,179 +1,89 @@
-
-
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
-
-using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
 
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.Config
+namespace PepperDash.Essentials.Core.Config.Essentials
 {
-    /// <summary>
-    /// Loads the ConfigObject from the file
-    /// </summary>
-    public class EssentialsConfig : BasicConfig
-    {
-        /// <summary>
-        /// Gets or sets the SystemUrl
-        /// </summary>
-        [JsonProperty("system_url")]
+	/// <summary>
+	/// Loads the ConfigObject from the file
+	/// </summary>
+	public class EssentialsConfig : BasicConfig
+	{
+		[JsonProperty("system_url")]
         public string SystemUrl { get; set; }
 
-        /// <summary>
-        /// Gets or sets the TemplateUrl
-        /// </summary>
-        [JsonProperty("template_url")]
+		[JsonProperty("template_url")]
         public string TemplateUrl { get; set; }
 
-        /// <summary>
-        /// Gets the SystemUuid extracted from the SystemUrl
-        /// </summary>
+
 		[JsonProperty("systemUuid")]
-        public string SystemUuid
+		public string SystemUuid
         {
             get
             {
-                string uuid;
+				if (string.IsNullOrEmpty(SystemUrl))
+					return "missing url";
 
-                if (string.IsNullOrEmpty(SystemUrl))
-                {
-                    uuid = "missing url";
-                }
-                else if (SystemUrl.Contains("#"))
-                {
-                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
-                    uuid = result.Groups[1].Value;
-                }
-                else if (SystemUrl.Contains("detail"))
-                {
-                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/detail\/(.*)\/.*");
-                    uuid = result.Groups[1].Value;
-                }
-                else
-                {
+				if (SystemUrl.Contains("#"))
+				{
+					var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
+					var uuid = result.Groups[1].Value;
+					return uuid;
+				} else
+				{
                     var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*");
-                    uuid = result.Groups[1].Value;
+                    var uuid = result.Groups[1].Value;
+                    return uuid;
                 }
-
-                return uuid;
             }
         }
 
-        /// <summary>
-        /// Gets the TemplateUuid extracted from the TemplateUrl
-        /// </summary>
 		[JsonProperty("templateUuid")]
-        public string TemplateUuid
+		public string TemplateUuid
         {
             get
             {
-                string uuid;
+				if (string.IsNullOrEmpty(TemplateUrl))
+					return "missing template url";
 
-                if (string.IsNullOrEmpty(TemplateUrl))
-                {
-                    uuid = "missing template url";
-                }
-                else if (TemplateUrl.Contains("#"))
-                {
-                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
-                    uuid = result.Groups[1].Value;
-                }
-                else if (TemplateUrl.Contains("detail"))
-                {
-                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/detail\/(.*)\/system-template-versions\/detail\/(.*)\/.*");
-                    uuid = result.Groups[2].Value;
-                }
-                else
-                {
+				if (TemplateUrl.Contains("#"))
+				{
+					var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
+					var uuid = result.Groups[1].Value;
+					return uuid;
+				} else
+				{
                     var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*");
-                    uuid = result.Groups[2].Value;
+                    var uuid = result.Groups[2].Value;
+                    return uuid;
                 }
-
-                return uuid;
             }
         }
 
+		[JsonProperty("rooms")]
         /// <summary>
         /// Gets or sets the Rooms
         /// </summary>
-        [JsonProperty("rooms")]
         public List<DeviceConfig> Rooms { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Versions
-        /// </summary>
-        public VersionData Versions { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EssentialsConfig"/> class.
-        /// </summary>
         public EssentialsConfig()
             : base()
         {
             Rooms = new List<DeviceConfig>();
         }
-    }
-
-    /// <summary>
-    /// Represents version data for Essentials and its packages
-    /// </summary>
-    public class VersionData
-    {
-        /// <summary>
-        /// Gets or sets the Essentials version
-        /// </summary>
-        [JsonProperty("essentials")]
-        public NugetVersion Essentials { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of Packages
-        /// </summary>
-        [JsonProperty("packages")]
-        public List<NugetVersion> Packages { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VersionData"/> class.
-        /// </summary>
-        public VersionData()
-        {
-            Packages = new List<NugetVersion>();
-        }
-    }
-
-    /// <summary>
-    /// Represents a NugetVersion
-    /// </summary>
-    public class NugetVersion
-    {
-        /// <summary>
-        /// Gets or sets the Version
-        /// </summary>
-        [JsonProperty("version")]
-        public string Version { get; set; }
-
-        /// <summary>
-        /// Gets or sets the PackageId
-        /// </summary>
-        [JsonProperty("packageId")]
-        public string PackageId { get; set; }
-    }
-
-    /// <summary>
-    /// Represents a SystemTemplateConfigs
-    /// </summary>
-    public class SystemTemplateConfigs
-    {
-        /// <summary>
-        /// Gets or sets the System
-        /// </summary>
+	}
+		
+ /// <summary>
+ /// Represents a SystemTemplateConfigs
+ /// </summary>
+	public class SystemTemplateConfigs
+	{
+  /// <summary>
+  /// Gets or sets the System
+  /// </summary>
 		public EssentialsConfig System { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Template
-        /// </summary>
 		public EssentialsConfig Template { get; set; }
-    }
+	}
 }

src/PepperDash.Essentials.Core/Config/ILoadConfig.cs

@@ -1,19 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core.Config
 {
     /// <summary>
     /// Defines the contract for ILoadConfig
     /// </summary>
     public interface ILoadConfig
     {
-        /// <summary>
-        /// GoWithLoad method
-        /// </summary>
         void GoWithLoad();
     }
 }

src/PepperDash.Essentials.Core/Config/InfoConfig.cs

@@ -2,6 +2,7 @@
 
 using Crestron.SimplSharp;
 using Newtonsoft.Json;
+using PepperDash.Essentials.Core.Global;
 using System;
 using System.Collections.Generic;
 
@@ -12,57 +13,45 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     public class InfoConfig
 	{
-        /// <summary>
-        /// Gets or sets the Name
-        /// </summary>
 		[JsonProperty("name")]
 		public string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Date
-        /// </summary>
 		[JsonProperty("date")]
 		public DateTime Date { get; set; }
 		
-        /// <summary>
-        /// Gets or sets the Type
-        /// </summary>
 		[JsonProperty("type")]
 		public string Type { get; set; }
 		
-        /// <summary>
-        /// Gets or sets the Version
-        /// </summary>
 		[JsonProperty("version")]
+  /// <summary>
+  /// Gets or sets the Version
+  /// </summary>
 		public string Version { get; set; }
 
+        [JsonProperty("runtimeInfo")]
         /// <summary>
         /// Gets or sets the RuntimeInfo
         /// </summary>
-        [JsonProperty("runtimeInfo")]
         public RuntimeInfo RuntimeInfo { get; set; } 
 		
-        /// <summary>
-        /// Gets or sets the Comment
-        /// </summary>
 		[JsonProperty("comment")]
+  /// <summary>
+  /// Gets or sets the Comment
+  /// </summary>
 		public string Comment { get; set; }
 
+        [JsonProperty("hostname")]
         /// <summary>
         /// Gets or sets the HostName
         /// </summary>
-        [JsonProperty("hostname")]
         public string HostName { get; set; }
 
+        [JsonProperty("appNumber")]
         /// <summary>
         /// Gets or sets the AppNumber
         /// </summary>
-        [JsonProperty("appNumber")]
         public uint AppNumber { get; set; }
 
-        /// <summary>
-        /// InfoConfig Constructor
-        /// </summary>
 		public InfoConfig()
 		{
 			Name = "";
@@ -124,7 +113,7 @@ namespace PepperDash.Essentials.Core.Config
         /// The information gathered by the processor at runtime about it's NICs and their IP addresses.   
         /// </summary>
         [JsonProperty("ipInfo")]
-        public Dictionary<short, EthernetAdapterInfo> IpInfo
+        public Dictionary<short, Core.Global.EthernetAdapterInfo> IpInfo
         {
             get
             {

src/PepperDash.Essentials.Core/Config/SourceDevicePropertiesConfigBase.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core.Config
+namespace PepperDash.Essentials.Core.Config
 {
  /// <summary>
  /// Represents a SourceDevicePropertiesConfigBase