fix: Enhance AppUrl change logging

Updated logging to include the new AppUrl value when it changes. This provides better context in the logs, making it easier to track the specific URL that was set.

.gitignore

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

Crestron-Library-Usage-Analysis.md

@@ -0,0 +1,282 @@
+# Crestron Library Usage Analysis - PepperDash Essentials
+
+This document provides a comprehensive analysis of Crestron classes and interfaces used throughout the PepperDash Essentials framework, organized by namespace and library component.
+
+## Executive Summary
+
+The PepperDash Essentials framework extensively leverages Crestron SDK components across 100+ files, providing abstractions for:
+- Control system hardware (processors, touchpanels, IO devices)
+- Communication interfaces (Serial, TCP/IP, SSH, CEC, IR)
+- Device management and routing
+- User interface components and smart objects
+- System monitoring and diagnostics
+
+## 1. Core Crestron Libraries
+
+### 1.1 Crestron.SimplSharp
+
+**Primary Usage**: Foundational framework components, collections, and basic types.
+
+**Key Files**:
+- Multiple files across all projects use `Crestron.SimplSharp` namespaces
+- Provides basic C# runtime support for Crestron processors
+
+### 1.2 Crestron.SimplSharpPro
+
+**Primary Usage**: Main hardware abstraction layer for Crestron devices.
+
+**Key Classes Used**:
+
+#### CrestronControlSystem
+- **File**: `/src/PepperDash.Essentials/ControlSystem.cs`
+- **Usage**: Base class for the main control system implementation
+- **Implementation**: `public class ControlSystem : CrestronControlSystem, ILoadConfig`
+
+#### Device (Base Class)
+- **Files**: 50+ files inherit from or use this class
+- **Key Implementations**:
+  - `/src/PepperDash.Core/Device.cs` - Core device abstraction
+  - `/src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs` - Extended device base
+  - `/src/PepperDash.Essentials.Core/Room/Room.cs` - Room device implementation
+  - `/src/PepperDash.Essentials.Core/Devices/CrestronProcessor.cs` - Processor device wrapper
+
+#### BasicTriList
+- **Files**: 30+ files use this class extensively
+- **Primary Usage**: Touchpanel communication and SIMPL bridging
+- **Key Files**:
+  - `/src/PepperDash.Essentials.Core/Touchpanels/TriListExtensions.cs` - Extension methods for signal handling
+  - `/src/PepperDash.Essentials.Core/Devices/EssentialsBridgeableDevice.cs` - Bridge interface
+  - `/src/PepperDash.Essentials.Core/Touchpanels/ModalDialog.cs` - UI dialog implementation
+
+#### BasicTriListWithSmartObject
+- **Files**: Multiple touchpanel and UI files
+- **Usage**: Enhanced touchpanel support with smart object integration
+- **Key Files**:
+  - `/src/PepperDash.Essentials.Core/Touchpanels/Interfaces.cs` - Interface definitions
+  - `/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferenceList/SubpageReferenceList.cs`
+
+## 2. Communication Hardware
+
+### 2.1 Serial Communication (ComPort)
+
+**Primary Class**: `ComPort`
+**Key Files**:
+- `/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs`
+- `/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs`
+
+**Usage Pattern**:
+```csharp
+public class ComPortController : Device, IBasicCommunicationWithStreamDebugging
+public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
+```
+
+**Interface Support**: `IComPorts` - Used for devices that provide multiple COM ports
+
+### 2.2 IR Communication (IROutputPort)
+
+**Primary Class**: `IROutputPort`
+**Key Files**:
+- `/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs`
+- `/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs`
+- `/src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs`
+
+**Usage Pattern**:
+```csharp
+public class IrOutputPortController : Device
+IROutputPort IrPort;
+public IrOutputPortController(string key, IROutputPort port, string irDriverFilepath)
+```
+
+### 2.3 CEC Communication (ICec)
+
+**Primary Interface**: `ICec`
+**Key Files**:
+- `/src/PepperDash.Essentials.Core/Comm and IR/CecPortController.cs`
+- `/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs`
+
+**Usage Pattern**:
+```csharp
+public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
+public static ICec GetCecPort(ControlPropertiesConfig config)
+```
+
+## 3. Input/Output Hardware
+
+### 3.1 Digital Input
+
+**Primary Interface**: `IDigitalInput`
+**Key Files**:
+- `/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs`
+- `/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyController.cs`
+
+**Usage Pattern**:
+```csharp
+public List<IDigitalInput> Inputs { get; private set; }
+void AddInput(IDigitalInput input)
+```
+
+### 3.2 Versiport Support
+
+**Key Files**:
+- `/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs`
+- `/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs`
+- `/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs`
+
+**Usage**: Provides flexible I/O port configuration for various signal types
+
+## 4. Touchpanel Hardware
+
+### 4.1 MPC3 Touchpanel
+
+**Primary Class**: `MPC3Basic`
+**Key File**: `/src/PepperDash.Essentials.Core/Touchpanels/Mpc3Touchpanel.cs`
+
+**Usage Pattern**:
+```csharp
+public class Mpc3TouchpanelController : Device
+readonly MPC3Basic _touchpanel;
+_touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
+```
+
+### 4.2 TSW Series Support
+
+**Evidence**: References found in messenger files and mobile control components
+**Usage**: Integrated through mobile control messaging system for TSW touchpanel features
+
+## 5. Timer and Threading
+
+### 5.1 CTimer
+
+**Primary Class**: `CTimer`
+**Key File**: `/src/PepperDash.Core/PasswordManagement/PasswordManager.cs`
+
+**Usage Pattern**:
+```csharp
+Debug.Console(1, string.Format("PasswordManager.UpdatePassword: CTimer Started"));
+Debug.Console(1, string.Format("PasswordManager.UpdatePassword: CTimer Reset"));
+```
+
+## 6. Networking and Communication
+
+### 6.1 Ethernet Communication
+
+**Libraries Used**:
+- `Crestron.SimplSharpPro.EthernetCommunication`
+- `Crestron.SimplSharp.Net.Utilities.EthernetHelper`
+
+**Key Files**:
+- `/src/PepperDash.Core/Comm/GenericTcpIpClient.cs`
+- `/src/PepperDash.Core/Comm/GenericTcpIpServer.cs`
+- `/src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs`
+- `/src/PepperDash.Core/Comm/GenericSshClient.cs`
+- `/src/PepperDash.Core/Comm/GenericUdpServer.cs`
+
+**Usage Pattern**:
+```csharp
+public class GenericTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
+public class GenericSecureTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
+```
+
+## 7. Device Management Libraries
+
+### 7.1 DeviceSupport
+
+**Library**: `Crestron.SimplSharpPro.DeviceSupport`
+**Usage**: Core device support infrastructure used throughout the framework
+
+### 7.2 DM (DigitalMedia)
+
+**Library**: `Crestron.SimplSharpPro.DM`
+**Usage**: Digital media routing and switching support
+**Evidence**: Found in routing configuration and DM output card references
+
+## 8. User Interface Libraries
+
+### 8.1 UI Components
+
+**Library**: `Crestron.SimplSharpPro.UI`
+**Usage**: User interface elements and touchpanel controls
+
+### 8.2 Smart Objects
+
+**Key Files**:
+- `/src/PepperDash.Essentials.Core/SmartObjects/SmartObjectDynamicList.cs`
+- `/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferenceList/SubpageReferenceList.cs`
+
+**Usage**: Advanced UI components with dynamic content
+
+## 9. System Monitoring and Diagnostics
+
+### 9.1 Diagnostics
+
+**Library**: `Crestron.SimplSharpPro.Diagnostics`
+**Usage**: System health monitoring and performance tracking
+
+### 9.2 System Information
+
+**Key Files**:
+- `/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs`
+
+**Usage**: Provides system status, Ethernet information, and program details
+
+## 10. Integration Patterns
+
+### 10.1 SIMPL Bridging
+
+**Pattern**: Extensive use of `BasicTriList` for SIMPL integration
+**Files**: Bridge classes throughout the framework implement `LinkToApi` methods:
+```csharp
+public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
+```
+
+### 10.2 Device Factory Pattern
+
+**Implementation**: Factory classes create hardware-specific implementations
+**Example**: `CommFactory.cs` provides communication device creation
+
+### 10.3 Extension Methods
+
+**Pattern**: Extensive use of extension methods for Crestron classes
+**Example**: `TriListExtensions.cs` adds 30+ extension methods to `BasicTriList`
+
+## 11. Signal Processing
+
+### 11.1 Signal Types
+
+**Bool Signals**: Digital control and feedback
+**UShort Signals**: Analog values and numeric data
+**String Signals**: Text and configuration data
+
+**Implementation**: Comprehensive signal handling in `TriListExtensions.cs`
+
+## 12. Error Handling and Logging
+
+**Pattern**: Consistent use of Crestron's Debug logging throughout
+**Examples**:
+```csharp
+Debug.LogMessage(LogEventLevel.Information, "Device {0} is not a valid device", dc.PortDeviceKey);
+Debug.LogMessage(LogEventLevel.Debug, "Error Waking Panel. Maybe testing with Xpanel?");
+```
+
+## 13. Threading and Synchronization
+
+**Components**:
+- CTimer for time-based operations
+- Thread-safe collections and patterns
+- Event-driven programming models
+
+## Conclusion
+
+The PepperDash Essentials framework demonstrates sophisticated integration with the Crestron ecosystem, leveraging:
+
+- **Core Infrastructure**: CrestronControlSystem, Device base classes
+- **Communication**: COM, IR, CEC, TCP/IP, SSH protocols
+- **Hardware Abstraction**: Touchpanels, I/O devices, processors
+- **User Interface**: Smart objects, signal processing, SIMPL bridging
+- **System Services**: Monitoring, diagnostics, device management
+
+This analysis shows that Essentials serves as a comprehensive middleware layer, abstracting Crestron hardware complexities while providing modern software development patterns and practices.
+
+---
+*Generated: [Current Date]*
+*Framework Version: PepperDash Essentials (Based on codebase analysis)*

src/Directory.Build.props

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

src/PepperDash.Core/Comm/CommunicationGather.cs

@@ -84,10 +84,9 @@ namespace PepperDash.Core
             port.TextReceived += Port_TextReceivedStringDelimiter;
         }
 
-		/// <summary>
+  /// <summary>
-		/// Disconnects this gather from the Port's TextReceived event. This will not fire LineReceived
+  /// Stop method
-		/// after the this call.
+  /// </summary>
-		/// </summary>
 		public void Stop()
 		{
 			Port.TextReceived -= Port_TextReceived;

src/PepperDash.Core/Comm/CommunicationStreamDebugging.cs

@@ -23,7 +23,7 @@ namespace PepperDash.Core
         private CTimer DebugExpiryPeriod;
 
         /// <summary>
-        /// The current debug setting
+        /// Gets or sets the DebugSetting
         /// </summary>
         public eStreamDebuggingSetting DebugSetting { get; private set; }
 
@@ -42,7 +42,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Indicates that receive stream debugging is enabled
+        /// Gets or sets the RxStreamDebuggingIsEnabled
         /// </summary>
         public bool RxStreamDebuggingIsEnabled{ get; private set; }
 
@@ -65,6 +65,9 @@ namespace PepperDash.Core
         /// 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)
@@ -81,6 +84,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="setting"></param>
         /// <param name="minutes"></param>
+        /// <summary>
+        /// SetDebuggingWithSpecificTimeout method
+        /// </summary>
         public void SetDebuggingWithSpecificTimeout(eStreamDebuggingSetting setting, uint minutes)
         {
             if (setting == eStreamDebuggingSetting.Off)
@@ -135,6 +141,9 @@ namespace PepperDash.Core
     /// The available settings for stream debugging
     /// </summary>
     [Flags]
+    /// <summary>
+    /// Enumeration of eStreamDebuggingSetting values
+    /// </summary>
     public enum eStreamDebuggingSetting
     {
         /// <summary>

src/PepperDash.Core/Comm/ControlPropertiesConfig.cs

@@ -6,7 +6,7 @@ using Newtonsoft.Json.Converters;
 namespace PepperDash.Core
 {
     /// <summary>
-    /// Config properties that indicate how to communicate with a device for control
+    /// Represents a ControlPropertiesConfig
     /// </summary>
     public class ControlPropertiesConfig
     {

src/PepperDash.Core/Comm/EventArgs.cs

@@ -29,9 +29,9 @@ namespace PepperDash.Core
     /// </summary>
 	public class GenericSocketStatusChageEventArgs : EventArgs
 	{
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the Client
-        /// </summary>
+  /// </summary>
 		public ISocketStatus Client { get; private set; }
 
         /// <summary>
@@ -60,7 +60,7 @@ namespace PepperDash.Core
     public class GenericTcpServerStateChangedEventArgs : EventArgs
     {
         /// <summary>
-        /// 
+        /// Gets or sets the State
         /// </summary>
         public ServerState State { get; private set; }
 
@@ -154,7 +154,7 @@ namespace PepperDash.Core
 		}
 
         /// <summary>
-        /// 
+        /// Gets or sets the Text
         /// </summary>
         public string Text { get; private set; }
 

src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs

@@ -79,7 +79,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Port on server
+        /// Gets or sets the Port
         /// </summary>
         public int Port { get; set; }
 
@@ -149,7 +149,7 @@ namespace PepperDash.Core
         public string ConnectionFailure { get { return ClientStatus.ToString(); } }
 
         /// <summary>
-        /// bool to track if auto reconnect should be set on the socket
+        /// Gets or sets the AutoReconnect
         /// </summary>
         public bool AutoReconnect { get; set; }
 
@@ -188,7 +188,7 @@ namespace PepperDash.Core
         #region GenericSecureTcpIpClient properties
 
         /// <summary>
-        /// Bool to show whether the server requires a preshared key. This is used in the DynamicTCPServer class
+        /// Gets or sets the SharedKeyRequired
         /// </summary>
         public bool SharedKeyRequired { get; set; }
 
@@ -207,7 +207,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module
+        /// Gets or sets the SharedKey
         /// </summary>
         public string SharedKey { get; set; }
 
@@ -222,7 +222,7 @@ namespace PepperDash.Core
         bool IsTryingToConnect;
 
         /// <summary>
-        /// Bool showing if socket is ready for communication after shared key exchange
+        /// Gets or sets the IsReadyForCommunication
         /// </summary>
         public bool IsReadyForCommunication { get; set; }
 
@@ -342,7 +342,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Just to help S+ set the key
+        /// Initialize method
         /// </summary>
         public void Initialize(string key)
         {
@@ -421,6 +421,9 @@ namespace PepperDash.Core
         /// Deactivate the client
         /// </summary>
         /// <returns></returns>
+        /// <summary>
+        /// Deactivate method
+        /// </summary>
         public override bool Deactivate()
         {
             if (_client != null)
@@ -432,7 +435,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Connect Method. Will return if already connected. Will write errors if missing address, port, or unique key/name.
+        /// Connect method
         /// </summary>
         public void Connect()
         {
@@ -563,7 +566,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// 
+        /// Disconnect method
         /// </summary>
         public void Disconnect()
         {
@@ -586,7 +589,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Does the actual disconnect business
+        /// DisconnectClient method
         /// </summary>
         public void DisconnectClient()
         {
@@ -846,7 +849,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// General send method
+        /// SendText method
         /// </summary>
         public void SendText(string text)
         {
@@ -875,7 +878,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// 
+        /// SendBytes method
         /// </summary>
         public void SendBytes(byte[] bytes)
         {

src/PepperDash.Core/Comm/GenericSecureTcpIpClient_ForServer.cs

@@ -80,7 +80,7 @@ namespace PepperDash.Core
         public string Hostname { get; set; }
 
         /// <summary>
-        /// Port on server
+        /// Gets or sets the Port
         /// </summary>
         public int Port { get; set; }
 
@@ -113,7 +113,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module
+        /// Gets or sets the SharedKey
         /// </summary>
         public string SharedKey { get; set; }
 
@@ -123,7 +123,7 @@ namespace PepperDash.Core
         private bool WaitingForSharedKeyResponse { get; set; }
 
         /// <summary>
-        /// Defaults to 2000
+        /// Gets or sets the BufferSize
         /// </summary>
         public int BufferSize { get; set; }
 
@@ -336,7 +336,7 @@ namespace PepperDash.Core
         #region Methods
 
         /// <summary>
-        /// Just to help S+ set the key
+        /// Initialize method
         /// </summary>
         public void Initialize(string key)
         {
@@ -395,7 +395,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Connect Method. Will return if already connected. Will write errors if missing address, port, or unique key/name.
+        /// Connect method
         /// </summary>
         public void Connect()
         {
@@ -526,7 +526,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// 
+        /// Disconnect method
         /// </summary>
         public void Disconnect()
         {
@@ -804,7 +804,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// General send method
+        /// SendText method
         /// </summary>
         public void SendText(string text)
         {
@@ -833,7 +833,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// 
+        /// SendBytes method
         /// </summary>
         public void SendBytes(byte[] bytes)
         {

src/PepperDash.Core/Comm/GenericSecureTcpIpServer.cs

@@ -58,7 +58,7 @@ namespace PepperDash.Core
         public ServerHasChokedCallbackDelegate ServerHasChoked { get; set; }
 
         /// <summary>
-        /// 
+        /// Delegate for ServerHasChokedCallbackDelegate
         /// </summary>
         public delegate void ServerHasChokedCallbackDelegate();
 
@@ -104,7 +104,7 @@ namespace PepperDash.Core
         int MonitorClientFailureCount;
 
         /// <summary>
-        /// 3 by default
+        /// Gets or sets the MonitorClientMaxFailureCount
         /// </summary>
         public int MonitorClientMaxFailureCount { get; set; }
 
@@ -190,7 +190,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Port Server should listen on
+        /// Gets or sets the Port
         /// </summary>
         public int Port { get; set; }
 
@@ -223,8 +223,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module. 
+        /// Gets or sets the SharedKey
-        /// If SharedKey changes while server is listening or clients are connected, disconnect and stop listening will be called
         /// </summary>
         public string SharedKey { get; set; }
 
@@ -248,7 +247,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Milliseconds before server expects another heartbeat. Set by property HeartbeatRequiredIntervalInSeconds which is driven from S+
+        /// Gets or sets the HeartbeatRequiredIntervalMs
         /// </summary>
         public int HeartbeatRequiredIntervalMs { get; set; }
 
@@ -258,7 +257,7 @@ namespace PepperDash.Core
         public ushort HeartbeatRequiredIntervalInSeconds { set { HeartbeatRequiredIntervalMs = (value * 1000); } }
 
         /// <summary>
-        /// String to Match for heartbeat. If null or empty any string will reset heartbeat timer
+        /// Gets or sets the HeartbeatStringToMatch
         /// </summary>
         public string HeartbeatStringToMatch { get; set; }
 
@@ -276,7 +275,7 @@ namespace PepperDash.Core
         public List<uint> ConnectedClientsIndexes = new List<uint>();
 
         /// <summary>
-        /// Defaults to 2000
+        /// Gets or sets the BufferSize
         /// </summary>
         public int BufferSize { get; set; }
 
@@ -339,7 +338,7 @@ namespace PepperDash.Core
 
         #region Methods - Server Actions
         /// <summary>
-        /// Disconnects all clients and stops the server
+        /// KillServer method
         /// </summary>
         public void KillServer()
         {
@@ -356,6 +355,9 @@ namespace PepperDash.Core
         /// Initialize Key for device using client name from SIMPL+. Called on Listen from SIMPL+
         /// </summary>
         /// <param name="key"></param>
+        /// <summary>
+        /// Initialize method
+        /// </summary>
         public void Initialize(string key)
         {
             Key = key;
@@ -395,7 +397,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Start listening on the specified port
+        /// Listen method
         /// </summary>
         public void Listen()
         {
@@ -453,7 +455,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Stop Listeneing
+        /// StopListening method
         /// </summary>
         public void StopListening()
         {
@@ -478,6 +480,9 @@ namespace PepperDash.Core
         /// Disconnects Client
         /// </summary>
         /// <param name="client"></param>
+        /// <summary>
+        /// DisconnectClient method
+        /// </summary>
         public void DisconnectClient(uint client)
         {
             try
@@ -491,7 +496,7 @@ namespace PepperDash.Core
             }
         }
         /// <summary>
-        /// Disconnect All Clients
+        /// DisconnectAllClientsForShutdown method
         /// </summary>
         public void DisconnectAllClientsForShutdown()
         {
@@ -533,6 +538,9 @@ namespace PepperDash.Core
         /// Broadcast text from server to all connected clients
         /// </summary>
         /// <param name="text"></param>
+        /// <summary>
+        /// BroadcastText method
+        /// </summary>
         public void BroadcastText(string text)
         {
             CCriticalSection CCBroadcast = new CCriticalSection();
@@ -566,6 +574,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="text"></param>
         /// <param name="clientIndex"></param>
+        /// <summary>
+        /// SendTextToClient method
+        /// </summary>
         public void SendTextToClient(string text, uint clientIndex)
         {
             try
@@ -634,6 +645,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="clientIndex"></param>
         /// <returns></returns>
+        /// <summary>
+        /// GetClientIPAddress method
+        /// </summary>
         public string GetClientIPAddress(uint clientIndex)
         {
             Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "GetClientIPAddress Index: {0}", clientIndex);

src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -36,13 +36,13 @@ namespace PepperDash.Core
         /// </summary>
         public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
-        ///// <summary>
+        /// <summary>
         ///// 
         ///// </summary>
         //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
 
         /// <summary>
-        /// Address of server
+        /// Gets or sets the Hostname
         /// </summary>
         public string Hostname { get; set; }
 
@@ -52,12 +52,12 @@ namespace PepperDash.Core
         public int Port { get; set; }
 
         /// <summary>
-        /// Username for server
+        /// Gets or sets the Username
         /// </summary>
         public string Username { get; set; }
 
         /// <summary>
-        /// And... Password for server.  That was worth documenting!
+        /// Gets or sets the Password
         /// </summary>
         public string Password { get; set; }
 
@@ -79,7 +79,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// 
+        /// Socket status change event
         /// </summary>
         public SocketStatus ClientStatus
         {
@@ -123,8 +123,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Millisecond value, determines the timeout period in between reconnect attempts.
+        /// Gets or sets the AutoReconnectIntervalMs
-        /// Set to 5000 by default
         /// </summary>
         public int AutoReconnectIntervalMs { get; set; }
 
@@ -147,31 +146,31 @@ namespace PepperDash.Core
             base(key)
         {
             StreamDebugging = new CommunicationStreamDebugging(key);
-			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
-			Key = key;
+            Key = key;
-			Hostname = hostname;
+            Hostname = hostname;
-			Port = port;
+            Port = port;
-			Username = username;
+            Username = username;
-			Password = password; 
+            Password = password;
-			AutoReconnectIntervalMs = 5000;
+            AutoReconnectIntervalMs = 5000;
 
             ReconnectTimer = new CTimer(o =>
-	            {
+                {
                     if (ConnectEnabled)
                     {
                         Connect();
                     }
-	            }, System.Threading.Timeout.Infinite);
+                }, System.Threading.Timeout.Infinite);
-		}
+        }
 
-		/// <summary>
+        /// <summary>
-		/// S+ Constructor - Must set all properties before calling Connect
+        /// S+ Constructor - Must set all properties before calling Connect
-		/// </summary>
+        /// </summary>
-		public GenericSshClient()
+        public GenericSshClient()
-			: base(SPlusKey)
+            : base(SPlusKey)
-		{
+        {
-			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
-			AutoReconnectIntervalMs = 5000;
+            AutoReconnectIntervalMs = 5000;
 
             ReconnectTimer = new CTimer(o =>
             {
@@ -180,25 +179,25 @@ namespace PepperDash.Core
                     Connect();
                 }
             }, System.Threading.Timeout.Infinite);
-		}
+        }
 
-		/// <summary>
+        /// <summary>
-		/// Handles closing this up when the program shuts down
+        /// Handles closing this up when the program shuts down
-		/// </summary>
+        /// </summary>
-		void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
-		{
+        {
-			if (programEventType == eProgramStatusEventType.Stopping)
+            if (programEventType == eProgramStatusEventType.Stopping)
-			{
+            {
-				if (Client != null)
+                if (Client != null)
-				{
+                {
-					this.LogDebug("Program stopping. Closing connection");
+                    this.LogDebug("Program stopping. Closing connection");
                     Disconnect();
                 }
             }
         }
 
         /// <summary>
-        /// Connect to the server, using the provided properties.
+        /// Connect method
         /// </summary>
         public void Connect()
         {
@@ -224,10 +223,7 @@ namespace PepperDash.Core
                     this.LogDebug("Attempting connect");
 
                     // Cancel reconnect if running.
-					if (ReconnectTimer != null)
+                    ReconnectTimer?.Stop();
-					{
-						ReconnectTimer.Stop();
-					}
 
                     // Cleanup the old client if it already exists
                     if (Client != null)
@@ -269,20 +265,26 @@ namespace PepperDash.Core
 
                         if (ie is SocketException)
                         {
-                            this.LogException(ie, "CONNECTION failure: Cannot reach host");                            
+                            this.LogError("CONNECTION failure: Cannot reach host");
+                            this.LogVerbose(ie, "Exception details: ");
                         }
 
                         if (ie is System.Net.Sockets.SocketException socketException)
                         {
-                            this.LogException(ie, "Connection failure: Cannot reach {host} on {port}",
+                            this.LogError("Connection failure: Cannot reach {host} on {port}",
                                 Hostname, Port);
+                            this.LogVerbose(socketException, "SocketException details: ");
                         }
                         if (ie is SshAuthenticationException)
                         {
-                            this.LogException(ie, "Authentication failure for username {userName}", Username);
+                            this.LogError("Authentication failure for username {userName}", Username);
+                            this.LogVerbose(ie, "AuthenticationException details: ");
                         }
                         else
-                            this.LogException(ie, "Error on connect");
+                        {
+                            this.LogError("Error on connect: {error}", ie.Message);
+                            this.LogVerbose(ie, "Exception details: ");
+                        }
 
                         DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
@@ -292,7 +294,7 @@ namespace PepperDash.Core
                             ReconnectTimer.Reset(AutoReconnectIntervalMs);
                         }
                     }
-                    catch(SshOperationTimeoutException ex)
+                    catch (SshOperationTimeoutException ex)
                     {
                         this.LogWarning("Connection attempt timed out: {message}", ex.Message);
 
@@ -307,7 +309,8 @@ namespace PepperDash.Core
                     catch (Exception e)
                     {
                         var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
-                        this.LogException(e, "Unhandled exception on connect");
+                        this.LogError("Unhandled exception on connect: {error}", e.Message);
+                        this.LogVerbose(e, "Exception details: ");
                         DisconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
                         if (AutoReconnect)
@@ -324,18 +327,18 @@ namespace PepperDash.Core
             }
         }
 
-		/// <summary>
+        /// <summary>
-		/// Disconnect the clients and put away it's resources.
+        /// Disconnect method
-		/// </summary>
+        /// </summary>
-		public void Disconnect()
+        public void Disconnect()
-		{
+        {
-			ConnectEnabled = false;
+            ConnectEnabled = false;
-			// Stop trying reconnects, if we are
+            // Stop trying reconnects, if we are
-			if (ReconnectTimer != null)
+            if (ReconnectTimer != null)
-			{
+            {
-				ReconnectTimer.Stop();
+                ReconnectTimer.Stop();
-				// ReconnectTimer = null;
+                // ReconnectTimer = null;
-			}
+            }
 
             KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
         }
@@ -361,7 +364,7 @@ namespace PepperDash.Core
             }
             catch (Exception ex)
             {
-               this.LogException(ex,"Exception in Kill Client");
+                this.LogException(ex, "Exception in Kill Client");
             }
         }
 
@@ -369,7 +372,7 @@ namespace PepperDash.Core
         /// Kills the stream
         /// </summary>
 		void KillStream()
-		{
+        {
             try
             {
                 if (TheStream != null)
@@ -385,59 +388,59 @@ namespace PepperDash.Core
             {
                 this.LogException(ex, "Exception in Kill Stream:{0}");
             }
-		}
+        }
 
-		/// <summary>
+        /// <summary>
-		/// Handles the keyboard interactive authentication, should it be required.
+        /// Handles the keyboard interactive authentication, should it be required.
-		/// </summary>
+        /// </summary>
-		void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
+        void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
-		{
+        {
-			foreach (AuthenticationPrompt prompt in e.Prompts)
+            foreach (AuthenticationPrompt prompt in e.Prompts)
-				if (prompt.Request.IndexOf("Password:", StringComparison.InvariantCultureIgnoreCase) != -1)
+                if (prompt.Request.IndexOf("Password:", StringComparison.InvariantCultureIgnoreCase) != -1)
-					prompt.Response = Password;
+                    prompt.Response = Password;
-		}
+        }
 
-		/// <summary>
+        /// <summary>
-		/// Handler for data receive on ShellStream.  Passes data across to queue for line parsing.
+        /// Handler for data receive on ShellStream.  Passes data across to queue for line parsing.
-		/// </summary>
+        /// </summary>
-		void Stream_DataReceived(object sender, ShellDataEventArgs e)
+        void Stream_DataReceived(object sender, ShellDataEventArgs e)
-		{
+        {
             if (((ShellStream)sender).Length <= 0L)
             {
                 return;
             }
             var response = ((ShellStream)sender).Read();
 
-			var bytesHandler = BytesReceived;
+            var bytesHandler = BytesReceived;
 
-		    if (bytesHandler != null)
+            if (bytesHandler != null)
-		    {
+            {
                 var bytes = Encoding.UTF8.GetBytes(response);
-		        if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
-		        {
+                {
-		            this.LogInformation("Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                    this.LogInformation("Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
-		        }
+                }
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
-		    }
+            }
 
-			var textHandler = TextReceived;
+            var textHandler = TextReceived;
-			if (textHandler != null)
+            if (textHandler != null)
-			{
+            {
                 if (StreamDebugging.RxStreamDebuggingIsEnabled)
                     this.LogInformation("Received: '{0}'", ComTextHelper.GetDebugText(response));
 
                 textHandler(this, new GenericCommMethodReceiveTextArgs(response));
             }
 
-		}
+        }
 
 
-		/// <summary>
+        /// <summary>
-		/// Error event handler for client events - disconnect, etc.  Will forward those events via ConnectionChange
+        /// Error event handler for client events - disconnect, etc.  Will forward those events via ConnectionChange
-		/// event
+        /// event
-		/// </summary>
+        /// </summary>
-		void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
+        void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
-		{
+        {
             CrestronInvoke.BeginInvoke(o =>
             {
                 if (e.Exception is SshConnectionException || e.Exception is System.Net.Sockets.SocketException)
@@ -466,55 +469,54 @@ namespace PepperDash.Core
         /// </summary>
         void OnConnectionChange()
         {
-            if (ConnectionChange != null)
+            ConnectionChange?.Invoke(this, new GenericSocketStatusChageEventArgs(this));
-                ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
         }
 
         #region IBasicCommunication Members
 
-		/// <summary>
+        /// <summary>
-		/// Sends text to the server
+        /// Sends text to the server
-		/// </summary>
+        /// </summary>
-		/// <param name="text"></param>
+        /// <param name="text">The text to send</param>
-		public void SendText(string text)
+        public void SendText(string text)
-		{
+        {
-		    try
+            try
-		    {
+            {
-		        if (Client != null && TheStream != null && IsConnected)
+                if (Client != null && TheStream != null && IsConnected)
-		        {
+                {
-		            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
-		                this.LogInformation(
+                        this.LogInformation(
-		                              "Sending {length} characters of text: '{text}'",
+                                      "Sending {length} characters of text: '{text}'",
-		                              text.Length,
+                                      text.Length,
-		                              ComTextHelper.GetDebugText(text));
+                                      ComTextHelper.GetDebugText(text));
 
-		            TheStream.Write(text);
+                    TheStream.Write(text);
-		            TheStream.Flush();
+                    TheStream.Flush();
-		        }
+                }
-		        else
+                else
-		        {
+                {
-		            this.LogDebug("Client is null or disconnected.  Cannot Send Text");
+                    this.LogDebug("Client is null or disconnected.  Cannot Send Text");
-		        }
+                }
-		    }
+            }
-		    catch (ObjectDisposedException)
+            catch (ObjectDisposedException)
             {
                 this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
                 ReconnectTimer.Reset();
-		    }
+            }
-			catch (Exception ex)
+            catch (Exception ex)
-			{
+            {
                 this.LogException(ex, "Exception sending text: '{message}'", text);
-			}
+            }
-		}
+        }
 
         /// <summary>
         /// Sends Bytes to the server
         /// </summary>
-        /// <param name="bytes"></param>
+        /// <param name="bytes">The bytes to send</param>
-		public void SendBytes(byte[] bytes)
+        public void SendBytes(byte[] bytes)
-		{
+        {
             try
             {
                 if (Client != null && TheStream != null && IsConnected)
@@ -541,37 +543,37 @@ namespace PepperDash.Core
             {
                 this.LogException(ex, "Exception sending {message}", ComTextHelper.GetEscapedText(bytes));
             }
-		}
+        }
-    #endregion
+        #endregion
 
-}
+    }
 
-//*****************************************************************************************************
+    //*****************************************************************************************************
-//*****************************************************************************************************
+    //*****************************************************************************************************
-/// <summary>
+    /// <summary>
-/// Fired when connection changes
+    /// Represents a SshConnectionChangeEventArgs
-/// </summary>
+    /// </summary>
-public class SshConnectionChangeEventArgs : EventArgs
+    public class SshConnectionChangeEventArgs : EventArgs
-	{
+    {
         /// <summary>
         /// Connection State
         /// </summary>
 		public bool IsConnected { get; private set; }
 
         /// <summary>
-        /// Connection Status represented as a ushort
+        /// Gets or sets the UIsConnected
         /// </summary>
-		public ushort UIsConnected { get { return (ushort)(Client.IsConnected ? 1 : 0); } }
+        public ushort UIsConnected { get { return (ushort)(Client.IsConnected ? 1 : 0); } }
 
         /// <summary>
-        /// The client
+        /// Gets or sets the Client
         /// </summary>
-		public GenericSshClient Client { get; private set; }
+        public GenericSshClient Client { get; private set; }
 
         /// <summary>
-        /// Socket Status as represented by
+        /// Gets or sets the Status
         /// </summary>
-		public ushort Status { get { return Client.UStatus; } }
+        public ushort Status { get { return Client.UStatus; } }
 
         /// <summary>
         ///  S+ Constructor

src/PepperDash.Core/Comm/GenericTcpIpClient.cs

@@ -59,7 +59,7 @@ namespace PepperDash.Core
 		}
 
         /// <summary>
-        /// Port on server
+        /// Gets or sets the Port
         /// </summary>
         public int Port { get; set; }
 
@@ -135,9 +135,9 @@ namespace PepperDash.Core
 		/// </summary>
 		public string ConnectionFailure { get { return ClientStatus.ToString(); } }
 
-		/// <summary>
+  /// <summary>
-		/// bool to track if auto reconnect should be set on the socket
+  /// Gets or sets the AutoReconnect
-		/// </summary>
+  /// </summary>
 		public bool AutoReconnect { get; set; }
 
         /// <summary>
@@ -232,7 +232,7 @@ namespace PepperDash.Core
 		}
 
         /// <summary>
-        /// Just to help S+ set the key
+        /// Initialize method
         /// </summary>
         public void Initialize(string key)
         {
@@ -255,6 +255,9 @@ namespace PepperDash.Core
         /// 
         /// </summary>
         /// <returns></returns>
+  /// <summary>
+  /// Deactivate method
+  /// </summary>
 		public override bool Deactivate()
 		{
             RetryTimer.Stop();
@@ -267,9 +270,9 @@ namespace PepperDash.Core
 			return true;
 		}
 
-        /// <summary>
+  /// <summary>
-        /// Attempts to connect to the server
+  /// Connect method
-        /// </summary>
+  /// </summary>
 		public void Connect()
 		{
             if (string.IsNullOrEmpty(Hostname))
@@ -334,9 +337,9 @@ namespace PepperDash.Core
             }
         }
 
-        /// <summary>
+  /// <summary>
-        /// Attempts to disconnect the client
+  /// Disconnect method
-        /// </summary>
+  /// </summary>
 		public void Disconnect()
 		{
             try
@@ -355,7 +358,7 @@ namespace PepperDash.Core
 		}
 
         /// <summary>
-        /// Does the actual disconnect business
+        /// DisconnectClient method
         /// </summary>
         public void DisconnectClient()
         {
@@ -446,9 +449,9 @@ namespace PepperDash.Core
             }
 		}
 
-		/// <summary>
+  /// <summary>
-		/// General send method
+  /// SendText method
-		/// </summary>
+  /// </summary>
 		public void SendText(string text)
 		{
 			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
@@ -459,9 +462,9 @@ namespace PepperDash.Core
 			    _client.SendData(bytes, bytes.Length);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// This is useful from console and...?
+  /// SendEscapedText method
-		/// </summary>
+  /// </summary>
 		public void SendEscapedText(string text)
 		{
 			var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
@@ -476,6 +479,9 @@ namespace PepperDash.Core
         /// Sends Bytes to the server
         /// </summary>
         /// <param name="bytes"></param>
+  /// <summary>
+  /// SendBytes method
+  /// </summary>
 		public void SendBytes(byte[] bytes)
 		{
             if (StreamDebugging.TxStreamDebuggingIsEnabled)
@@ -508,9 +514,9 @@ namespace PepperDash.Core
 		}
 	}
 
-    /// <summary>
+ /// <summary>
-    /// Configuration properties for TCP/SSH Connections
+ /// Represents a TcpSshPropertiesConfig
-    /// </summary>
+ /// </summary>
 	public class TcpSshPropertiesConfig
 	{
         /// <summary>
@@ -529,9 +535,9 @@ namespace PepperDash.Core
         /// Username credential
         /// </summary>
 		public string Username { get; set; }
-        /// <summary>
+  /// <summary>
-        /// Passord credential
+  /// Gets or sets the Password
-        /// </summary>
+  /// </summary>
 		public string Password { get; set; }
 
 		/// <summary>
@@ -539,14 +545,14 @@ namespace PepperDash.Core
 		/// </summary>
 		public int BufferSize { get; set; }
 
-		/// <summary>
+  /// <summary>
-		/// Defaults to true
+  /// Gets or sets the AutoReconnect
-		/// </summary>
+  /// </summary>
 		public bool AutoReconnect { get; set; }
 
-		/// <summary>
+  /// <summary>
-		/// Defaults to 5000ms
+  /// Gets or sets the AutoReconnectIntervalMs
-		/// </summary>
+  /// </summary>
 		public int AutoReconnectIntervalMs { get; set; }
 
         /// <summary>

src/PepperDash.Core/Comm/GenericTcpIpClient_ForServer.cs

@@ -69,7 +69,7 @@ namespace PepperDash.Core
         public string Hostname { get; set; }
 
         /// <summary>
-        /// Port on server
+        /// Gets or sets the Port
         /// </summary>
         public int Port { get; set; }
 
@@ -102,7 +102,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module
+        /// Gets or sets the SharedKey
         /// </summary>
         public string SharedKey { get; set; }
 
@@ -112,7 +112,7 @@ namespace PepperDash.Core
         private bool WaitingForSharedKeyResponse { get; set; }
 
         /// <summary>
-        /// Defaults to 2000
+        /// Gets or sets the BufferSize
         /// </summary>
         public int BufferSize { get; set; }
 
@@ -289,7 +289,7 @@ namespace PepperDash.Core
         #region Methods
 
         /// <summary>
-        /// Just to help S+ set the key
+        /// Initialize method
         /// </summary>
         public void Initialize(string key)
         {
@@ -311,7 +311,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Connect Method. Will return if already connected. Will write errors if missing address, port, or unique key/name.
+        /// Connect method
         /// </summary>
         public void Connect()
         {
@@ -442,7 +442,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// 
+        /// Disconnect method
         /// </summary>
         public void Disconnect()
         {
@@ -669,7 +669,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// General send method
+        /// SendText method
         /// </summary>
         public void SendText(string text)
         {
@@ -698,7 +698,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// 
+        /// SendBytes method
         /// </summary>
         public void SendBytes(byte[] bytes)
         {

src/PepperDash.Core/Comm/GenericTcpIpServer.cs

@@ -52,7 +52,7 @@ namespace PepperDash.Core
         public ServerHasChokedCallbackDelegate ServerHasChoked { get; set; }
 
         /// <summary>
-        /// 
+        /// Delegate for ServerHasChokedCallbackDelegate
         /// </summary>
         public delegate void ServerHasChokedCallbackDelegate();
 
@@ -82,7 +82,7 @@ namespace PepperDash.Core
         int MonitorClientFailureCount;
 
         /// <summary>
-        /// 3 by default
+        /// Gets or sets the MonitorClientMaxFailureCount
         /// </summary>
         public int MonitorClientMaxFailureCount { get; set; }
 
@@ -171,7 +171,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Port Server should listen on
+        /// Gets or sets the Port
         /// </summary>
         public int Port { get; set; }
 
@@ -204,8 +204,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module. 
+        /// Gets or sets the SharedKey
-        /// If SharedKey changes while server is listening or clients are connected, disconnect and stop listening will be called
         /// </summary>
         public string SharedKey { get; set; }
 
@@ -229,7 +228,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Milliseconds before server expects another heartbeat. Set by property HeartbeatRequiredIntervalInSeconds which is driven from S+
+        /// Gets or sets the HeartbeatRequiredIntervalMs
         /// </summary>
         public int HeartbeatRequiredIntervalMs { get; set; }
 
@@ -239,7 +238,7 @@ namespace PepperDash.Core
         public ushort HeartbeatRequiredIntervalInSeconds { set { HeartbeatRequiredIntervalMs = (value * 1000); } }
 
         /// <summary>
-        /// String to Match for heartbeat. If null or empty any string will reset heartbeat timer
+        /// Gets or sets the HeartbeatStringToMatch
         /// </summary>
         public string HeartbeatStringToMatch { get; set; }
 
@@ -257,7 +256,7 @@ namespace PepperDash.Core
         public List<uint> ConnectedClientsIndexes = new List<uint>();
 
         /// <summary>
-        /// Defaults to 2000
+        /// Gets or sets the BufferSize
         /// </summary>
         public int BufferSize { get; set; }
 
@@ -320,7 +319,7 @@ namespace PepperDash.Core
 
         #region Methods - Server Actions
         /// <summary>
-        /// Disconnects all clients and stops the server
+        /// KillServer method
         /// </summary>
         public void KillServer()
         {
@@ -337,6 +336,9 @@ namespace PepperDash.Core
         /// Initialize Key for device using client name from SIMPL+. Called on Listen from SIMPL+
         /// </summary>
         /// <param name="key"></param>
+        /// <summary>
+        /// Initialize method
+        /// </summary>
         public void Initialize(string key)
         {
             Key = key;
@@ -375,7 +377,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Start listening on the specified port
+        /// Listen method
         /// </summary>
         public void Listen()
         {
@@ -432,7 +434,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Stop Listening
+        /// StopListening method
         /// </summary>
         public void StopListening()
         {
@@ -457,6 +459,9 @@ namespace PepperDash.Core
         /// Disconnects Client
         /// </summary>
         /// <param name="client"></param>
+        /// <summary>
+        /// DisconnectClient method
+        /// </summary>
         public void DisconnectClient(uint client)
         {
             try
@@ -470,7 +475,7 @@ namespace PepperDash.Core
             }
         }
         /// <summary>
-        /// Disconnect All Clients
+        /// DisconnectAllClientsForShutdown method
         /// </summary>
         public void DisconnectAllClientsForShutdown()
         {
@@ -512,6 +517,9 @@ namespace PepperDash.Core
         /// Broadcast text from server to all connected clients
         /// </summary>
         /// <param name="text"></param>
+        /// <summary>
+        /// BroadcastText method
+        /// </summary>
         public void BroadcastText(string text)
         {
             CCriticalSection CCBroadcast = new CCriticalSection();
@@ -545,6 +553,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="text"></param>
         /// <param name="clientIndex"></param>
+        /// <summary>
+        /// SendTextToClient method
+        /// </summary>
         public void SendTextToClient(string text, uint clientIndex)
         {
             try
@@ -613,6 +624,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="clientIndex"></param>
         /// <returns>IP address of the client</returns>
+        /// <summary>
+        /// GetClientIPAddress method
+        /// </summary>
         public string GetClientIPAddress(uint clientIndex)
         {
             Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "GetClientIPAddress Index: {0}", clientIndex);

src/PepperDash.Core/Comm/GenericUdpServer.cs

@@ -150,6 +150,9 @@ namespace PepperDash.Core
         /// <param name="key"></param>
         /// <param name="address"></param>
         /// <param name="port"></param>
+        /// <summary>
+        /// Initialize method
+        /// </summary>
         public void Initialize(string key, string address, ushort port)
         {
             Key = key;
@@ -185,7 +188,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Enables the UDP Server
+        /// Connect method
         /// </summary>
         public void Connect()
         {
@@ -222,7 +225,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Disabled the UDP Server
+        /// Disconnect method
         /// </summary>
         public void Disconnect()
         {
@@ -292,6 +295,9 @@ namespace PepperDash.Core
         /// General send method
         /// </summary>
         /// <param name="text"></param>
+        /// <summary>
+        /// SendText method
+        /// </summary>
         public void SendText(string text)
         {
             var bytes = Encoding.GetEncoding(28591).GetBytes(text);
@@ -309,6 +315,9 @@ namespace PepperDash.Core
         /// 
         /// </summary>
         /// <param name="bytes"></param>
+        /// <summary>
+        /// SendBytes method
+        /// </summary>
         public void SendBytes(byte[] bytes)
         {
             if (StreamDebugging.TxStreamDebuggingIsEnabled)
@@ -320,9 +329,9 @@ namespace PepperDash.Core
 
     }
 
-    /// <summary>
+ /// <summary>
-    /// 
+ /// Represents a GenericUdpReceiveTextExtraArgs
-    /// </summary>
+ /// </summary>
 	public class GenericUdpReceiveTextExtraArgs : EventArgs
 	{
         /// <summary>

src/PepperDash.Core/Comm/TcpClientConfigObject.cs

@@ -3,7 +3,7 @@
 namespace PepperDash.Core
 {
     /// <summary>
-    /// Client config object for TCP client with server that inherits from TcpSshPropertiesConfig and adds properties for shared key and heartbeat
+    /// Represents a TcpClientConfigObject
     /// </summary>
     public class TcpClientConfigObject
     {

src/PepperDash.Core/Comm/eControlMethods.cs

@@ -74,6 +74,10 @@ namespace PepperDash.Core
         /// <summary>
         /// Secure TCP/IP
         /// </summary>
-        SecureTcpIp
+        SecureTcpIp,
+        /// <summary>
+        /// Used when comms needs to be handled in SIMPL and bridged opposite the normal direction
+        /// </summary>
+        ComBridge
     }
 }

src/PepperDash.Core/CommunicationExtras.cs

@@ -38,9 +38,9 @@ namespace PepperDash.Core
         void Disconnect();
     }
 
-	/// <summary>
+    /// <summary>
-	/// Represents a device that uses basic connection
+    /// Defines the contract for IBasicCommunication
-	/// </summary>
+    /// </summary>
     public interface IBasicCommunication : ICommunicationReceiver
 	{
         /// <summary>
@@ -147,9 +147,9 @@ namespace PepperDash.Core
 	/// </summary>
 	public class GenericCommMethodReceiveBytesArgs : EventArgs
 	{
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the Bytes
-        /// </summary>
+  /// </summary>
 		public byte[] Bytes { get; private set; }
 
         /// <summary>
@@ -228,6 +228,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="text"></param>
         /// <returns></returns>
+  /// <summary>
+  /// GetEscapedText method
+  /// </summary>
 		public static string GetEscapedText(string text)
 		{
 			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
@@ -239,6 +242,9 @@ namespace PepperDash.Core
         /// </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

@@ -67,6 +67,9 @@ namespace PepperDash.Core.Config
 		/// </summary>
 		/// <param name="doubleConfig"></param>
 		/// <returns></returns>
+  /// <summary>
+  /// MergeConfigs method
+  /// </summary>
 		public static JObject MergeConfigs(JObject doubleConfig)
 		{
 			var system = JObject.FromObject(doubleConfig["system"]);

src/PepperDash.Core/Conversion/Convert.cs

@@ -6,13 +6,22 @@ using Crestron.SimplSharp;
 
 namespace PepperDash.Core
 {
+    /// <summary>
+    /// Represents a EncodingHelper
+    /// </summary>
     public class EncodingHelper
     {
+        /// <summary>
+        /// ConvertUtf8ToAscii method
+        /// </summary>
         public static string ConvertUtf8ToAscii(string utf8String)
         {
             return Encoding.ASCII.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
         }
 
+        /// <summary>
+        /// ConvertUtf8ToUtf16 method
+        /// </summary>
         public static string ConvertUtf8ToUtf16(string utf8String)
         {
             return Encoding.Unicode.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);

src/PepperDash.Core/Device.cs

@@ -5,9 +5,9 @@ using Serilog.Events;
 namespace PepperDash.Core
 {
 	//*********************************************************************************************************
-	/// <summary>
+ /// <summary>
-	/// The core event and status-bearing class that most if not all device and connectors can derive from.
+ /// Represents a Device
-	/// </summary>
+ /// </summary>
 	public class Device : IKeyName
 	{
 
@@ -15,23 +15,23 @@ namespace PepperDash.Core
 		/// Unique Key
 		/// </summary>
 		public string Key { get; protected set; }
-		/// <summary>
+  /// <summary>
-		/// Name of the devie
+  /// Gets or sets the Name
-		/// </summary>
+  /// </summary>
 		public string Name { get; protected set; }
 		/// <summary>
 		/// 
 		/// </summary>
 		public bool Enabled { get; protected set; }
 
-		///// <summary>
+		/// <summary>
-		///// A place to store reference to the original config object, if any. These values should 
+		/// A place to store reference to the original config object, if any. These values should 
-		///// NOT be used as properties on the device as they are all publicly-settable values.
+		/// NOT be used as properties on the device as they are all publicly-settable values.
-		///// </summary>
+		/// </summary>
 		//public DeviceConfig Config { get; private set; }
-		///// <summary>
+		/// <summary>
-		///// Helper method to check if Config exists
+		/// Helper method to check if Config exists
-		///// </summary>
+		/// </summary>
 		//public bool HasConfig { get { return Config != null; } }
 
 		List<Action> _PreActivationActions;
@@ -86,6 +86,9 @@ namespace PepperDash.Core
 		/// Adds a post activation action
 		/// </summary>
 		/// <param name="act"></param>
+  /// <summary>
+  /// AddPostActivationAction method
+  /// </summary>
 		public void AddPostActivationAction(Action act)
 		{
 			if (_PostActivationActions == null)
@@ -93,9 +96,9 @@ namespace PepperDash.Core
 			_PostActivationActions.Add(act);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Executes the preactivation actions
+  /// PreActivate method
-		/// </summary>
+  /// </summary>
 		public void PreActivate()
 		{
 			if (_PreActivationActions != null)
@@ -112,11 +115,9 @@ namespace PepperDash.Core
 				});
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Gets this device ready to be used in the system. Runs any added pre-activation items, and
+  /// Activate method
-		/// all post-activation at end. Classes needing additional logic to 
+  /// </summary>
-		/// run should override CustomActivate()
-		/// </summary>
 		public bool Activate()
 		{
 			//if (_PreActivationActions != null)
@@ -127,9 +128,9 @@ namespace PepperDash.Core
 			return result;
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Executes the postactivation actions
+  /// PostActivate method
-		/// </summary>
+  /// </summary>
 		public void PostActivate()
 		{
 			if (_PostActivationActions != null)
@@ -152,6 +153,9 @@ namespace PepperDash.Core
 		/// do not need to call base.CustomActivate()
 		/// </summary>
 		/// <returns>true if device activated successfully.</returns>
+  /// <summary>
+  /// CustomActivate method
+  /// </summary>
 		public virtual bool CustomActivate() { return true; }
 
 		/// <summary>
@@ -184,6 +188,9 @@ namespace PepperDash.Core
         /// <remarks>The returned string is formatted as "{Key} - {Name}". If the <c>Name</c> property is
         /// null or empty,  "---" is used in place of the name.</remarks>
         /// <returns>A string that represents the object, containing the key and name in the format "{Key} - {Name}".</returns>
+  /// <summary>
+  /// ToString method
+  /// </summary>
 		public override string ToString()
 		{
 			return string.Format("{0} - {1}", Key, string.IsNullOrEmpty(Name) ? "---" : Name);

src/PepperDash.Core/EthernetHelper.cs

@@ -4,9 +4,9 @@ using Serilog.Events;
 
 namespace PepperDash.Core
 {
-    /// <summary>
+ /// <summary>
-    /// Class to help with accessing values from the CrestronEthernetHelper class 
+ /// Represents a EthernetHelper
-    /// </summary>
+ /// </summary>
 	public class EthernetHelper
 	{
 		/// <summary>
@@ -24,9 +24,9 @@ namespace PepperDash.Core
 
 		// ADD OTHER HELPERS HERE
 
-		/// <summary>
+  /// <summary>
-		/// 
+  /// Gets or sets the PortNumber
-		/// </summary>
+  /// </summary>
 		public int PortNumber { get; private set; }
 
 		private EthernetHelper(int portNumber)

src/PepperDash.Core/EventArgs.cs

@@ -16,19 +16,19 @@ namespace PepperDash.Core
 		/// </summary>
 		public bool State { get; set; }
 		
-		/// <summary>
+  /// <summary>
-		/// Boolean ushort value property
+  /// Gets or sets the IntValue
-		/// </summary>
+  /// </summary>
 		public ushort IntValue { get { return (ushort)(State ? 1 : 0); } }
 		
-		/// <summary>
+  /// <summary>
-		/// Boolean change event args type
+  /// Gets or sets the Type
-		/// </summary>
+  /// </summary>
 		public ushort Type { get; set; }
 		
-		/// <summary>
+  /// <summary>
-		/// Boolean change event args index
+  /// Gets or sets the Index
-		/// </summary>
+  /// </summary>
 		public ushort Index { get; set; }
 		
 		/// <summary>
@@ -64,9 +64,9 @@ namespace PepperDash.Core
 		}
 	}
 
-	/// <summary>
+ /// <summary>
-	/// Ushort change event args
+ /// Represents a UshrtChangeEventArgs
-	/// </summary>
+ /// </summary>
 	public class UshrtChangeEventArgs : EventArgs
 	{
 		/// <summary>
@@ -74,14 +74,14 @@ namespace PepperDash.Core
 		/// </summary>
 		public ushort IntValue { get; set; }
 		
-		/// <summary>
+  /// <summary>
-		/// Ushort change event args type
+  /// Gets or sets the Type
-		/// </summary>
+  /// </summary>
 		public ushort Type { get; set; }
 		
-		/// <summary>
+  /// <summary>
-		/// Ushort change event args index
+  /// Gets or sets the Index
-		/// </summary>
+  /// </summary>
 		public ushort Index { get; set; }
 		
 		/// <summary>
@@ -117,9 +117,9 @@ namespace PepperDash.Core
 		}
 	}
 
-	/// <summary>
+ /// <summary>
-	/// String change event args
+ /// Represents a StringChangeEventArgs
-	/// </summary>
+ /// </summary>
 	public class StringChangeEventArgs : EventArgs
 	{
 		/// <summary>
@@ -127,14 +127,14 @@ namespace PepperDash.Core
 		/// </summary>
 		public string StringValue { get; set; }
 
-		/// <summary>
+  /// <summary>
-		/// String change event args type
+  /// Gets or sets the Type
-		/// </summary>
+  /// </summary>
 		public ushort Type { get; set; }
 
-		/// <summary>
+  /// <summary>
-		/// string change event args index
+  /// Gets or sets the Index
-		/// </summary>
+  /// </summary>
 		public ushort Index { get; set; }
 
 		/// <summary>

src/PepperDash.Core/JsonStandardObjects/EventArgs and Constants.cs

@@ -32,14 +32,14 @@ namespace PepperDash.Core.JsonStandardObjects
 		/// </summary>
 		public DeviceConfig Device { get; set; }
 
-		/// <summary>
+  /// <summary>
-		/// Device change event args type
+  /// Gets or sets the Type
-		/// </summary>
+  /// </summary>
 		public ushort Type { get; set; }
 
-		/// <summary>
+  /// <summary>
-		/// Device change event args index
+  /// Gets or sets the Index
-		/// </summary>
+  /// </summary>
 		public ushort Index { get; set; }
 
 		/// <summary>

src/PepperDash.Core/JsonStandardObjects/JsonToSimplDevice.cs

@@ -58,6 +58,9 @@ namespace PepperDash.Core.JsonStandardObjects
 		/// </summary>
 		/// <param name="uniqueID"></param>
 		/// <param name="deviceKey"></param>
+  /// <summary>
+  /// Initialize method
+  /// </summary>
 		public void Initialize(string uniqueID, string deviceKey)
 		{
 			// S+ set EvaluateFb low

src/PepperDash.Core/JsonStandardObjects/JsonToSimplDeviceConfig.cs

@@ -47,14 +47,14 @@ namespace PepperDash.Core.JsonStandardObjects
 		]
 	}
 	*/
-	/// <summary>
+ /// <summary>
-	/// Device communication parameter class
+ /// Represents a ComParamsConfig
-	/// </summary>
+ /// </summary>
 	public class ComParamsConfig
 	{
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the baudRate
-        /// </summary>
+  /// </summary>
 		public int baudRate { get; set; }
         /// <summary>
         /// 
@@ -86,13 +86,13 @@ namespace PepperDash.Core.JsonStandardObjects
 		public int pacing { get; set; }
 
 		// convert properties for simpl
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the simplBaudRate
-        /// </summary>
+  /// </summary>
 		public ushort simplBaudRate { get { return Convert.ToUInt16(baudRate); } }
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the simplDataBits
-        /// </summary>
+  /// </summary>
 		public ushort simplDataBits { get { return Convert.ToUInt16(dataBits); } }
         /// <summary>
         /// 
@@ -143,13 +143,13 @@ namespace PepperDash.Core.JsonStandardObjects
 		public int autoReconnectIntervalMs { get; set; }
 
 		// convert properties for simpl
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the simplPort
-        /// </summary>
+  /// </summary>
 		public ushort simplPort { get { return Convert.ToUInt16(port); } }
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the simplAutoReconnect
-        /// </summary>
+  /// </summary>
 		public ushort simplAutoReconnect { get { return (ushort)(autoReconnect ? 1 : 0); } }
         /// <summary>
         /// 
@@ -192,9 +192,9 @@ namespace PepperDash.Core.JsonStandardObjects
 		public TcpSshPropertiesConfig tcpSshProperties { get; set; }
 
 		// convert properties for simpl
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the simplControlPortNumber
-        /// </summary>
+  /// </summary>
 		public ushort simplControlPortNumber { get { return Convert.ToUInt16(controlPortNumber); } }
 
 		/// <summary>
@@ -207,9 +207,9 @@ namespace PepperDash.Core.JsonStandardObjects
 		}
 	}
 
-	/// <summary>
+ /// <summary>
-	/// Device properties class
+ /// Represents a PropertiesConfig
-	/// </summary>
+ /// </summary>
 	public class PropertiesConfig
 	{
         /// <summary>
@@ -226,13 +226,13 @@ namespace PepperDash.Core.JsonStandardObjects
 		public ControlConfig control { get; set; }
 
 		// convert properties for simpl
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the simplDeviceId
-        /// </summary>
+  /// </summary>
 		public ushort simplDeviceId { get { return Convert.ToUInt16(deviceId); } }
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the simplEnabled
-        /// </summary>
+  /// </summary>
 		public ushort simplEnabled { get { return (ushort)(enabled ? 1 : 0); } }
 
 		/// <summary>

src/PepperDash.Core/JsonToSimpl/Constants.cs

@@ -88,9 +88,9 @@ namespace PepperDash.Core.JsonToSimpl
 	/// </summary>
 	public class SPlusValueWrapper
 	{
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the ValueType
-        /// </summary>
+  /// </summary>
 		public SPlusType ValueType { get; private set; }
         /// <summary>
         /// 
@@ -122,9 +122,9 @@ namespace PepperDash.Core.JsonToSimpl
 		}
 	}
 
-	/// <summary>
+ /// <summary>
-	/// S+ types enum
+ /// Enumeration of SPlusType values
-	/// </summary>
+ /// </summary>
 	public enum SPlusType
 	{
         /// <summary>

src/PepperDash.Core/JsonToSimpl/Global.cs

@@ -23,6 +23,9 @@ namespace PepperDash.Core.JsonToSimpl
 		/// </summary>
 		/// <param name="master">New master to add</param>
         /// 
+  /// <summary>
+  /// AddMaster method
+  /// </summary>
 		public static void AddMaster(JsonToSimplMaster master)
 		{
 			if (master == null)
@@ -49,9 +52,9 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Gets a master by its key.  Case-insensitive
+  /// GetMasterByFile method
-		/// </summary>
+  /// </summary>
 		public static JsonToSimplMaster GetMasterByFile(string file)
 		{
 			return Masters.FirstOrDefault(m => m.UniqueID.Equals(file, StringComparison.OrdinalIgnoreCase));

src/PepperDash.Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs

@@ -5,9 +5,9 @@ using Serilog.Events;
 
 namespace PepperDash.Core.JsonToSimpl
 {
-    /// <summary>
+ /// <summary>
-    /// Used to interact with an array of values with the S+ modules
+ /// Represents a JsonToSimplArrayLookupChild
-    /// </summary>
+ /// </summary>
 	public class JsonToSimplArrayLookupChild : JsonToSimplChildObjectBase
 	{
         /// <summary>
@@ -76,9 +76,10 @@ namespace PepperDash.Core.JsonToSimpl
 				PathSuffix == null ? "" : PathSuffix);
 		}
 
-        /// <summary>
+  /// <summary>
-        /// Process all values
+  /// ProcessAll method
-        /// </summary>
+  /// </summary>
+  /// <inheritdoc />
 		public override void ProcessAll()
 		{
 			if (FindInArray())

src/PepperDash.Core/JsonToSimpl/JsonToSimplChildObjectBase.cs

@@ -28,14 +28,14 @@ namespace PepperDash.Core.JsonToSimpl
         /// </summary>
 		public SPlusValuesDelegate GetAllValuesDelegate { get; set; }
 
-		/// <summary>
+  /// <summary>
-		/// Use a callback to reduce task switch/threading
+  /// Gets or sets the SetAllPathsDelegate
-		/// </summary>
+  /// </summary>
 		public SPlusValuesDelegate SetAllPathsDelegate { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// Unique identifier for instance
+  /// Gets or sets the Key
-        /// </summary>
+  /// </summary>
 		public string Key { get; protected set; }
 
 		/// <summary>
@@ -49,9 +49,9 @@ namespace PepperDash.Core.JsonToSimpl
 		/// </summary>
 		public string PathSuffix { get; protected set; }
 
-        /// <summary>
+  /// <summary>
-        /// Indicates if the instance is linked to an object
+  /// Gets or sets the LinkedToObject
-        /// </summary>
+  /// </summary>
 		public bool LinkedToObject { get; protected set; }
 
         /// <summary>
@@ -96,6 +96,9 @@ namespace PepperDash.Core.JsonToSimpl
         /// Sets the path prefix for the object
         /// </summary>
         /// <param name="pathPrefix"></param>
+  /// <summary>
+  /// SetPathPrefix method
+  /// </summary>
 		public void SetPathPrefix(string pathPrefix)
 		{
 			PathPrefix = pathPrefix;
@@ -110,9 +113,9 @@ namespace PepperDash.Core.JsonToSimpl
 			BoolPaths[index] = path;
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Set the JPath for a ushort out index.
+  /// SetUshortPath method
-		/// </summary>
+  /// </summary>
 		public void SetUshortPath(ushort index, string path)
 		{
 			Debug.Console(1, "JSON Child[{0}] SetUshortPath {1}={2}", Key, index, path);
@@ -120,9 +123,9 @@ namespace PepperDash.Core.JsonToSimpl
 			UshortPaths[index] = path;
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Set the JPath for a string output index. 
+  /// SetStringPath method
-		/// </summary>
+  /// </summary>
 		public void SetStringPath(ushort index, string path)
 		{
 			Debug.Console(1, "JSON Child[{0}] SetStringPath {1}={2}", Key, index, path);
@@ -130,10 +133,10 @@ namespace PepperDash.Core.JsonToSimpl
 			StringPaths[index] = path;
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Evalutates all outputs with defined paths. called by S+ when paths are ready to process
+  /// ProcessAll method
-		/// and by Master when file is read.
+  /// </summary>
-		/// </summary>
+  /// <inheritdoc />
 		public virtual void ProcessAll()
 		{
 			if (!LinkedToObject)
@@ -277,6 +280,9 @@ namespace PepperDash.Core.JsonToSimpl
         /// </summary>
         /// <param name="key"></param>
         /// <param name="theValue"></param>
+  /// <summary>
+  /// USetBoolValue method
+  /// </summary>
 		public void USetBoolValue(ushort key, ushort theValue)
 		{
 			SetBoolValue(key, theValue == 1);
@@ -287,6 +293,9 @@ namespace PepperDash.Core.JsonToSimpl
         /// </summary>
         /// <param name="key"></param>
         /// <param name="theValue"></param>
+  /// <summary>
+  /// SetBoolValue method
+  /// </summary>
 		public void SetBoolValue(ushort key, bool theValue)
 		{
 			if (BoolPaths.ContainsKey(key))
@@ -298,6 +307,9 @@ namespace PepperDash.Core.JsonToSimpl
         /// </summary>
         /// <param name="key"></param>
         /// <param name="theValue"></param>
+  /// <summary>
+  /// SetUShortValue method
+  /// </summary>
 		public void SetUShortValue(ushort key, ushort theValue)
 		{
 			if (UshortPaths.ContainsKey(key))
@@ -309,6 +321,9 @@ namespace PepperDash.Core.JsonToSimpl
         /// </summary>
         /// <param name="key"></param>
         /// <param name="theValue"></param>
+  /// <summary>
+  /// SetStringValue method
+  /// </summary>
 		public void SetStringValue(ushort key, string theValue)
 		{
 			if (StringPaths.ContainsKey(key))
@@ -320,6 +335,9 @@ namespace PepperDash.Core.JsonToSimpl
         /// </summary>
         /// <param name="keyPath"></param>
         /// <param name="valueToSave"></param>
+  /// <summary>
+  /// SetValueOnMaster method
+  /// </summary>
 		public void SetValueOnMaster(string keyPath, JValue valueToSave)
 		{
 			var path = GetFullPath(keyPath);

src/PepperDash.Core/JsonToSimpl/JsonToSimplFileMaster.cs

@@ -20,12 +20,12 @@ namespace PepperDash.Core.JsonToSimpl
         public string Filepath { get; private set; }
 
         /// <summary>
-        /// Filepath to the actual file that will be read (Portal or local)
+        /// Gets or sets the ActualFilePath
         /// </summary>
         public string ActualFilePath { get; private set; }
 
         /// <summary>
-        /// 
+        /// Gets or sets the Filename
         /// </summary>
         public string Filename { get; private set; }
         /// <summary>
@@ -194,6 +194,9 @@ namespace PepperDash.Core.JsonToSimpl
         /// Sets the debug level
         /// </summary>
         /// <param name="level"></param>
+        /// <summary>
+        /// setDebugLevel method
+        /// </summary>
         public void setDebugLevel(uint level)
         {
             Debug.SetDebugLevel(level);

src/PepperDash.Core/JsonToSimpl/JsonToSimplFixedPathObject.cs

@@ -2,9 +2,9 @@
 
 namespace PepperDash.Core.JsonToSimpl
 {
-    /// <summary>
+ /// <summary>
-    /// 
+ /// Represents a JsonToSimplFixedPathObject
-    /// </summary>
+ /// </summary>
 	public class JsonToSimplFixedPathObject : JsonToSimplChildObjectBase
 	{
         /// <summary>

src/PepperDash.Core/JsonToSimpl/JsonToSimplGenericMaster.cs

@@ -5,9 +5,9 @@ using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Core.JsonToSimpl
 {
-    /// <summary>
+ /// <summary>
-    /// Generic Master
+ /// Represents a JsonToSimplGenericMaster
-    /// </summary>
+ /// </summary>
 	public class JsonToSimplGenericMaster : JsonToSimplMaster
     {
 		/*****************************************************************************************/
@@ -20,9 +20,9 @@ namespace PepperDash.Core.JsonToSimpl
 		// To prevent multiple same-file access
 		static object WriteLock = new object();
 
-        /// <summary>
+  /// <summary>
-        /// Callback action for saving
+  /// Gets or sets the SaveCallback
-        /// </summary>
+  /// </summary>
 		public Action<string> SaveCallback { get; set; }
 
 		/*****************************************************************************************/
@@ -60,6 +60,9 @@ namespace PepperDash.Core.JsonToSimpl
 		/// Loads JSON into JsonObject, but does not trigger evaluation by children
 		/// </summary>
 		/// <param name="json"></param>
+  /// <summary>
+  /// SetJsonWithoutEvaluating method
+  /// </summary>
 		public void SetJsonWithoutEvaluating(string json)
 		{
 			try
@@ -72,9 +75,10 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 
-		/// <summary>
+  /// <summary>
-		/// 
+  /// Save method
-		/// </summary>
+  /// </summary>
+  /// <inheritdoc />
 		public override void Save()
 		{
 			// this code is duplicated in the other masters!!!!!!!!!!!!!

src/PepperDash.Core/JsonToSimpl/JsonToSimplMaster.cs

@@ -38,9 +38,9 @@ namespace PepperDash.Core.JsonToSimpl
 		/// </summary>
 		public string Key { get { return UniqueID; } }
 
-        /// <summary>
+  /// <summary>
-        /// A unique ID
+  /// Gets or sets the UniqueID
-        /// </summary>
+  /// </summary>
 		public string UniqueID { get; protected set; }
 
 		/// <summary>
@@ -53,10 +53,9 @@ namespace PepperDash.Core.JsonToSimpl
 		}
 		string _DebugName = "";
 
-		/// <summary>
+  /// <summary>
-		/// This will be prepended to all paths to allow path swapping or for more organized
+  /// Gets or sets the PathPrefix
-		/// sub-paths
+  /// </summary>
-		/// </summary>
 		public string PathPrefix { get; set; }
 
 		/// <summary>
@@ -83,9 +82,9 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the JsonObject
-        /// </summary>
+  /// </summary>
 		public JObject JsonObject { get; protected set; }
 
 		/*****************************************************************************************/
@@ -120,6 +119,9 @@ namespace PepperDash.Core.JsonToSimpl
 		/// Adds a child "module" to this master
 		/// </summary>
 		/// <param name="child"></param>
+  /// <summary>
+  /// AddChild method
+  /// </summary>
 		public void AddChild(JsonToSimplChildObjectBase child)
 		{
 			if (!Children.Contains(child))
@@ -128,9 +130,9 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Called from the child to add changed or new values for saving
+  /// AddUnsavedValue method
-		/// </summary>
+  /// </summary>
 		public void AddUnsavedValue(string path, JValue value)
 		{
 			if (UnsavedValues.ContainsKey(path))
@@ -179,6 +181,9 @@ namespace PepperDash.Core.JsonToSimpl
             /// </summary>
             /// <param name="json"></param>
             /// <returns></returns>
+   /// <summary>
+   /// ParseArray method
+   /// </summary>
 			public static JArray ParseArray(string json)
 			{
 				#if NET6_0

src/PepperDash.Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Core.JsonToSimpl
 		public string PortalFilepath { get; private set; }
 
         /// <summary>
-        /// File path of the actual file being read (Portal or local)
+        /// Gets or sets the ActualFilePath
         /// </summary>
         public string ActualFilePath { get; private set; }
 
@@ -128,6 +128,9 @@ namespace PepperDash.Core.JsonToSimpl
 		/// 
 		/// </summary>
 		/// <param name="level"></param>
+  /// <summary>
+  /// setDebugLevel method
+  /// </summary>
 		public void setDebugLevel(uint level)
 		{
 			Debug.SetDebugLevel(level);

src/PepperDash.Core/Logging/CrestronEnricher.cs

@@ -9,6 +9,9 @@ using System.Threading.Tasks;
 
 namespace PepperDash.Core.Logging
 {
+    /// <summary>
+    /// Represents a CrestronEnricher
+    /// </summary>
     public class CrestronEnricher : ILogEventEnricher
     {
         static readonly string _appName;
@@ -27,6 +30,9 @@ namespace PepperDash.Core.Logging
         }
             
 
+        /// <summary>
+        /// Enrich method
+        /// </summary>
         public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
         {
             var property = propertyFactory.CreateProperty("App", _appName);

src/PepperDash.Core/Logging/Debug.cs

@@ -1,4 +1,9 @@
-using Crestron.SimplSharp;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronDataStore;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.CrestronLogger;
@@ -11,15 +16,10 @@ 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
     {
@@ -48,6 +48,9 @@ namespace PepperDash.Core
 
         private static readonly LoggingLevelSwitch _fileLevelSwitch;
 
+        /// <summary>
+        /// Gets the minimum log level for the websocket sink.
+        /// </summary>
         public static LogEventLevel WebsocketMinimumLogLevel
         {
             get { return _websocketLoggingLevelSwitch.MinimumLevel; }
@@ -55,6 +58,9 @@ namespace PepperDash.Core
 
         private static readonly DebugWebsocketSink _websocketSink;
 
+        /// <summary>
+        /// Gets the websocket sink for debug logging.
+        /// </summary>
         public static DebugWebsocketSink WebsocketSink
         {
             get { return _websocketSink; }
@@ -78,12 +84,12 @@ namespace PepperDash.Core
         public static string FileName = string.Format(@"app{0}Debug.json", InitialParametersClass.ApplicationNumber);
 
         /// <summary>
-        /// Debug level to set for a given program.
+        /// Gets or sets the Level
         /// </summary>
         public static int Level { get; private set; }
 
         /// <summary>
-        /// When this is true, the configuration file will NOT be loaded until triggered by either a console command or a signal
+        /// Gets or sets the DoNotLoadConfigOnNextBoot
         /// </summary>
         public static bool DoNotLoadConfigOnNextBoot { get; private set; }
 
@@ -91,29 +97,33 @@ 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>
-        /// Version for the currently loaded PepperDashCore dll
+        /// Gets or sets the PepperDashCoreVersion
         /// </summary>
         public static string PepperDashCoreVersion { get; private set; }
 
         private static CTimer _saveTimer;
 
-		/// <summary>
+        /// <summary>
-		/// When true, the IncludedExcludedKeys dict will contain keys to include. 
+        /// When true, the IncludedExcludedKeys dict will contain keys to include. 
-		/// When false (default), IncludedExcludedKeys will contain keys to exclude.
+        /// When false (default), IncludedExcludedKeys will contain keys to exclude.
-		/// </summary>
+        /// </summary>
-		private static bool _excludeAllMode;
+        private static bool _excludeAllMode;
 
-		//static bool ExcludeNoKeyMessages;
+        private static readonly Dictionary<string, object> IncludedExcludedKeys;
-
-		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()
@@ -193,9 +203,9 @@ namespace PepperDash.Core
 
             CrestronConsole.PrintLine(msg);
 
-            LogMessage(LogEventLevel.Information,msg);
+            LogMessage(LogEventLevel.Information, msg);
 
-			IncludedExcludedKeys = new Dictionary<string, object>();
+            IncludedExcludedKeys = new Dictionary<string, object>();
 
             if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SimplSharpPro)
             {
@@ -212,8 +222,8 @@ namespace PepperDash.Core
                 CrestronConsole.AddNewConsoleCommand(s => CrestronLogger.Clear(false), "appdebugclear",
                     "appdebugclear:P Clears the current custom log",
                     ConsoleAccessLevelEnum.AccessOperator);
-				CrestronConsole.AddNewConsoleCommand(SetDebugFilterFromConsole, "appdebugfilter",
+                CrestronConsole.AddNewConsoleCommand(SetDebugFilterFromConsole, "appdebugfilter",
-					"appdebugfilter [params]", ConsoleAccessLevelEnum.AccessOperator);
+                    "appdebugfilter [params]", ConsoleAccessLevelEnum.AccessOperator);
             }
 
             CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
@@ -224,7 +234,7 @@ 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));
 
             _consoleLoggingLevelSwitch.MinimumLevelChanged += (sender, args) =>
@@ -233,6 +243,9 @@ namespace PepperDash.Core
             };
         }
 
+        /// <summary>
+        /// UpdateLoggerConfiguration method
+        /// </summary>
         public static void UpdateLoggerConfiguration(LoggerConfiguration config)
         {
             _loggerConfiguration = config;
@@ -240,6 +253,9 @@ namespace PepperDash.Core
             _logger = config.CreateLogger();
         }
 
+        /// <summary>
+        /// ResetLoggerConfiguration method
+        /// </summary>
         public static void ResetLoggerConfiguration()
         {
             _loggerConfiguration = _defaultLoggerConfiguration;
@@ -256,17 +272,21 @@ namespace PepperDash.Core
                 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, (int)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;
                 }
 
                 return (LogEventLevel)logLevel;
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 CrestronConsole.PrintLine($"Exception retrieving log level for {levelStoreKey}: {ex.Message}");
                 return LogEventLevel.Information;
@@ -278,7 +298,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)
             {
@@ -319,6 +339,9 @@ namespace PepperDash.Core
         /// Callback for console command
         /// </summary>
         /// <param name="levelString"></param>
+        /// <summary>
+        /// SetDebugFromConsole method
+        /// </summary>
         public static void SetDebugFromConsole(string levelString)
         {
             try
@@ -326,13 +349,13 @@ namespace PepperDash.Core
                 if (levelString.Trim() == "?")
                 {
                     CrestronConsole.ConsoleCommandResponse(
-                    $@"Used to set the minimum level of debug messages to be printed to the console:
+                    "Used to set the minimum level of debug messages to be printed to the console:\r\n" +
-{_logLevels[0]} = 0
+                    $"{_logLevels[0]} = 0\r\n" +
-{_logLevels[1]} = 1
+                    $"{_logLevels[1]} = 1\r\n" +
-{_logLevels[2]} = 2
+                    $"{_logLevels[2]} = 2\r\n" +
-{_logLevels[3]} = 3
+                    $"{_logLevels[3]} = 3\r\n" +
-{_logLevels[4]} = 4
+                    $"{_logLevels[4]} = 4\r\n" +
-{_logLevels[5]} = 5");
+                    $"{_logLevels[5]} = 5");
                     return;
                 }
 
@@ -342,18 +365,18 @@ namespace PepperDash.Core
                     return;
                 }
 
-                if(int.TryParse(levelString, out var levelInt))
+                if (int.TryParse(levelString, out var levelInt))
                 {
-                    if(levelInt < 0 || levelInt > 5)
+                    if (levelInt < 0 || levelInt > 5)
                     {
                         CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level. If using a number, value must be between 0-5");
                         return;
                     }
-                    SetDebugLevel((uint) levelInt);
+                    SetDebugLevel((uint)levelInt);
                     return;
                 }
 
-                if(Enum.TryParse<LogEventLevel>(levelString, out var levelEnum))
+                if (Enum.TryParse<LogEventLevel>(levelString, true, out var levelEnum))
                 {
                     SetDebugLevel(levelEnum);
                     return;
@@ -371,9 +394,12 @@ namespace PepperDash.Core
         /// Sets the debug level
         /// </summary>
         /// <param name="level"> Valid values 0-5</param>
+        /// <summary>
+        /// SetDebugLevel method
+        /// </summary>
         public static void SetDebugLevel(uint level)
         {
-            if(!_logLevels.TryGetValue(level, out var logLevel))
+            if (!_logLevels.TryGetValue(level, out var logLevel))
             {
                 logLevel = LogEventLevel.Information;
 
@@ -385,6 +411,9 @@ namespace PepperDash.Core
             SetDebugLevel(logLevel);
         }
 
+        /// <summary>
+        /// SetDebugLevel method
+        /// </summary>
         public static void SetDebugLevel(LogEventLevel level)
         {
             _consoleLoggingLevelSwitch.MinimumLevel = level;
@@ -392,9 +421,9 @@ namespace PepperDash.Core
             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}");
 
@@ -402,11 +431,14 @@ namespace PepperDash.Core
                 CrestronConsole.PrintLine($"Error saving console debug level setting: {err}");
         }
 
+        /// <summary>
+        /// SetWebSocketMinimumDebugLevel method
+        /// </summary>
         public static void SetWebSocketMinimumDebugLevel(LogEventLevel 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);
@@ -414,6 +446,9 @@ namespace PepperDash.Core
             LogMessage(LogEventLevel.Information, "Websocket debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
         }
 
+        /// <summary>
+        /// SetErrorLogMinimumDebugLevel method
+        /// </summary>
         public static void SetErrorLogMinimumDebugLevel(LogEventLevel level)
         {
             _errorLogLevelSwitch.MinimumLevel = level;
@@ -426,6 +461,9 @@ namespace PepperDash.Core
             LogMessage(LogEventLevel.Information, "Error log debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
         }
 
+        /// <summary>
+        /// SetFileMinimumDebugLevel method
+        /// </summary>
         public static void SetFileMinimumDebugLevel(LogEventLevel level)
         {
             _errorLogLevelSwitch.MinimumLevel = level;
@@ -442,6 +480,9 @@ namespace PepperDash.Core
         /// Callback for console command
         /// </summary>
         /// <param name="stateString"></param>
+        /// <summary>
+        /// SetDoNotLoadOnNextBootFromConsole method
+        /// </summary>
         public static void SetDoNotLoadOnNextBootFromConsole(string stateString)
         {
             try
@@ -464,80 +505,83 @@ namespace PepperDash.Core
         /// Callback for console command
         /// </summary>
         /// <param name="items"></param>
-		public static void SetDebugFilterFromConsole(string items)
+        /// <summary>
-		{
+        /// SetDebugFilterFromConsole method
-			var str = items.Trim();
+        /// </summary>
-			if (str == "?")
+        public static void SetDebugFilterFromConsole(string items)
-			{
+        {
-				CrestronConsole.ConsoleCommandResponse("Usage:\r APPDEBUGFILTER key1 key2 key3....\r " +
+            var str = items.Trim();
-					"+all: at beginning puts filter into 'default include' mode\r" +
+            if (str == "?")
-					"      All keys that follow will be excluded from output.\r" +
+            {
-					"-all: at beginning puts filter into 'default exclude all' mode.\r" +
+                CrestronConsole.ConsoleCommandResponse("Usage:\r APPDEBUGFILTER key1 key2 key3....\r " +
-					"      All keys that follow will be the only keys that are shown\r" +
+                    "+all: at beginning puts filter into 'default include' mode\r" +
-					"+nokey: Enables messages with no key (default)\r" +
+                    "      All keys that follow will be excluded from output.\r" +
-					"-nokey: Disables messages with no key.\r" +
+                    "-all: at beginning puts filter into 'default exclude all' mode.\r" +
-					"(nokey settings are independent of all other settings)");
+                    "      All keys that follow will be the only keys that are shown\r" +
-				return;
+                    "+nokey: Enables messages with no key (default)\r" +
-			}
+                    "-nokey: Disables messages with no key.\r" +
-			var keys = Regex.Split(str, @"\s*");
+                    "(nokey settings are independent of all other settings)");
-			foreach (var keyToken in keys)
+                return;
-			{
+            }
-				var lkey = keyToken.ToLower();
+            var keys = Regex.Split(str, @"\s*");
-				if (lkey == "+all")
+            foreach (var keyToken in keys)
-				{
+            {
-					IncludedExcludedKeys.Clear();
+                var lkey = keyToken.ToLower();
-					_excludeAllMode = false;
+                if (lkey == "+all")
-				}
+                {
-				else if (lkey == "-all")
+                    IncludedExcludedKeys.Clear();
-				{
+                    _excludeAllMode = false;
-					IncludedExcludedKeys.Clear();
+                }
-					_excludeAllMode = true;
+                else if (lkey == "-all")
-				}
+                {
-				//else if (lkey == "+nokey")
+                    IncludedExcludedKeys.Clear();
-				//{
+                    _excludeAllMode = true;
-				//    ExcludeNoKeyMessages = false;
+                }
-				//}
+                //else if (lkey == "+nokey")
-				//else if (lkey == "-nokey")
+                //{
-				//{
+                //    ExcludeNoKeyMessages = false;
-				//    ExcludeNoKeyMessages = true;
+                //}
-				//}
+                //else if (lkey == "-nokey")
-				else
+                //{
-				{
+                //    ExcludeNoKeyMessages = true;
-					string key;
+                //}
-					if (lkey.StartsWith("-"))
+                else
-					{
+                {
-						key = lkey.Substring(1);
+                    string key;
-						// if in exclude all mode, we need to remove this from the inclusions
+                    if (lkey.StartsWith("-"))
-						if (_excludeAllMode)
+                    {
-						{
+                        key = lkey.Substring(1);
-							if (IncludedExcludedKeys.ContainsKey(key))
+                        // if in exclude all mode, we need to remove this from the inclusions
-								IncludedExcludedKeys.Remove(key);
+                        if (_excludeAllMode)
-						}
+                        {
-						// otherwise include all mode, add to the exclusions
+                            if (IncludedExcludedKeys.ContainsKey(key))
-						else
+                                IncludedExcludedKeys.Remove(key);
-						{
+                        }
-							IncludedExcludedKeys[key] = new object();
+                        // otherwise include all mode, add to the exclusions
-						}
+                        else
-					}
+                        {
-					else if (lkey.StartsWith("+"))
+                            IncludedExcludedKeys[key] = new object();
-					{
+                        }
-						key = lkey.Substring(1);
+                    }
-						// if in exclude all mode, we need to add this as inclusion
+                    else if (lkey.StartsWith("+"))
-						if (_excludeAllMode)
+                    {
-						{
+                        key = lkey.Substring(1);
+                        // if in exclude all mode, we need to add this as inclusion
+                        if (_excludeAllMode)
+                        {
 
-							IncludedExcludedKeys[key] = new object();
+                            IncludedExcludedKeys[key] = new object();
-						}
+                        }
-						// otherwise include all mode, remove this from exclusions
+                        // otherwise include all mode, remove this from exclusions
-						else
+                        else
-						{
+                        {
-							if (IncludedExcludedKeys.ContainsKey(key))
+                            if (IncludedExcludedKeys.ContainsKey(key))
-								IncludedExcludedKeys.Remove(key);
+                                IncludedExcludedKeys.Remove(key);
-						}
+                        }
-					}
+                    }
-				}
+                }
-			}
+            }
-		}
+        }
 
 
 
@@ -559,6 +603,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="deviceKey"></param>
         /// <returns></returns>
+        /// <summary>
+        /// GetDeviceDebugSettingsForKey method
+        /// </summary>
         public static object GetDeviceDebugSettingsForKey(string deviceKey)
         {
             return _contexts.GetDebugSettingsForKey(deviceKey);
@@ -579,7 +626,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// 
+        /// ShowDebugLog method
         /// </summary>
         public static void ShowDebugLog(string s)
         {
@@ -595,6 +642,9 @@ namespace PepperDash.Core
         /// <param name="message">Message template</param>
         /// <param name="device">Optional IKeyed device. If provided, the Key of the device will be added to the log message</param>
         /// <param name="args">Args to put into message template</param>
+        /// <summary>
+        /// LogMessage method
+        /// </summary>
         public static void LogMessage(Exception ex, string message, IKeyed device = null, params object[] args)
         {
             using (LogContext.PushProperty("Key", device?.Key))
@@ -618,21 +668,36 @@ 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>
+        /// LogMessage method
+        /// </summary>
         public static void LogMessage(LogEventLevel level, Exception ex, string message, params object[] args)
         {
             _logger.Write(level, ex, message, args);
         }
 
+        /// <summary>
+        /// LogMessage method
+        /// </summary>
         public static void LogMessage(LogEventLevel level, IKeyed keyed, string message, params object[] args)
         {
             LogMessage(level, message, keyed, args);
         }
 
+        /// <summary>
+        /// LogMessage method
+        /// </summary>
         public static void LogMessage(LogEventLevel level, Exception ex, IKeyed device, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", device?.Key))
@@ -642,32 +707,47 @@ namespace PepperDash.Core
         }
 
         #region Explicit methods for logging levels
+        /// <summary>
+        /// LogVerbose method
+        /// </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);
             }
         }
 
+        /// <summary>
+        /// LogVerbose method
+        /// </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);
             }
         }
 
+        /// <summary>
+        /// LogVerbose method
+        /// </summary>
         public static void LogVerbose(string message, params object[] args)
         {
             _logger.Write(LogEventLevel.Verbose, message, args);
         }
 
+        /// <summary>
+        /// LogVerbose method
+        /// </summary>
         public static void LogVerbose(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Verbose, ex, null, message, args);
+            _logger.Write(LogEventLevel.Verbose, ex, message, args);
         }
 
+        /// <summary>
+        /// LogDebug method
+        /// </summary>
         public static void LogDebug(IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -676,6 +756,9 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogDebug method
+        /// </summary>
         public static void LogDebug(Exception ex, IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -684,16 +767,25 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogDebug method
+        /// </summary>
         public static void LogDebug(string message, params object[] args)
         {
             _logger.Write(LogEventLevel.Debug, message, args);
         }
 
+        /// <summary>
+        /// LogDebug method
+        /// </summary>
         public static void LogDebug(Exception ex, string message, params object[] args)
         {
             _logger.Write(LogEventLevel.Debug, ex, null, message, args);
         }
 
+        /// <summary>
+        /// LogInformation method
+        /// </summary>
         public static void LogInformation(IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -702,6 +794,9 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogInformation method
+        /// </summary>
         public static void LogInformation(Exception ex, IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -710,16 +805,25 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogInformation method
+        /// </summary>
         public static void LogInformation(string message, params object[] args)
         {
             _logger.Write(LogEventLevel.Information, message, args);
         }
 
+        /// <summary>
+        /// LogInformation method
+        /// </summary>
         public static void LogInformation(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Information, ex, null, message, args);
+            _logger.Write(LogEventLevel.Information, ex, message, args);
         }
 
+        /// <summary>
+        /// LogWarning method
+        /// </summary>
         public static void LogWarning(IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -728,6 +832,9 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogWarning method
+        /// </summary>
         public static void LogWarning(Exception ex, IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -736,16 +843,25 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogWarning method
+        /// </summary>
         public static void LogWarning(string message, params object[] args)
         {
             _logger.Write(LogEventLevel.Warning, message, args);
         }
 
+        /// <summary>
+        /// LogWarning method
+        /// </summary>
         public static void LogWarning(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Warning, ex, null, message, args);
+            _logger.Write(LogEventLevel.Warning, ex, message, args);
         }
 
+        /// <summary>
+        /// LogError method
+        /// </summary>
         public static void LogError(IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -754,6 +870,9 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogError method
+        /// </summary>
         public static void LogError(Exception ex, IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -762,16 +881,25 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogError method
+        /// </summary>
         public static void LogError(string message, params object[] args)
         {
             _logger.Write(LogEventLevel.Error, message, args);
         }
 
+        /// <summary>
+        /// LogError method
+        /// </summary>
         public static void LogError(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Error, ex, null, message, args);
+            _logger.Write(LogEventLevel.Error, ex, message, args);
         }
 
+        /// <summary>
+        /// LogFatal method
+        /// </summary>
         public static void LogFatal(IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -780,6 +908,9 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogFatal method
+        /// </summary>
         public static void LogFatal(Exception ex, IKeyed keyed, string message, params object[] args)
         {
             using (LogContext.PushProperty("Key", keyed?.Key))
@@ -788,14 +919,20 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// LogFatal method
+        /// </summary>
         public static void LogFatal(string message, params object[] args)
         {
             _logger.Write(LogEventLevel.Fatal, message, args);
         }
 
+        /// <summary>
+        /// LogFatal method
+        /// </summary>
         public static void LogFatal(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Fatal, ex, null, message, args);
+            _logger.Write(LogEventLevel.Fatal, ex, message, args);
         }
 
         #endregion
@@ -869,6 +1006,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)
         {
@@ -881,6 +1021,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);
@@ -999,11 +1142,11 @@ 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>
-        /// Error level to for message to be logged at
+        /// Enumeration of ErrorLogLevel values
         /// </summary>
         public enum ErrorLogLevel
         {

src/PepperDash.Core/Logging/DebugConsoleSink.cs

@@ -11,10 +11,16 @@ using System.Text;
 
 namespace PepperDash.Core
 {
+    /// <summary>
+    /// Represents a DebugConsoleSink
+    /// </summary>
     public class DebugConsoleSink : ILogEventSink
     {
         private readonly ITextFormatter _textFormatter;
 
+        /// <summary>
+        /// Emit method
+        /// </summary>
         public void Emit(LogEvent logEvent)
         {
             if (!Debug.IsRunningOnAppliance) return;            
@@ -44,6 +50,9 @@ namespace PepperDash.Core
 
     public static class DebugConsoleSinkExtensions
     {
+        /// <summary>
+        /// DebugConsoleSink method
+        /// </summary>
         public static LoggerConfiguration DebugConsoleSink(
                              this LoggerSinkConfiguration loggerConfiguration,
                                               ITextFormatter formatProvider = null)

src/PepperDash.Core/Logging/DebugContext.cs

@@ -19,9 +19,9 @@ namespace PepperDash.Core
         /// </summary>
         public string Key { get; private set; }
 
-        ///// <summary>
+        /// <summary>
-        ///// The name of the file containing the current debug settings.
+        /// The name of the file containing the current debug settings.
-        ///// </summary>
+        /// </summary>
         //string FileName = string.Format(@"\nvram\debug\app{0}Debug.json", InitialParametersClass.ApplicationNumber);
 
         DebugContextSaveData SaveData;
@@ -38,6 +38,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
+        /// <summary>
+        /// GetDebugContext method
+        /// </summary>
         public static DebugContext GetDebugContext(string key)
         {
             var context = Contexts.FirstOrDefault(c => c.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
@@ -92,6 +95,9 @@ namespace PepperDash.Core
         /// Callback for console command
         /// </summary>
         /// <param name="levelString"></param>
+        /// <summary>
+        /// SetDebugFromConsole method
+        /// </summary>
         public void SetDebugFromConsole(string levelString)
         {
             try
@@ -114,6 +120,9 @@ namespace PepperDash.Core
         /// Sets the debug level
         /// </summary>
         /// <param name="level"> Valid values 0 (no debug), 1 (critical), 2 (all messages)</param>
+        /// <summary>
+        /// SetDebugLevel method
+        /// </summary>
         public void SetDebugLevel(int level)
         {
             if (level <= 2)
@@ -141,7 +150,7 @@ namespace PepperDash.Core
         }
 
         /// <summary>
-        /// Appends a device Key to the beginning of a message
+        /// Console method
         /// </summary>
         public void Console(uint level, IKeyed dev, string format, params object[] items)
         {
@@ -191,6 +200,9 @@ namespace PepperDash.Core
         /// </summary>
         /// <param name="errorLogLevel"></param>
         /// <param name="str"></param>
+        /// <summary>
+        /// LogError method
+        /// </summary>
         public void LogError(Debug.ErrorLogLevel errorLogLevel, string str)
         {
             string msg = string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str);

src/PepperDash.Core/Logging/DebugCrestronLoggerSink.cs

@@ -5,8 +5,14 @@ using Serilog.Events;
 
 namespace PepperDash.Core.Logging
 {
+    /// <summary>
+    /// Represents a DebugCrestronLoggerSink
+    /// </summary>
     public class DebugCrestronLoggerSink : ILogEventSink
     {
+        /// <summary>
+        /// Emit method
+        /// </summary>
         public void Emit(LogEvent logEvent)
         {
             if (!Debug.IsRunningOnAppliance) return;

src/PepperDash.Core/Logging/DebugErrorLogSink.cs

@@ -11,6 +11,9 @@ using System.Threading.Tasks;
 
 namespace PepperDash.Core.Logging
 {
+    /// <summary>
+    /// Represents a DebugErrorLogSink
+    /// </summary>
     public class DebugErrorLogSink : ILogEventSink
     {
         private ITextFormatter _formatter;
@@ -24,6 +27,9 @@ namespace PepperDash.Core.Logging
             {LogEventLevel.Error, (msg) => ErrorLog.Error(msg) },
             {LogEventLevel.Fatal, (msg) => ErrorLog.Error(msg) }
         };
+        /// <summary>
+        /// Emit method
+        /// </summary>
         public void Emit(LogEvent logEvent)
         {
             string message;

src/PepperDash.Core/Logging/DebugExtensions.cs

@@ -1,74 +1,113 @@
-using Serilog.Events;
+using System;
-using System;
+using Serilog.Events;
 using Log = PepperDash.Core.Debug;
 
 namespace PepperDash.Core.Logging
 {
     public static class DebugExtensions
     {
+        /// <summary>
+        /// LogException method
+        /// </summary>
         public static void LogException(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogMessage(ex, message, device, args);
+            Log.LogMessage(ex, message, device: device, args);
         }
 
+        /// <summary>
+        /// LogVerbose method
+        /// </summary>
         public static void LogVerbose(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Verbose, ex, message, device, args);
+            Log.LogVerbose(ex, device, message, args);
         }
 
+        /// <summary>
+        /// LogVerbose method
+        /// </summary>
         public static void LogVerbose(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Verbose, device, message, args);
+            Log.LogVerbose(device, message, args);
         }
 
+        /// <summary>
+        /// LogDebug method
+        /// </summary>
         public static void LogDebug(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Debug, ex, message, device, args);
+            Log.LogDebug(ex, device, message, args);
         }
 
+        /// <summary>
+        /// LogDebug method
+        /// </summary>
         public static void LogDebug(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Debug, device, message, args);
+            Log.LogDebug(device, message, args);
         }
 
+        /// <summary>
+        /// LogInformation method
+        /// </summary>
         public static void LogInformation(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Information, ex, message, device, args);
+            Log.LogInformation(ex, device, message, args);
         }
 
+        /// <summary>
+        /// LogInformation method
+        /// </summary>
         public static void LogInformation(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Information, device, message, args);
+            Log.LogInformation(device, message, args);
         }
 
+        /// <summary>
+        /// LogWarning method
+        /// </summary>
         public static void LogWarning(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Warning, ex, message, device, args);
+            Log.LogWarning(ex, device, message, args);
         }
 
+        /// <summary>
+        /// LogWarning method
+        /// </summary>
         public static void LogWarning(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Warning, device, message, args);
+            Log.LogWarning(device, message, args);
         }
 
+        /// <summary>
+        /// LogError method
+        /// </summary>
         public static void LogError(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Error, ex, message, device, args);
+            Log.LogError(ex, device, message, args);
         }
 
+        /// <summary>
+        /// LogError method
+        /// </summary>
         public static void LogError(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Error, device, message, args);
+            Log.LogError(device, message, args);
         }
 
+        /// <summary>
+        /// LogFatal method
+        /// </summary>
         public static void LogFatal(this IKeyed device, Exception ex, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Fatal, ex, message, device, args);
+            Log.LogFatal(ex, device, message, args);
         }
 
+        /// <summary>
+        /// LogFatal method
+        /// </summary>
         public static void LogFatal(this IKeyed device, string message, params object[] args)
         {
-            Log.LogMessage(LogEventLevel.Fatal, device, message, args);
+            Log.LogFatal(device, message, args);
         }
     }
 }

src/PepperDash.Core/Logging/DebugMemory.cs

@@ -4,9 +4,9 @@ using Newtonsoft.Json;
 
 namespace PepperDash.Core.Logging
 {
-    /// <summary>
+ /// <summary>
-    /// Class to persist current Debug settings across program restarts
+ /// Represents a DebugContextCollection
-    /// </summary>
+ /// </summary>
 	public class DebugContextCollection
 	{
         /// <summary>
@@ -39,6 +39,9 @@ namespace PepperDash.Core.Logging
 		/// </summary>
 		/// <param name="contextKey"></param>
 		/// <param name="level"></param>
+  /// <summary>
+  /// SetLevel method
+  /// </summary>
 		public void SetLevel(string contextKey, int level)
 		{
 			if (level < 0 || level > 2)
@@ -51,6 +54,9 @@ namespace PepperDash.Core.Logging
 		/// </summary>
 		/// <param name="contextKey"></param>
 		/// <returns></returns>
+  /// <summary>
+  /// GetOrCreateItem method
+  /// </summary>
 		public DebugContextItem GetOrCreateItem(string contextKey)
 		{
 			if (!_items.ContainsKey(contextKey))
@@ -65,6 +71,9 @@ namespace PepperDash.Core.Logging
         /// <param name="deviceKey"></param>
         /// <param name="settings"></param>
         /// <returns></returns>
+        /// <summary>
+        /// SetDebugSettingsForKey method
+        /// </summary>
         public void SetDebugSettingsForKey(string deviceKey, object settings)
         {
             try
@@ -89,6 +98,9 @@ namespace PepperDash.Core.Logging
         /// </summary>
         /// <param name="deviceKey"></param>
         /// <returns></returns>
+        /// <summary>
+        /// GetDebugSettingsForKey method
+        /// </summary>
         public object GetDebugSettingsForKey(string deviceKey)
         {
             return DeviceDebugSettings[deviceKey];

src/PepperDash.Core/Logging/DebugWebsocketSink.cs

@@ -21,6 +21,9 @@ using Serilog.Formatting.Json;
 
 namespace PepperDash.Core
 {
+    /// <summary>
+    /// Represents a DebugWebsocketSink
+    /// </summary>
     public class DebugWebsocketSink : ILogEventSink
     {
         private HttpServer _httpsServer;
@@ -47,6 +50,9 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// Gets or sets the IsRunning
+        /// </summary>
         public bool IsRunning { get => _httpsServer?.IsListening ?? false; }
         
 
@@ -105,6 +111,9 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// Emit method
+        /// </summary>
         public void Emit(LogEvent logEvent)
         {
             if (_httpsServer == null || !_httpsServer.IsListening) return;
@@ -116,6 +125,9 @@ namespace PepperDash.Core
 
         }
 
+        /// <summary>
+        /// StartServerAndSetPort method
+        /// </summary>
         public void StartServerAndSetPort(int port)
         {
             Debug.Console(0, "Starting Websocket Server on port: {0}", port);
@@ -193,6 +205,9 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// StopServer method
+        /// </summary>
         public void StopServer()
         {
             Debug.Console(0, "Stopping Websocket Server");
@@ -204,6 +219,9 @@ namespace PepperDash.Core
 
     public static class DebugWebsocketSinkExtensions
     {
+        /// <summary>
+        /// DebugWebsocketSink method
+        /// </summary>
         public static LoggerConfiguration DebugWebsocketSink(
                              this LoggerSinkConfiguration loggerConfiguration,
                                               ITextFormatter formatProvider = null)
@@ -212,6 +230,9 @@ namespace PepperDash.Core
         }
     }
 
+    /// <summary>
+    /// Represents a DebugClient
+    /// </summary>
     public class DebugClient : WebSocketBehavior
     {
         private DateTime _connectionTime;

src/PepperDash.Core/PasswordManagement/PasswordClient.cs

@@ -2,9 +2,9 @@
 
 namespace PepperDash.Core.PasswordManagement
 {
-    /// <summary>
+ /// <summary>
-    /// A class to allow user interaction with the PasswordManager
+ /// Represents a PasswordClient
-    /// </summary>
+ /// </summary>
 	public class PasswordClient
 	{
 		/// <summary>
@@ -59,6 +59,9 @@ namespace PepperDash.Core.PasswordManagement
 		/// Retrieve password by index
 		/// </summary>
 		/// <param name="key"></param>
+  /// <summary>
+  /// GetPasswordByIndex method
+  /// </summary>
 		public void GetPasswordByIndex(ushort key)
 		{
 			OnUshrtChange((ushort)PasswordManager.Passwords.Count, 0, PasswordManagementConstants.PasswordManagerCountChange);
@@ -81,6 +84,9 @@ namespace PepperDash.Core.PasswordManagement
 		/// Password validation method
 		/// </summary>
 		/// <param name="password"></param>
+  /// <summary>
+  /// ValidatePassword method
+  /// </summary>
 		public void ValidatePassword(string password)
 		{
 			if (string.IsNullOrEmpty(password))
@@ -99,6 +105,9 @@ namespace PepperDash.Core.PasswordManagement
 		/// password against the selected password when the length of the 2 are equal
 		/// </summary>
 		/// <param name="data"></param>
+  /// <summary>
+  /// BuildPassword method
+  /// </summary>
 		public void BuildPassword(string data)
 		{
 			PasswordToValidate = String.Concat(PasswordToValidate, data);
@@ -108,9 +117,9 @@ namespace PepperDash.Core.PasswordManagement
 				ValidatePassword(PasswordToValidate);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Clears the user entered password and resets the LEDs
+  /// ClearPassword method
-		/// </summary>
+  /// </summary>
 		public void ClearPassword()
 		{
 			PasswordToValidate = "";

src/PepperDash.Core/PasswordManagement/PasswordManager.cs

@@ -4,9 +4,9 @@ using Crestron.SimplSharp;
 
 namespace PepperDash.Core.PasswordManagement
 {
-    /// <summary>
+ /// <summary>
-    /// Allows passwords to be stored and managed
+ /// Represents a PasswordManager
-    /// </summary>
+ /// </summary>
 	public class PasswordManager
 	{
 		/// <summary>
@@ -71,6 +71,9 @@ namespace PepperDash.Core.PasswordManagement
 		/// </summary>
 		/// <param name="key"></param>
 		/// <param name="password"></param>
+  /// <summary>
+  /// UpdatePassword method
+  /// </summary>
 		public void UpdatePassword(ushort key, string password)
 		{
 			// validate the parameters
@@ -152,6 +155,9 @@ namespace PepperDash.Core.PasswordManagement
 		/// Method to change the default timer value, (default 5000ms/5s)
 		/// </summary>
 		/// <param name="time"></param>
+  /// <summary>
+  /// PasswordTimerMs method
+  /// </summary>
 		public void PasswordTimerMs(ushort time)
 		{
 			PasswordTimerElapsedMs = Convert.ToInt64(time);

src/PepperDash.Core/SystemInfo/EventArgs and Constants.cs

@@ -68,9 +68,9 @@ namespace PepperDash.Core.SystemInfo
         public const ushort ProgramConfigChange = 305;
 	}
 
-	/// <summary>
+ /// <summary>
-	/// Processor Change Event Args Class
+ /// Represents a ProcessorChangeEventArgs
-	/// </summary>
+ /// </summary>
 	public class ProcessorChangeEventArgs : EventArgs
 	{
         /// <summary>
@@ -114,9 +114,9 @@ namespace PepperDash.Core.SystemInfo
 		}
 	}
 
-	/// <summary>
+ /// <summary>
-	/// Ethernet Change Event Args Class
+ /// Represents a EthernetChangeEventArgs
-	/// </summary>
+ /// </summary>
 	public class EthernetChangeEventArgs : EventArgs
 	{
         /// <summary>
@@ -165,9 +165,9 @@ namespace PepperDash.Core.SystemInfo
 		}
 	}
 
-	/// <summary>
+ /// <summary>
-	/// Control Subnet Chage Event Args Class
+ /// Represents a ControlSubnetChangeEventArgs
-	/// </summary>
+ /// </summary>
 	public class ControlSubnetChangeEventArgs : EventArgs
 	{
         /// <summary>
@@ -211,9 +211,9 @@ namespace PepperDash.Core.SystemInfo
 		}
 	}
 
-	/// <summary>
+ /// <summary>
-	/// Program Change Event Args Class
+ /// Represents a ProgramChangeEventArgs
-	/// </summary>
+ /// </summary>
 	public class ProgramChangeEventArgs : EventArgs
 	{
         /// <summary>

src/PepperDash.Core/SystemInfo/SystemInfoToSimpl.cs

@@ -100,9 +100,9 @@ namespace PepperDash.Core.SystemInfo
 			OnBoolChange(false, 0, SystemInfoConstants.BusyBoolChange);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Gets the current ethernet info
+  /// GetEthernetInfo method
-		/// </summary>
+  /// </summary>
 		public void GetEthernetInfo()
 		{
 			OnBoolChange(true, 0, SystemInfoConstants.BusyBoolChange);
@@ -161,9 +161,9 @@ namespace PepperDash.Core.SystemInfo
 			OnBoolChange(false, 0, SystemInfoConstants.BusyBoolChange);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Gets the current control subnet info
+  /// GetControlSubnetInfo method
-		/// </summary>
+  /// </summary>
 		public void GetControlSubnetInfo()
 		{
 			OnBoolChange(true, 0, SystemInfoConstants.BusyBoolChange);
@@ -206,6 +206,9 @@ namespace PepperDash.Core.SystemInfo
 		/// Gets the program info by index
 		/// </summary>
 		/// <param name="index"></param>
+  /// <summary>
+  /// GetProgramInfoByIndex method
+  /// </summary>
 		public void GetProgramInfoByIndex(ushort index)
 		{
 			if (index < 1 || index > 10)
@@ -263,9 +266,9 @@ namespace PepperDash.Core.SystemInfo
 			OnBoolChange(false, 0, SystemInfoConstants.BusyBoolChange);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Gets the processor uptime and passes it to S+
+  /// RefreshProcessorUptime method
-		/// </summary>
+  /// </summary>
 		public void RefreshProcessorUptime()
 		{
 			try
@@ -287,6 +290,9 @@ namespace PepperDash.Core.SystemInfo
 		/// Gets the program uptime, by index, and passes it to S+
 		/// </summary>
 		/// <param name="index"></param>
+  /// <summary>
+  /// RefreshProgramUptimeByIndex method
+  /// </summary>
 		public void RefreshProgramUptimeByIndex(int index)
 		{
 			try
@@ -308,6 +314,9 @@ namespace PepperDash.Core.SystemInfo
 		/// Sends command to console, passes response back using string change event
 		/// </summary>
 		/// <param name="cmd"></param>
+  /// <summary>
+  /// SendConsoleCommand method
+  /// </summary>
 		public void SendConsoleCommand(string cmd)
 		{
 			if (string.IsNullOrEmpty(cmd))

src/PepperDash.Core/Web/BouncyCertificate.cs

@@ -35,6 +35,9 @@ namespace PepperDash.Core
             return issuerCertificate;
         }
 
+        /// <summary>
+        /// IssueCertificate method
+        /// </summary>
         public X509Certificate2 IssueCertificate(string subjectName, X509Certificate2 issuerCertificate, string[] subjectAlternativeNames, KeyPurposeID[] usages)
         {
             // It's self-signed, so these are the same.
@@ -56,6 +59,9 @@ namespace PepperDash.Core
             return ConvertCertificate(certificate, subjectKeyPair, random);
         }
 
+        /// <summary>
+        /// CreateCertificateAuthorityCertificate method
+        /// </summary>
         public X509Certificate2 CreateCertificateAuthorityCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
         {
             // It's self-signed, so these are the same.
@@ -78,6 +84,9 @@ namespace PepperDash.Core
             return ConvertCertificate(certificate, subjectKeyPair, random);
         }
 
+        /// <summary>
+        /// CreateSelfSignedCertificate method
+        /// </summary>
         public X509Certificate2 CreateSelfSignedCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
         {
             // It's self-signed, so these are the same.
@@ -305,6 +314,9 @@ namespace PepperDash.Core
             return convertedCertificate;
         }
 
+        /// <summary>
+        /// WriteCertificate method
+        /// </summary>
         public void WriteCertificate(X509Certificate2 certificate, string outputDirectory, string certName)
         {
             // This password is the one attached to the PFX file. Use 'null' for no password.
@@ -332,6 +344,9 @@ namespace PepperDash.Core
                 }
             }
         }
+        /// <summary>
+        /// AddCertToStore method
+        /// </summary>
         public bool AddCertToStore(X509Certificate2 cert, System.Security.Cryptography.X509Certificates.StoreName st, System.Security.Cryptography.X509Certificates.StoreLocation sl)
         {
             bool bRet = false;

src/PepperDash.Core/Web/RequestHandlers/DefaultRequestHandler.cs

@@ -2,9 +2,9 @@
 
 namespace PepperDash.Core.Web.RequestHandlers
 {
-	/// <summary>
+ /// <summary>
-	/// Web API default request handler
+ /// Represents a DefaultRequestHandler
-	/// </summary>
+ /// </summary>
 	public class DefaultRequestHandler : WebApiBaseRequestHandler
 	{
 		/// <summary>

src/PepperDash.Core/Web/RequestHandlers/WebApiBaseRequestAsyncHandler.cs

@@ -142,6 +142,9 @@ namespace PepperDash.Core.Web.RequestHandlers
         /// Process request
         /// </summary>
         /// <param name="context"></param>
+        /// <summary>
+        /// ProcessRequest method
+        /// </summary>
         public void ProcessRequest(HttpCwsContext context)
         {
             if (!_handlers.TryGetValue(context.Request.HttpMethod, out Func<HttpCwsContext, Task> handler))

src/PepperDash.Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs

@@ -144,6 +144,9 @@ namespace PepperDash.Core.Web.RequestHandlers
 		/// Process request
 		/// </summary>
 		/// <param name="context"></param>
+  /// <summary>
+  /// ProcessRequest method
+  /// </summary>
 		public void ProcessRequest(HttpCwsContext context)
 		{
 			Action<HttpCwsContext> handler;

src/PepperDash.Core/Web/WebApiServer.cs

@@ -25,24 +25,24 @@ namespace PepperDash.Core.Web
 		private readonly CCriticalSection _serverLock = new CCriticalSection();
 		private HttpCwsServer _server;
 
-		/// <summary>
+  /// <summary>
-		/// Web API server key
+  /// Gets or sets the Key
-		/// </summary>
+  /// </summary>
 		public string Key { get; private set; }
 
-		/// <summary>
+  /// <summary>
-		/// Web API server name
+  /// Gets or sets the Name
-		/// </summary>
+  /// </summary>
 		public string Name { get; private set; }
 
-		/// <summary>
+  /// <summary>
-		/// CWS base path, will default to "/api" if not set via initialize method
+  /// Gets or sets the BasePath
-		/// </summary>
+  /// </summary>
 		public string BasePath { get; private set; }
 
-		/// <summary>
+  /// <summary>
-		/// Indicates CWS is registered with base path
+  /// Gets or sets the IsRegistered
-		/// </summary>
+  /// </summary>
 		public bool IsRegistered { get; private set; }
 
 		/// <summary>
@@ -137,9 +137,9 @@ namespace PepperDash.Core.Web
 			Start();
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Initializes CWS class
+  /// Initialize method
-		/// </summary>
+  /// </summary>
 		public void Initialize(string key, string basePath)
 		{
 			Key = key;
@@ -165,6 +165,9 @@ namespace PepperDash.Core.Web
 		/// Removes a route from CWS
 		/// </summary>
 		/// <param name="route"></param>
+  /// <summary>
+  /// RemoveRoute method
+  /// </summary>
 		public void RemoveRoute(HttpCwsRoute route)
 		{
 			if (route == null)
@@ -176,9 +179,9 @@ namespace PepperDash.Core.Web
 			_server.Routes.Remove(route);
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Returns a list of the current routes
+  /// GetRouteCollection method
-		/// </summary>
+  /// </summary>
 		public HttpCwsRouteCollection GetRouteCollection()
 		{
 			return _server.Routes;
@@ -222,9 +225,9 @@ namespace PepperDash.Core.Web
 			}
 		}
 
-		/// <summary>
+  /// <summary>
-		/// Stop CWS instance
+  /// Stop method
-		/// </summary>
+  /// </summary>
 		public void Stop()
 		{
 			try

src/PepperDash.Core/WebApi/Presets/Preset.cs

@@ -2,9 +2,9 @@
 
 namespace PepperDash.Core.WebApi.Presets
 {
-    /// <summary>
+ /// <summary>
-    /// Represents a preset
+ /// Represents a Preset
-    /// </summary>
+ /// </summary>
 	public class Preset
 	{
         /// <summary>
@@ -12,29 +12,29 @@ namespace PepperDash.Core.WebApi.Presets
         /// </summary>
 		public int Id { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// User ID
+  /// Gets or sets the UserId
-        /// </summary>
+  /// </summary>
 		public int UserId { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// Room Type ID
+  /// Gets or sets the RoomTypeId
-        /// </summary>
+  /// </summary>
 		public int RoomTypeId { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// Preset Name
+  /// Gets or sets the PresetName
-        /// </summary>
+  /// </summary>
 		public string PresetName { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// Preset Number
+  /// Gets or sets the PresetNumber
-        /// </summary>
+  /// </summary>
 		public int PresetNumber { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// Preset Data
+  /// Gets or sets the Data
-        /// </summary>
+  /// </summary>
 		public string Data { get; set; }
 
         /// <summary>
@@ -48,9 +48,9 @@ namespace PepperDash.Core.WebApi.Presets
 		}
 	}
 
-	/// <summary>
+ /// <summary>
-	/// 
+ /// Represents a PresetReceivedEventArgs
-	/// </summary>
+ /// </summary>
 	public class PresetReceivedEventArgs : EventArgs
 	{
         /// <summary>
@@ -59,12 +59,12 @@ namespace PepperDash.Core.WebApi.Presets
         public bool LookupSuccess { get; private set; }
         
         /// <summary>
-        /// S+ helper
+        /// Gets or sets the ULookupSuccess
         /// </summary>
         public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
 
         /// <summary>
-        /// The preset
+        /// Gets or sets the Preset
         /// </summary>
         public Preset Preset { get; private set; }
 

src/PepperDash.Core/WebApi/Presets/User.cs

@@ -16,19 +16,19 @@ namespace PepperDash.Core.WebApi.Presets
         /// </summary>
 		public int Id { get; set; }
 		
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the ExternalId
-        /// </summary>
+  /// </summary>
 		public string ExternalId { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the FirstName
-        /// </summary>
+  /// </summary>
 		public string FirstName { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the LastName
-        /// </summary>
+  /// </summary>
 		public string LastName { get; set; }
 	}
 
@@ -44,13 +44,13 @@ namespace PepperDash.Core.WebApi.Presets
         public bool LookupSuccess { get; private set; }
 
         /// <summary>
-        /// For stupid S+
+        /// Gets or sets the ULookupSuccess
         /// </summary>
         public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
 
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the User
-        /// </summary>
+  /// </summary>
 		public User User { get; private set; }
 
 		/// <summary>
@@ -70,9 +70,9 @@ namespace PepperDash.Core.WebApi.Presets
 		}
 	}
 
-	/// <summary>
+ /// <summary>
-	/// 
+ /// Represents a UserAndRoomMessage
-	/// </summary>
+ /// </summary>
 	public class UserAndRoomMessage
 	{
         /// <summary>
@@ -80,14 +80,14 @@ namespace PepperDash.Core.WebApi.Presets
         /// </summary>
 		public int UserId { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the RoomTypeId
-        /// </summary>
+  /// </summary>
 		public int RoomTypeId { get; set; }
 
-        /// <summary>
+  /// <summary>
-        /// 
+  /// Gets or sets the PresetNumber
-        /// </summary>
+  /// </summary>
 		public int PresetNumber { get; set; }
 	}
 }

src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs

@@ -25,9 +25,9 @@ namespace PepperDash.Core.WebApi.Presets
         /// </summary>
 		public event EventHandler<PresetReceivedEventArgs> PresetReceived;
 
-        /// <summary>
+  /// <summary>
-        /// Unique identifier for this instance
+  /// Gets or sets the Key
-        /// </summary>
+  /// </summary>
 		public string Key { get; private set; }
 
 		//string JsonMasterKey;
@@ -77,6 +77,9 @@ namespace PepperDash.Core.WebApi.Presets
         /// Gets the user for a passcode
         /// </summary>
         /// <param name="passcode"></param>
+  /// <summary>
+  /// GetUserForPasscode method
+  /// </summary>
 		public void GetUserForPasscode(string passcode)
 		{
             // Bullshit duplicate code here... These two cases should be the same 
@@ -115,6 +118,9 @@ namespace PepperDash.Core.WebApi.Presets
 		/// </summary>
 		/// <param name="roomTypeId"></param>
 		/// <param name="presetNumber"></param>
+  /// <summary>
+  /// GetPresetForThisUser method
+  /// </summary>
 		public void GetPresetForThisUser(int roomTypeId, int presetNumber)
 		{
 			if (CurrentUser == null)
@@ -212,6 +218,9 @@ namespace PepperDash.Core.WebApi.Presets
 		/// </summary>
 		/// <param name="roomTypeId"></param>
 		/// <param name="presetNumber"></param>
+  /// <summary>
+  /// SavePresetForThisUser method
+  /// </summary>
 		public void SavePresetForThisUser(int roomTypeId, int presetNumber)
 		{
 			if (CurrentPreset == null)

src/PepperDash.Core/XSigUtility/Tokens/XSigAnalogToken.cs

@@ -59,6 +59,9 @@ namespace PepperDash.Core.Intersystem.Tokens
         /// </summary>
         /// <param name="offset"></param>
         /// <returns></returns>
+        /// <summary>
+        /// GetTokenWithOffset method
+        /// </summary>
         public override XSigToken GetTokenWithOffset(int offset)
         {
             if (offset == 0) return this;
@@ -69,6 +72,10 @@ namespace PepperDash.Core.Intersystem.Tokens
         /// 
         /// </summary>
         /// <returns></returns>
+        /// <summary>
+        /// ToString method
+        /// </summary>
+        /// <inheritdoc />
         public override string ToString()
         {
             return Index + " = 0x" + Value.ToString("X4");
@@ -80,6 +87,9 @@ namespace PepperDash.Core.Intersystem.Tokens
         /// <param name="format"></param>
         /// <param name="formatProvider"></param>
         /// <returns></returns>
+        /// <summary>
+        /// ToString method
+        /// </summary>
         public string ToString(string format, IFormatProvider formatProvider)
         {
             return Value.ToString(format, formatProvider);

src/PepperDash.Core/XSigUtility/Tokens/XSigDigitalToken.cs

@@ -57,6 +57,9 @@ namespace PepperDash.Core.Intersystem.Tokens
         /// </summary>
         /// <param name="offset"></param>
         /// <returns></returns>
+        /// <summary>
+        /// GetTokenWithOffset method
+        /// </summary>
         public override XSigToken GetTokenWithOffset(int offset)
         {
             if (offset == 0) return this;
@@ -67,6 +70,10 @@ namespace PepperDash.Core.Intersystem.Tokens
         /// 
         /// </summary>
         /// <returns></returns>
+        /// <summary>
+        /// ToString method
+        /// </summary>
+        /// <inheritdoc />
         public override string ToString()
         {
             return Index + " = " + (Value ? "High" : "Low");
@@ -77,6 +84,9 @@ namespace PepperDash.Core.Intersystem.Tokens
         /// </summary>
         /// <param name="formatProvider"></param>
         /// <returns></returns>
+        /// <summary>
+        /// ToString method
+        /// </summary>
         public string ToString(IFormatProvider formatProvider)
         {
             return Value.ToString(formatProvider);

src/PepperDash.Core/XSigUtility/Tokens/XSigSerialToken.cs

@@ -63,6 +63,9 @@ namespace PepperDash.Core.Intersystem.Tokens
         /// </summary>
         /// <param name="offset"></param>
         /// <returns></returns>
+        /// <summary>
+        /// GetTokenWithOffset method
+        /// </summary>
         public override XSigToken GetTokenWithOffset(int offset)
         {
             if (offset == 0) return this;
@@ -73,6 +76,10 @@ namespace PepperDash.Core.Intersystem.Tokens
         /// 
         /// </summary>
         /// <returns></returns>
+        /// <summary>
+        /// ToString method
+        /// </summary>
+        /// <inheritdoc />
         public override string ToString()
         {
             return Index + " = \"" + Value + "\"";

src/PepperDash.Core/XSigUtility/XSigHelpers.cs

@@ -52,6 +52,9 @@ namespace PepperDash.Core.Intersystem
         /// </summary>
         /// <param name="xSigSerialization">XSig state resolver.</param>
         /// <returns>Bytes in XSig format for each token within the state representation.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(IXSigSerialization xSigSerialization)
         {
             return GetBytes(xSigSerialization, 0);
@@ -63,6 +66,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="xSigSerialization">XSig state resolver.</param>
         /// <param name="offset">Offset to which the data will be aligned.</param>
         /// <returns>Bytes in XSig format for each token within the state representation.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(IXSigSerialization xSigSerialization, int offset)
         {
             var tokens = xSigSerialization.Serialize();
@@ -82,6 +88,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="index">1-based digital index</param>
         /// <param name="value">Digital data to be encoded</param>
         /// <returns>Bytes in XSig format for digtial information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int index, bool value)
         {
             return GetBytes(index, 0, value);
@@ -94,6 +103,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="offset">Index offset.</param>
         /// <param name="value">Digital data to be encoded</param>
         /// <returns>Bytes in XSig format for digtial information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int index, int offset, bool value)
         {
             return new XSigDigitalToken(index + offset, value).GetBytes();
@@ -105,6 +117,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="startIndex">Starting index of the sequence.</param>
         /// <param name="values">Digital signal value array.</param>
         /// <returns>Byte sequence in XSig format for digital signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int startIndex, bool[] values)
         {
             return GetBytes(startIndex, 0, values);
@@ -117,6 +132,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="offset">Index offset.</param>
         /// <param name="values">Digital signal value array.</param>
         /// <returns>Byte sequence in XSig format for digital signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int startIndex, int offset, bool[] values)
         {
             // Digital XSig data is 2 bytes per value
@@ -134,6 +152,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="index">1-based analog index</param>
         /// <param name="value">Analog data to be encoded</param>
         /// <returns>Bytes in XSig format for analog signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int index, ushort value)
         {
             return GetBytes(index, 0, value);
@@ -146,6 +167,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="offset">Index offset.</param>
         /// <param name="value">Analog data to be encoded</param>
         /// <returns>Bytes in XSig format for analog signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int index, int offset, ushort value)
         {
             return new XSigAnalogToken(index + offset, value).GetBytes();
@@ -157,6 +181,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="startIndex">Starting index of the sequence.</param>
         /// <param name="values">Analog signal value array.</param>
         /// <returns>Byte sequence in XSig format for analog signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int startIndex, ushort[] values)
         {
             return GetBytes(startIndex, 0, values);
@@ -169,6 +196,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="offset">Index offset.</param>
         /// <param name="values">Analog signal value array.</param>
         /// <returns>Byte sequence in XSig format for analog signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int startIndex, int offset, ushort[] values)
         {
             // Analog XSig data is 4 bytes per value
@@ -186,6 +216,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="index">1-based serial index</param>
         /// <param name="value">Serial data to be encoded</param>
         /// <returns>Bytes in XSig format for serial signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int index, string value)
         {
             return GetBytes(index, 0, value);
@@ -198,6 +231,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="offset">Index offset.</param>
         /// <param name="value">Serial data to be encoded</param>
         /// <returns>Bytes in XSig format for serial signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int index, int offset, string value)
         {
             return new XSigSerialToken(index + offset, value).GetBytes();
@@ -209,6 +245,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="startIndex">Starting index of the sequence.</param>
         /// <param name="values">Serial signal value array.</param>
         /// <returns>Byte sequence in XSig format for serial signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int startIndex, string[] values)
         {
             return GetBytes(startIndex, 0, values);
@@ -221,6 +260,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="offset">Index offset.</param>
         /// <param name="values">Serial signal value array.</param>
         /// <returns>Byte sequence in XSig format for serial signal information.</returns>
+        /// <summary>
+        /// GetBytes method
+        /// </summary>
         public static byte[] GetBytes(int startIndex, int offset, string[] values)
         {
             // Serial XSig data is not fixed-length like the other formats

src/PepperDash.Core/XSigUtility/XSigTokenStreamReader.cs

@@ -48,6 +48,9 @@ namespace PepperDash.Core.Intersystem
         /// <param name="stream">Input stream</param>
         /// <param name="value">Result</param>
         /// <returns>True if successful, otherwise false.</returns>
+        /// <summary>
+        /// TryReadUInt16BE method
+        /// </summary>
         public static bool TryReadUInt16BE(Stream stream, out ushort value)
         {
             value = 0;
@@ -65,6 +68,9 @@ namespace PepperDash.Core.Intersystem
         /// </summary>
         /// <returns>XSigToken</returns>
         /// <exception cref="ArgumentOutOfRangeException">Offset is less than 0.</exception>
+        /// <summary>
+        /// ReadXSigToken method
+        /// </summary>
         public XSigToken ReadXSigToken()
         {
             ushort prefix;
@@ -114,6 +120,9 @@ namespace PepperDash.Core.Intersystem
         /// Reads all available XSig tokens from the stream.
         /// </summary>
         /// <returns>XSigToken collection.</returns>
+        /// <summary>
+        /// ReadAllXSigTokens method
+        /// </summary>
         public IEnumerable<XSigToken> ReadAllXSigTokens()
         {
             var tokens = new List<XSigToken>();

src/PepperDash.Core/XSigUtility/XSigTokenStreamWriter.cs

@@ -47,6 +47,9 @@ namespace PepperDash.Core.Intersystem
         /// Write XSig data gathered from an IXSigStateResolver to the stream.
         /// </summary>
         /// <param name="xSigSerialization">IXSigStateResolver object.</param>
+        /// <summary>
+        /// WriteXSigData method
+        /// </summary>
         public void WriteXSigData(IXSigSerialization xSigSerialization)
         {
             WriteXSigData(xSigSerialization, 0);
@@ -57,6 +60,9 @@ namespace PepperDash.Core.Intersystem
         /// </summary>
         /// <param name="xSigSerialization">IXSigStateResolver object.</param>
         /// <param name="offset">Index offset for each XSigToken.</param>
+        /// <summary>
+        /// WriteXSigData method
+        /// </summary>
         public void WriteXSigData(IXSigSerialization xSigSerialization, int offset)
         {
             if (xSigSerialization == null)
@@ -70,6 +76,9 @@ namespace PepperDash.Core.Intersystem
         /// Write XSigToken to the stream.
         /// </summary>
         /// <param name="token">XSigToken object.</param>
+        /// <summary>
+        /// WriteXSigData method
+        /// </summary>
         public void WriteXSigData(XSigToken token)
         {
             WriteXSigData(token, 0);
@@ -80,6 +89,9 @@ namespace PepperDash.Core.Intersystem
         /// </summary>
         /// <param name="token">XSigToken object.</param>
         /// <param name="offset">Index offset for each XSigToken.</param>
+        /// <summary>
+        /// WriteXSigData method
+        /// </summary>
         public void WriteXSigData(XSigToken token, int offset)
         {
             WriteXSigData(new[] { token }, offset);
@@ -108,6 +120,9 @@ namespace PepperDash.Core.Intersystem
         /// </summary>
         /// <param name="tokens">XSigToken objects.</param>
         /// <param name="offset">Index offset for each XSigToken.</param>
+        /// <summary>
+        /// WriteXSigData method
+        /// </summary>
         public void WriteXSigData(IEnumerable<XSigToken> tokens, int offset)
         {
             if (offset < 0)
@@ -125,7 +140,7 @@ namespace PepperDash.Core.Intersystem
         }
 
         /// <summary>
-        /// Disposes of the internal stream if specified to not leave open.
+        /// Dispose method
         /// </summary>
         public void Dispose()
         {

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

@@ -2,14 +2,12 @@
 
 using System;
 using System.Collections.Generic;
-using Crestron.SimplSharp;
 using System.Reflection;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.EthernetCommunication;
-
 using Newtonsoft.Json;
-
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
@@ -31,7 +29,7 @@ namespace PepperDash.Essentials.Core.Bridges
     }
 
     /// <summary>
-    /// Bridge API using EISC
+    /// Represents a EiscApiAdvanced
     /// </summary>
     public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
     {
@@ -60,12 +58,19 @@ namespace PepperDash.Essentials.Core.Bridges
             AddPostActivationAction(RegisterEisc);
         }
 
+        /// <summary>
+        /// CustomActivate method
+        /// </summary>
+        /// <inheritdoc />
         public override bool CustomActivate()
         {
             CommunicationMonitor.Start();
             return base.CustomActivate();
         }
 
+        /// <summary>
+        /// Deactivate method
+        /// </summary>
         public override bool Deactivate()
         {
             CommunicationMonitor.Stop();
@@ -123,6 +128,9 @@ namespace PepperDash.Essentials.Core.Bridges
             Debug.LogMessage(LogEventLevel.Debug, this, "EISC registration successful");
         }
 
+        /// <summary>
+        /// LinkRooms method
+        /// </summary>
         public void LinkRooms()
         {
             Debug.LogMessage(LogEventLevel.Debug, this, "Linking Rooms...");
@@ -153,6 +161,9 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="deviceKey"></param>
         /// <param name="joinMap"></param>
+        /// <summary>
+        /// AddJoinMap method
+        /// </summary>
         public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
         {
             if (!JoinMaps.ContainsKey(deviceKey))
@@ -166,8 +177,9 @@ namespace PepperDash.Essentials.Core.Bridges
         }
 
         /// <summary>
-        /// Prints all the join maps on this bridge
+        /// PrintJoinMaps method
         /// </summary>
+        /// <inheritdoc />
         public virtual void PrintJoinMaps()
         {
             CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));
@@ -179,8 +191,9 @@ namespace PepperDash.Essentials.Core.Bridges
             }
         }
         /// <summary>
-        /// Generates markdown for all join maps on this bridge
+        /// MarkdownForBridge method
         /// </summary>
+        /// <inheritdoc />
         public virtual void MarkdownForBridge(string bridgeKey)
         {
             Debug.LogMessage(LogEventLevel.Information, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
@@ -196,6 +209,9 @@ namespace PepperDash.Essentials.Core.Bridges
         /// Prints the join map for a device by key
         /// </summary>
         /// <param name="deviceKey"></param>
+        /// <summary>
+        /// PrintJoinMapForDevice method
+        /// </summary>
         public void PrintJoinMapForDevice(string deviceKey)
         {
             var joinMap = JoinMaps[deviceKey];
@@ -213,6 +229,9 @@ namespace PepperDash.Essentials.Core.Bridges
         /// Prints the join map for a device by key
         /// </summary>
         /// <param name="deviceKey"></param>
+        /// <summary>
+        /// MarkdownJoinMapForDevice method
+        /// </summary>
         public void MarkdownJoinMapForDevice(string deviceKey, string bridgeKey)
         {
             var joinMap = JoinMaps[deviceKey];
@@ -233,6 +252,9 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <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
@@ -318,49 +340,91 @@ namespace PepperDash.Essentials.Core.Bridges
 
         #region Implementation of ICommunicationMonitor
 
+        /// <summary>
+        /// Gets or sets the CommunicationMonitor
+        /// </summary>
         public StatusMonitorBase CommunicationMonitor { get; private set; }
 
         #endregion
     }
 
+    /// <summary>
+    /// Represents a EiscApiPropertiesConfig
+    /// </summary>
     public class EiscApiPropertiesConfig
     {
+        /// <summary>
+        /// Gets or sets the Control
+        /// </summary>
         [JsonProperty("control")]
         public EssentialsControlPropertiesConfig Control { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Devices
+        /// </summary>
         [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Rooms
+        /// </summary>
         [JsonProperty("rooms")]
         public List<ApiRoomPropertiesConfig> Rooms { get; set; }
 
 
+        /// <summary>
+        /// Represents a ApiDevicePropertiesConfig
+        /// </summary>
         public class ApiDevicePropertiesConfig
         {
+            /// <summary>
+            /// Gets or sets the DeviceKey
+            /// </summary>
             [JsonProperty("deviceKey")]
             public string DeviceKey { get; set; }
 
+            /// <summary>
+            /// Gets or sets the JoinStart
+            /// </summary>
             [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
+            /// <summary>
+            /// Gets or sets the JoinMapKey
+            /// </summary>
             [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 
+        /// <summary>
+        /// Represents a ApiRoomPropertiesConfig
+        /// </summary>
         public class ApiRoomPropertiesConfig
         {
+            /// <summary>
+            /// Gets or sets the RoomKey
+            /// </summary>
             [JsonProperty("roomKey")]
             public string RoomKey { get; set; }
 
+            /// <summary>
+            /// Gets or sets the JoinStart
+            /// </summary>
             [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
+            /// <summary>
+            /// Gets or sets the JoinMapKey
+            /// </summary>
             [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 
     }
 
+    /// <summary>
+    /// Represents a EiscApiAdvancedFactory
+    /// </summary>
     public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
     {
         public EiscApiAdvancedFactory()
@@ -368,6 +432,10 @@ namespace PepperDash.Essentials.Core.Bridges
             TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
         }
 
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
+        /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
             Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new EiscApiAdvanced Device");

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

@@ -34,6 +34,9 @@ namespace PepperDash.Essentials.Core.Bridges
                 bridge.PrintJoinMaps();
             }
         }
+        /// <summary>
+        /// JoinmapMarkdown method
+        /// </summary>
         public static void JoinmapMarkdown(string command)
         {
             var targets = command.Split(' ');

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

@@ -3,10 +3,17 @@
 namespace PepperDash.Essentials.Core.Bridges
 {
     /// <summary>
-    /// Defines a device that uses JoinMapBaseAdvanced for its join map
+    /// Defines the contract for IBridgeAdvanced
     /// </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

@@ -2,6 +2,9 @@ using System;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a AirMediaControllerJoinMap
+    /// </summary>
     public class AirMediaControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("IsOnline")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a AppleTvJoinMap
+    /// </summary>
     public class AppleTvJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("UpArrow")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a C2nRthsControllerJoinMap
+    /// </summary>
     public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("IsOnline")]

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

@@ -3,7 +3,7 @@
 namespace PepperDash.Essentials.Core.Bridges
 {
     /// <summary>
-    /// Join map for CameraBase devices
+    /// Represents a CameraControllerJoinMap
     /// </summary>
     public class CameraControllerJoinMap : JoinMapBaseAdvanced
     {

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a CenOdtOccupancySensorBaseJoinMap
+    /// </summary>
     public class CenOdtOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
     {
         #region Digitals

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a DisplayControllerJoinMap
+    /// </summary>
     public class DisplayControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("Name")]

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

@@ -1,6 +1,9 @@
 using System;
 
 namespace PepperDash.Essentials.Core.Bridges {
+    /// <summary>
+    /// Represents a DmBladeChassisControllerJoinMap
+    /// </summary>
     public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced {
 
         [JoinName("IsOnline")]

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

@@ -2,6 +2,9 @@ using System;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a DmChassisControllerJoinMap
+    /// </summary>
     public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("EnableAudioBreakaway")]

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

@@ -2,6 +2,9 @@ using System;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a DmRmcControllerJoinMap
+    /// </summary>
     public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("IsOnline")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a DmTxControllerJoinMap
+    /// </summary>
     public class DmTxControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("IsOnline")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a DmpsAudioOutputControllerJoinMap
+    /// </summary>
     public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced
     {
 

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a DmpsMicrophoneControllerJoinMap
+    /// </summary>
     public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("MicGain")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a DmpsRoutingControllerJoinMap
+    /// </summary>
     public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("EnableRouting")]

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

@@ -3,6 +3,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a GenericLightingJoinMap
+    /// </summary>
     public class GenericLightingJoinMap : JoinMapBaseAdvanced
     {
 

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a GenericRelayControllerJoinMap
+    /// </summary>
     public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
     {
 

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a GlsOccupancySensorBaseJoinMap
+    /// </summary>
     public class GlsOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("IsOnline")]

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

@@ -3,6 +3,9 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
+    /// <summary>
+    /// Represents a GlsPartitionSensorJoinMap
+    /// </summary>
     public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
     {
 

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a HdMdNxM4kEControllerJoinMap
+    /// </summary>
     public class HdMdNxM4kEControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("Name")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a HdMdxxxCEControllerJoinMap
+    /// </summary>
     public class HdMdxxxCEControllerJoinMap : JoinMapBaseAdvanced
     {
 

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

@@ -3,6 +3,9 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+ /// <summary>
+ /// Represents a HdPsXxxControllerJoinMap
+ /// </summary>
 	public class HdPsXxxControllerJoinMap : JoinMapBaseAdvanced
 	{
 

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a Hrxxx0WirelessRemoteControllerJoinMap
+    /// </summary>
     public class Hrxxx0WirelessRemoteControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("Power")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a IAnalogInputJoinMap
+    /// </summary>
     public class IAnalogInputJoinMap : JoinMapBaseAdvanced
     {
 

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a IBasicCommunicationJoinMap
+    /// </summary>
     public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("TextReceived")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a IDigitalInputJoinMap
+    /// </summary>
     public class IDigitalInputJoinMap : JoinMapBaseAdvanced
     {
 

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a IDigitalOutputJoinMap
+    /// </summary>
     public class IDigitalOutputJoinMap : JoinMapBaseAdvanced
     {
 

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a PduJoinMapBase
+    /// </summary>
     public class PduJoinMapBase : JoinMapBaseAdvanced
     {
         [JoinName("Name")]

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

@@ -3,6 +3,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a SetTopBoxControllerJoinMap
+    /// </summary>
     public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("PowerOn")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a StatusSignControllerJoinMap
+    /// </summary>
     public class StatusSignControllerJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("IsOnline")]

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

@@ -2,6 +2,9 @@
 
 namespace PepperDash.Essentials.Core.Bridges
 {
+    /// <summary>
+    /// Represents a SystemMonitorJoinMap
+    /// </summary>
     public class SystemMonitorJoinMap : JoinMapBaseAdvanced
     {
         [JoinName("TimeZone")]

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

@@ -2,6 +2,9 @@ using System;
 using PepperDash.Essentials.Core;
 namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
+ /// <summary>
+ /// Represents a VideoCodecControllerJoinMap
+ /// </summary>
 	public class VideoCodecControllerJoinMap : JoinMapBaseAdvanced
 	{
 		#region Digital

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

@@ -12,13 +12,22 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
+ /// <summary>
+ /// Represents a CecPortController
+ /// </summary>
 	public class CecPortController : 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; } }
 
         ICec Port;
@@ -74,6 +83,9 @@ namespace PepperDash.Essentials.Core
 
         #region IBasicCommunication Members
 
+        /// <summary>
+        /// SendText method
+        /// </summary>
         public void SendText(string text)
         {
             if (Port == null)
@@ -83,6 +95,9 @@ namespace PepperDash.Essentials.Core
             Port.StreamCec.Send.StringValue = text;
         }
 
+        /// <summary>
+        /// SendBytes method
+        /// </summary>
         public void SendBytes(byte[] bytes)
         {
             if (Port == null)
@@ -93,10 +108,16 @@ namespace PepperDash.Essentials.Core
             Port.StreamCec.Send.StringValue = text;
         }
 
+        /// <summary>
+        /// Connect method
+        /// </summary>
         public void Connect()
         {
         }
 
+        /// <summary>
+        /// Disconnect method
+        /// </summary>
         public void Disconnect()
         {
         }
@@ -107,6 +128,9 @@ namespace PepperDash.Essentials.Core
         /// 
         /// </summary>
         /// <param name="s"></param>
+        /// <summary>
+        /// SimulateReceive method
+        /// </summary>
         public void SimulateReceive(string s)
         {
             // split out hex chars and build string

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

@@ -12,13 +12,22 @@ 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; }
 
 		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;
@@ -116,6 +125,10 @@ namespace PepperDash.Essentials.Core
 			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;
@@ -123,6 +136,9 @@ namespace PepperDash.Essentials.Core
 
 		#region IBasicCommunication Members
 
+  /// <summary>
+  /// SendText method
+  /// </summary>
 		public void SendText(string text)
 		{
 			if (Port == null)
@@ -133,6 +149,9 @@ namespace PepperDash.Essentials.Core
             Port.Send(text);
 		}
 
+  /// <summary>
+  /// SendBytes method
+  /// </summary>
 		public void SendBytes(byte[] bytes)
 		{
 			if (Port == null)
@@ -144,10 +163,16 @@ namespace PepperDash.Essentials.Core
 			Port.Send(text);
 		}
 
+  /// <summary>
+  /// Connect method
+  /// </summary>
 		public void Connect()
 		{		
 		}
 
+  /// <summary>
+  /// Disconnect method
+  /// </summary>
 		public void Disconnect()
 		{
 		}
@@ -158,6 +183,9 @@ namespace PepperDash.Essentials.Core
         /// 
         /// </summary>
         /// <param name="s"></param>
+        /// <summary>
+        /// SimulateReceive method
+        /// </summary>
         public void SimulateReceive(string s)
         {
             // split out hex chars and build string

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

@@ -34,8 +34,9 @@ namespace PepperDash.Essentials.Core
         }
 
         /// <summary>
-        /// 
+        /// CanConvert method
         /// </summary>
+        /// <inheritdoc />
         public override bool CanConvert(Type objectType)
         {
             return objectType == typeof(ComPort.ComPortSpec?);
@@ -44,10 +45,15 @@ namespace PepperDash.Essentials.Core
         public override bool CanRead { get { return true; } }
 
         /// <summary>
-        /// This converter will not be used for writing
+        /// Gets or sets the CanWrite
         /// </summary>
+        /// <inheritdoc />
         public override bool CanWrite { get { return false; } }
 
+        /// <summary>
+        /// WriteJson method
+        /// </summary>
+        /// <inheritdoc />
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
             throw new NotImplementedException();
@@ -55,12 +61,11 @@ namespace PepperDash.Essentials.Core
     }
 
     /// <summary>
-    /// The gist of this converter: The comspec JSON comes in with normal values that need to be converted
+    /// Represents a ComSpecPropsJsonConverter
-    /// into enum names.  This converter takes the value and applies the appropriate enum's name prefix to the value
-    /// and then returns the enum value using Enum.Parse. NOTE: Does not write
     /// </summary>
     public class ComSpecPropsJsonConverter : JsonConverter
     {
+        /// <inheritdoc />
         public override bool CanConvert(Type objectType)
         {
             return objectType == typeof(ComPort.eComBaudRates)
@@ -72,8 +77,15 @@ namespace PepperDash.Essentials.Core
                 || objectType == typeof(ComPort.eComStopBits);
         }
 
+        /// <summary>
+        /// Gets or sets the CanRead
+        /// </summary>
+        /// <inheritdoc />
         public override bool CanRead { get { return true; } }
 
+        /// <summary>
+        /// ReadJson method
+        /// </summary>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
             //Debug.LogMessage(LogEventLevel.Verbose, "ReadJson type: " + objectType.Name);
@@ -94,6 +106,10 @@ namespace PepperDash.Essentials.Core
             return null;
         }
 
+        /// <summary>
+        /// WriteJson method
+        /// </summary>
+        /// <inheritdoc />
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
             throw new NotImplementedException();

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

@@ -0,0 +1,138 @@
+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,11 +1,9 @@
 
 
 using System;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DM;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
@@ -38,6 +36,9 @@ namespace PepperDash.Essentials.Core
 		/// 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);
@@ -53,35 +54,38 @@ namespace PepperDash.Essentials.Core
 					case eControlMethod.Com:
 						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams.Value, controlConfig);
 						break;
-                    case eControlMethod.Cec:
+					case eControlMethod.ComBridge:
-                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
+						comm = new CommBridge(deviceConfig.Key + "-simpl", deviceConfig.Name + " Simpl");
-                        break;
+						break;
+					case eControlMethod.Cec:
+						comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
+						break;
 					case eControlMethod.IR:
 						break;
-                    case eControlMethod.Ssh:
+					case eControlMethod.Ssh:
-                        {
+						{
-                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
+							var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
-                            ssh.AutoReconnect = c.AutoReconnect;
+							ssh.AutoReconnect = c.AutoReconnect;
-                            if(ssh.AutoReconnect)
+							if (ssh.AutoReconnect)
-                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+								ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-                            comm = ssh;
+							comm = ssh;
-                            break;
+							break;
-                        }
+						}
-                    case eControlMethod.Tcpip:
+					case eControlMethod.Tcpip:
-                        {
+						{
-                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
+							var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
-                            tcp.AutoReconnect = c.AutoReconnect;
+							tcp.AutoReconnect = c.AutoReconnect;
-                            if (tcp.AutoReconnect)
+							if (tcp.AutoReconnect)
-                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+								tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-                            comm = tcp;
+							comm = tcp;
-                            break;
+							break;
-                        }
+						}
-                    case eControlMethod.Udp:
+					case eControlMethod.Udp:
-                        {
+						{
-                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
+							var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-                            comm = udp;
+							comm = udp;
-                            break;
+							break;
-                        }
+						}
 					case eControlMethod.Telnet:
 						break;
 					case eControlMethod.SecureTcpIp:
@@ -104,12 +108,14 @@ namespace PepperDash.Essentials.Core
 			}
 
 			// put it in the device manager if it's the right flavor
-			var comDev = comm as Device;
+			if (comm is Device comDev)
-			if (comDev != null)
 				DeviceManager.AddDevice(comDev);
 			return comm;
 		}
 
+		/// <summary>
+		/// GetComPort method
+		/// </summary>
 		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
 		{
 			var comPar = config.ComParams;
@@ -120,68 +126,74 @@ namespace PepperDash.Essentials.Core
 			return null;
 		}
 
-        /// <summary>
+		/// <summary>
-        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
+		///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
-        /// </summary>
+		/// </summary>
-        /// <param name="config"></param>
+		/// <param name="config"></param>
-        /// <returns></returns>
+		/// <returns></returns>
-        public static ICec GetCecPort(ControlPropertiesConfig config)
+		/// <summary>
-        {
+		/// GetCecPort method
-	        try
+		/// </summary>
-	        {
+		public static ICec GetCecPort(ControlPropertiesConfig config)
-		        var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
+		{
+			try
+			{
+				var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
 
-		        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
+				Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
-			        ? "is not valid, failed to get cec port"
+					? "is not valid, failed to get cec port"
-			        : "found in device manager, attempting to get cec port");
+					: "found in device manager, attempting to get cec port");
 
-		        if (dev == null)
+				if (dev == null)
-			        return null;
+					return null;
 
-		        if (String.IsNullOrEmpty(config.ControlPortName))
+				if (String.IsNullOrEmpty(config.ControlPortName))
-		        {
+				{
-			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
-			        return null;
+					return null;
-		        }
+				}
 
 
-		        var inputsOutputs = dev as IRoutingInputsOutputs;
+				var inputsOutputs = dev as IRoutingInputsOutputs;
-		        if (inputsOutputs == null)
+				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;
+					return null;
-		        }
+				}
 
 				var inputPort = inputsOutputs.InputPorts[config.ControlPortName];
-		        if (inputPort != null && inputPort.Port is ICec)
+				if (inputPort != null && inputPort.Port is ICec)
 					return inputPort.Port as ICec;
 
 
-		        var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
+				var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
-		        if (outputPort != null && outputPort.Port is ICec)
+				if (outputPort != null && outputPort.Port is ICec)
 					return outputPort.Port as ICec;
-	        }
+			}
-	        catch (Exception ex)
+			catch (Exception ex)
-	        {
+			{
-		        Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
+				Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
-		        Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
+				Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
-		        if (ex.InnerException != null)
+				if (ex.InnerException != null)
-			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);				
+					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)
@@ -198,66 +210,81 @@ namespace PepperDash.Essentials.Core
 		}
 	}
 
-    /// <summary>
+	/// <summary>
-    /// 
+	/// Represents a EssentialsControlPropertiesConfig
-    /// </summary>
+	/// </summary>
-    public class EssentialsControlPropertiesConfig :
+	public class EssentialsControlPropertiesConfig :
-        ControlPropertiesConfig
+			ControlPropertiesConfig
-    {
+	{
 
-        [JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
-        [JsonConverter(typeof(ComSpecJsonConverter))]
+		[JsonConverter(typeof(ComSpecJsonConverter))]
-        public ComPort.ComPortSpec? ComParams { get; set; }
+		public ComPort.ComPortSpec? ComParams { get; set; }
 
-        [JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
-        public string CresnetId { get; set; }
+		public string CresnetId { get; set; }
 
-        /// <summary>
+		/// <summary>
-        /// Attempts to provide uint conversion of string CresnetId
+		/// Attempts to provide uint conversion of string CresnetId
-        /// </summary>
+		/// </summary>
-        [JsonIgnore]
+		[JsonIgnore]
-        public uint CresnetIdInt
+		public uint CresnetIdInt
-        {
+		{
-            get
+			get
-            {
+			{
-                try
+				try
-                {
+				{
-                    return Convert.ToUInt32(CresnetId, 16);
+					return Convert.ToUInt32(CresnetId, 16);
-                }
+				}
-                catch (Exception)
+				catch (Exception)
-                {
+				{
-                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
+					throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-                }
+				}
-            }
+			}
-        }
+		}
 
-        [JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
+		[JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
-        public string InfinetId { get; set; }
+		/// <summary>
+		/// Gets or sets the InfinetId
+		/// </summary>
+		public string InfinetId { get; set; }
 
-        /// <summary>
+		/// <summary>
-        /// Attepmts to provide uiont conversion of string InifinetId
+		/// Attepmts to provide uiont conversion of string InifinetId
-        /// </summary>
+		/// </summary>
-        [JsonIgnore]
+		[JsonIgnore]
-        public uint InfinetIdInt
+		public uint InfinetIdInt
-        {
+		{
-            get
+			get
-            {
+			{
-                try
+				try
-                {
+				{
-                    return Convert.ToUInt32(InfinetId, 16);
+					return Convert.ToUInt32(InfinetId, 16);
-                }
+				}
-                catch (Exception)
+				catch (Exception)
-                {
+				{
-                    throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
+					throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
-                }
+				}
-            }
+			}
-        }
+		}
-    }
+	}
 
-    public class IrControlSpec
+	/// <summary>
-    {
+	/// Represents a IrControlSpec
-        public string PortDeviceKey { get; set; }
+	/// </summary>
-        public uint PortNumber { get; set; }
+	public class IrControlSpec
-        public string File { get; set; }
+	{
-    }
+		/// <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; }
+	}
 }