feat!: updated all projects to net8 and removed un-used using statements

.gitignore

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

src/Directory.Build.props

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

src/Directory.Build.targets

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

src/PepperDash.Core/Comm/eControlMethods.cs

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

src/PepperDash.Core/JsonToSimpl/JsonToSimplMaster.cs

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

src/PepperDash.Core/Logging/Debug.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronDataStore;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.CrestronLogger;
@@ -16,10 +11,15 @@ using Serilog.Events;
 using Serilog.Formatting.Compact;
 using Serilog.Formatting.Json;
 using Serilog.Templates;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text.RegularExpressions;
 
 namespace PepperDash.Core
 {
     /// <summary>
+    /// Contains debug commands for use in various situations
     /// </summary>
     public static class Debug
     {
@@ -48,9 +48,6 @@ 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; }
@@ -58,9 +55,6 @@ namespace PepperDash.Core
 
         private static readonly DebugWebsocketSink _websocketSink;
 
-        /// <summary>
-        /// Gets the websocket sink for debug logging.
-        /// </summary>
         public static DebugWebsocketSink WebsocketSink
         {
             get { return _websocketSink; }
@@ -97,33 +91,29 @@ namespace PepperDash.Core
 
         private const int SaveTimeoutMs = 30000;
 
-        /// <summary>
-        /// Indicates whether the system is running on an appliance.
-        /// </summary>
         public static bool IsRunningOnAppliance = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance;
 
         /// <summary>
         /// Gets or sets the PepperDashCoreVersion
         /// </summary>
-        public static string PepperDashCoreVersion { get; private set; }
+        public static string PepperDashCoreVersion { get; private set; } 
 
         private static CTimer _saveTimer;
 
-        /// <summary>
-        /// When true, the IncludedExcludedKeys dict will contain keys to include. 
-        /// When false (default), IncludedExcludedKeys will contain keys to exclude.
-        /// </summary>
-        private static bool _excludeAllMode;
+		/// <summary>
+		/// When true, the IncludedExcludedKeys dict will contain keys to include. 
+		/// When false (default), IncludedExcludedKeys will contain keys to exclude.
+		/// </summary>
+		private static bool _excludeAllMode;
 
-        private static readonly Dictionary<string, object> IncludedExcludedKeys;
+		//static bool ExcludeNoKeyMessages;
+
+		private static readonly Dictionary<string, object> IncludedExcludedKeys;
 
         private static readonly LoggerConfiguration _defaultLoggerConfiguration;
 
         private static LoggerConfiguration _loggerConfiguration;
 
-        /// <summary>
-        /// Gets the logger configuration for the debug logging.
-        /// </summary>
         public static LoggerConfiguration LoggerConfiguration => _loggerConfiguration;
 
         static Debug()
@@ -138,7 +128,7 @@ namespace PepperDash.Core
 
             var defaultFileLogLevel = GetStoredLogEventLevel(FileLevelStoreKey);
 
-            _consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);
+            _consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);            
 
             _websocketLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultWebsocketLevel);
 
@@ -154,7 +144,7 @@ namespace PepperDash.Core
 
             CrestronConsole.PrintLine($"Saving log files to {logFilePath}");
 
-            var errorLogTemplate = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance
+            var errorLogTemplate = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance 
                 ? "{@t:fff}ms [{@l:u4}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}"
                 : "[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}";
 
@@ -165,7 +155,7 @@ namespace PepperDash.Core
                 .WriteTo.Sink(new DebugConsoleSink(new ExpressionTemplate("[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}")), levelSwitch: _consoleLoggingLevelSwitch)
                 .WriteTo.Sink(_websocketSink, levelSwitch: _websocketLoggingLevelSwitch)
                 .WriteTo.Sink(new DebugErrorLogSink(new ExpressionTemplate(errorLogTemplate)), levelSwitch: _errorLogLevelSwitch)
-                .WriteTo.File(new RenderedCompactJsonFormatter(), logFilePath,
+                .WriteTo.File(new RenderedCompactJsonFormatter(), logFilePath,                                    
                     rollingInterval: RollingInterval.Day,
                     restrictedToMinimumLevel: LogEventLevel.Debug,
                     retainedFileCountLimit: CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? 30 : 60,
@@ -203,27 +193,27 @@ namespace PepperDash.Core
 
             CrestronConsole.PrintLine(msg);
 
-            LogMessage(LogEventLevel.Information, msg);
-
-            IncludedExcludedKeys = new Dictionary<string, object>();
+            LogMessage(LogEventLevel.Information,msg);
 
+			IncludedExcludedKeys = new Dictionary<string, object>();
+            
             if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SimplSharpPro)
             {
                 // Add command to console
-                CrestronConsole.AddNewConsoleCommand(SetDoNotLoadOnNextBootFromConsole, "donotloadonnextboot",
+                CrestronConsole.AddNewConsoleCommand(SetDoNotLoadOnNextBootFromConsole, "donotloadonnextboot", 
                     "donotloadonnextboot:P [true/false]: Should the application load on next boot", ConsoleAccessLevelEnum.AccessOperator);
 
                 CrestronConsole.AddNewConsoleCommand(SetDebugFromConsole, "appdebug",
                     "appdebug:P [0-5]: Sets the application's console debug message level",
                     ConsoleAccessLevelEnum.AccessOperator);
                 CrestronConsole.AddNewConsoleCommand(ShowDebugLog, "appdebuglog",
-                    "appdebuglog:P [all] Use \"all\" for full log.",
+                    "appdebuglog:P [all] Use \"all\" for full log.", 
                     ConsoleAccessLevelEnum.AccessOperator);
                 CrestronConsole.AddNewConsoleCommand(s => CrestronLogger.Clear(false), "appdebugclear",
-                    "appdebugclear:P Clears the current custom log",
+                    "appdebugclear:P Clears the current custom log", 
                     ConsoleAccessLevelEnum.AccessOperator);
-                CrestronConsole.AddNewConsoleCommand(SetDebugFilterFromConsole, "appdebugfilter",
-                    "appdebugfilter [params]", ConsoleAccessLevelEnum.AccessOperator);
+				CrestronConsole.AddNewConsoleCommand(SetDebugFilterFromConsole, "appdebugfilter",
+					"appdebugfilter [params]", ConsoleAccessLevelEnum.AccessOperator);
             }
 
             CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
@@ -234,7 +224,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) =>
@@ -267,26 +257,22 @@ namespace PepperDash.Core
         {
             try
             {
-                var result = CrestronDataStoreStatic.GetLocalIntValue(levelStoreKey, out int logLevel);
+                var result = CrestronDataStoreStatic.GetLocalIntValue(levelStoreKey, out int logLevel);                
 
                 if (result != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
                 {
                     CrestronConsole.Print($"Unable to retrieve stored log level for {levelStoreKey}.\r\nError: {result}.\r\nSetting level to {LogEventLevel.Information}\r\n");
-
-                    CrestronDataStoreStatic.SetLocalIntValue(levelStoreKey, (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;
@@ -298,7 +284,7 @@ namespace PepperDash.Core
             var assembly = Assembly.GetExecutingAssembly();
             var ver =
                 assembly
-                    .GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
+                    .GetCustomAttributes(typeof (AssemblyInformationalVersionAttribute), false);
 
             if (ver != null && ver.Length > 0)
             {
@@ -349,13 +335,13 @@ namespace PepperDash.Core
                 if (levelString.Trim() == "?")
                 {
                     CrestronConsole.ConsoleCommandResponse(
-                    "Used to set the minimum level of debug messages to be printed to the console:\r\n" +
-                    $"{_logLevels[0]} = 0\r\n" +
-                    $"{_logLevels[1]} = 1\r\n" +
-                    $"{_logLevels[2]} = 2\r\n" +
-                    $"{_logLevels[3]} = 3\r\n" +
-                    $"{_logLevels[4]} = 4\r\n" +
-                    $"{_logLevels[5]} = 5");
+                    $@"Used to set the minimum level of debug messages to be printed to the console:
+{_logLevels[0]} = 0
+{_logLevels[1]} = 1
+{_logLevels[2]} = 2
+{_logLevels[3]} = 3
+{_logLevels[4]} = 4
+{_logLevels[5]} = 5");
                     return;
                 }
 
@@ -365,25 +351,25 @@ 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, true, out var levelEnum))
+                if(Enum.TryParse<LogEventLevel>(levelString, out var levelEnum))
                 {
                     SetDebugLevel(levelEnum);
                     return;
                 }
 
                 CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level");
-            }
+            }          
             catch
             {
                 CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [0-5]");
@@ -399,7 +385,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetDebugLevel(uint level)
         {
-            if (!_logLevels.TryGetValue(level, out var logLevel))
+            if(!_logLevels.TryGetValue(level, out var logLevel))
             {
                 logLevel = LogEventLevel.Information;
 
@@ -421,9 +407,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}");
 
@@ -436,9 +422,9 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetWebSocketMinimumDebugLevel(LogEventLevel level)
         {
-            _websocketLoggingLevelSwitch.MinimumLevel = level;
+            _websocketLoggingLevelSwitch.MinimumLevel = level;            
 
-            var err = CrestronDataStoreStatic.SetLocalUintValue(WebSocketLevelStoreKey, (uint)level);
+            var err = CrestronDataStoreStatic.SetLocalUintValue(WebSocketLevelStoreKey, (uint) level);
 
             if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
                 LogMessage(LogEventLevel.Information, "Error saving websocket debug level setting: {erro}", err);
@@ -505,83 +491,83 @@ namespace PepperDash.Core
         /// Callback for console command
         /// </summary>
         /// <param name="items"></param>
-        /// <summary>
-        /// SetDebugFilterFromConsole method
-        /// </summary>
-        public static void SetDebugFilterFromConsole(string items)
-        {
-            var str = items.Trim();
-            if (str == "?")
-            {
-                CrestronConsole.ConsoleCommandResponse("Usage:\r APPDEBUGFILTER key1 key2 key3....\r " +
-                    "+all: at beginning puts filter into 'default include' mode\r" +
-                    "      All keys that follow will be excluded from output.\r" +
-                    "-all: at beginning puts filter into 'default exclude all' mode.\r" +
-                    "      All keys that follow will be the only keys that are shown\r" +
-                    "+nokey: Enables messages with no key (default)\r" +
-                    "-nokey: Disables messages with no key.\r" +
-                    "(nokey settings are independent of all other settings)");
-                return;
-            }
-            var keys = Regex.Split(str, @"\s*");
-            foreach (var keyToken in keys)
-            {
-                var lkey = keyToken.ToLower();
-                if (lkey == "+all")
-                {
-                    IncludedExcludedKeys.Clear();
-                    _excludeAllMode = false;
-                }
-                else if (lkey == "-all")
-                {
-                    IncludedExcludedKeys.Clear();
-                    _excludeAllMode = true;
-                }
-                //else if (lkey == "+nokey")
-                //{
-                //    ExcludeNoKeyMessages = false;
-                //}
-                //else if (lkey == "-nokey")
-                //{
-                //    ExcludeNoKeyMessages = true;
-                //}
-                else
-                {
-                    string key;
-                    if (lkey.StartsWith("-"))
-                    {
-                        key = lkey.Substring(1);
-                        // if in exclude all mode, we need to remove this from the inclusions
-                        if (_excludeAllMode)
-                        {
-                            if (IncludedExcludedKeys.ContainsKey(key))
-                                IncludedExcludedKeys.Remove(key);
-                        }
-                        // otherwise include all mode, add to the exclusions
-                        else
-                        {
-                            IncludedExcludedKeys[key] = new object();
-                        }
-                    }
-                    else if (lkey.StartsWith("+"))
-                    {
-                        key = lkey.Substring(1);
-                        // if in exclude all mode, we need to add this as inclusion
-                        if (_excludeAllMode)
-                        {
+  /// <summary>
+  /// SetDebugFilterFromConsole method
+  /// </summary>
+		public static void SetDebugFilterFromConsole(string items)
+		{
+			var str = items.Trim();
+			if (str == "?")
+			{
+				CrestronConsole.ConsoleCommandResponse("Usage:\r APPDEBUGFILTER key1 key2 key3....\r " +
+					"+all: at beginning puts filter into 'default include' mode\r" +
+					"      All keys that follow will be excluded from output.\r" +
+					"-all: at beginning puts filter into 'default exclude all' mode.\r" +
+					"      All keys that follow will be the only keys that are shown\r" +
+					"+nokey: Enables messages with no key (default)\r" +
+					"-nokey: Disables messages with no key.\r" +
+					"(nokey settings are independent of all other settings)");
+				return;
+			}
+			var keys = Regex.Split(str, @"\s*");
+			foreach (var keyToken in keys)
+			{
+				var lkey = keyToken.ToLower();
+				if (lkey == "+all")
+				{
+					IncludedExcludedKeys.Clear();
+					_excludeAllMode = false;
+				}
+				else if (lkey == "-all")
+				{
+					IncludedExcludedKeys.Clear();
+					_excludeAllMode = true;
+				}
+				//else if (lkey == "+nokey")
+				//{
+				//    ExcludeNoKeyMessages = false;
+				//}
+				//else if (lkey == "-nokey")
+				//{
+				//    ExcludeNoKeyMessages = true;
+				//}
+				else
+				{
+					string key;
+					if (lkey.StartsWith("-"))
+					{
+						key = lkey.Substring(1);
+						// if in exclude all mode, we need to remove this from the inclusions
+						if (_excludeAllMode)
+						{
+							if (IncludedExcludedKeys.ContainsKey(key))
+								IncludedExcludedKeys.Remove(key);
+						}
+						// otherwise include all mode, add to the exclusions
+						else
+						{
+							IncludedExcludedKeys[key] = new object();
+						}
+					}
+					else if (lkey.StartsWith("+"))
+					{
+						key = lkey.Substring(1);
+						// if in exclude all mode, we need to add this as inclusion
+						if (_excludeAllMode)
+						{
 
-                            IncludedExcludedKeys[key] = new object();
-                        }
-                        // otherwise include all mode, remove this from exclusions
-                        else
-                        {
-                            if (IncludedExcludedKeys.ContainsKey(key))
-                                IncludedExcludedKeys.Remove(key);
-                        }
-                    }
-                }
-            }
-        }
+							IncludedExcludedKeys[key] = new object();
+						}
+						// otherwise include all mode, remove this from exclusions
+						else
+						{
+							if (IncludedExcludedKeys.ContainsKey(key))
+								IncludedExcludedKeys.Remove(key);
+						}
+					}
+				}
+			}
+		}
 
 
 
@@ -609,7 +595,7 @@ namespace PepperDash.Core
         public static object GetDeviceDebugSettingsForKey(string deviceKey)
         {
             return _contexts.GetDebugSettingsForKey(deviceKey);
-        }
+        }  
 
         /// <summary>
         /// Sets the flag to prevent application starting on next boot
@@ -668,15 +654,9 @@ namespace PepperDash.Core
             }
         }
 
-        /// <summary>
-        /// Logs a message at the specified log level.
-        /// </summary>
-        /// <param name="level">Level to log at</param>
-        /// <param name="message">Message template</param>
-        /// <param name="args">Args to put into message template</param>
         public static void LogMessage(LogEventLevel level, string message, params object[] args)
         {
-            _logger.Write(level, message, args);
+           _logger.Write(level, message, args);
         }
 
         /// <summary>
@@ -712,7 +692,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogVerbose(IKeyed keyed, string message, params object[] args)
         {
-            using (LogContext.PushProperty("Key", keyed?.Key))
+            using(LogContext.PushProperty("Key", keyed?.Key))
             {
                 _logger.Write(LogEventLevel.Verbose, message, args);
             }
@@ -723,7 +703,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogVerbose(Exception ex, IKeyed keyed, string message, params object[] args)
         {
-            using (LogContext.PushProperty("Key", keyed?.Key))
+            using(LogContext.PushProperty("Key", keyed?.Key))
             {
                 _logger.Write(LogEventLevel.Verbose, ex, message, args);
             }
@@ -742,7 +722,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogVerbose(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Verbose, ex, message, args);
+            _logger.Write(LogEventLevel.Verbose, ex, null, message, args);
         }
 
         /// <summary>
@@ -818,7 +798,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogInformation(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Information, ex, message, args);
+            _logger.Write(LogEventLevel.Information, ex, null, message, args);
         }
 
         /// <summary>
@@ -856,7 +836,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogWarning(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Warning, ex, message, args);
+            _logger.Write(LogEventLevel.Warning, ex, null, message, args);
         }
 
         /// <summary>
@@ -894,7 +874,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogError(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Error, ex, message, args);
+            _logger.Write(LogEventLevel.Error, ex, null, message, args);
         }
 
         /// <summary>
@@ -932,7 +912,7 @@ namespace PepperDash.Core
         /// </summary>
         public static void LogFatal(Exception ex, string message, params object[] args)
         {
-            _logger.Write(LogEventLevel.Fatal, ex, message, args);
+            _logger.Write(LogEventLevel.Fatal, ex, null, message, args);
         }
 
         #endregion
@@ -943,7 +923,7 @@ namespace PepperDash.Core
             if (!_logLevels.ContainsKey(level)) return;
 
             var logLevel = _logLevels[level];
-
+            
             LogMessage(logLevel, format, items);
         }
 
@@ -998,7 +978,7 @@ namespace PepperDash.Core
         [Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
         public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel,
             string format, params object[] items)
-        {
+        {           
             LogMessage(level, dev, format, items);
         }
 
@@ -1142,7 +1122,7 @@ namespace PepperDash.Core
                 return string.Format(@"\user\debugSettings\program{0}", InitialParametersClass.ApplicationNumber);
             }
 
-            return string.Format("{0}{1}user{1}debugSettings{1}{2}.json", Directory.GetApplicationRootDirectory(), Path.DirectorySeparatorChar, InitialParametersClass.RoomId);
+            return string.Format("{0}{1}user{1}debugSettings{1}{2}.json",Directory.GetApplicationRootDirectory(), Path.DirectorySeparatorChar, InitialParametersClass.RoomId);
         }
 
         /// <summary>
@@ -1153,15 +1133,15 @@ namespace PepperDash.Core
             /// <summary>
             /// Error
             /// </summary>
-            Error,
+            Error, 
             /// <summary>
             /// Warning
             /// </summary>
-            Warning,
+            Warning, 
             /// <summary>
             /// Notice
             /// </summary>
-            Notice,
+            Notice, 
             /// <summary>
             /// None
             /// </summary>

src/PepperDash.Core/Logging/DebugExtensions.cs

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

src/PepperDash.Core/PepperDash.Core.csproj

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

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

@@ -2,12 +2,13 @@
 
 using System;
 using System.Collections.Generic;
-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;
@@ -353,22 +354,22 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class EiscApiPropertiesConfig
     {
+        [JsonProperty("control")]
         /// <summary>
         /// Gets or sets the Control
         /// </summary>
-        [JsonProperty("control")]
         public EssentialsControlPropertiesConfig Control { get; set; }
 
+        [JsonProperty("devices")]
         /// <summary>
         /// Gets or sets the Devices
         /// </summary>
-        [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
+        [JsonProperty("rooms")]
         /// <summary>
         /// Gets or sets the Rooms
         /// </summary>
-        [JsonProperty("rooms")]
         public List<ApiRoomPropertiesConfig> Rooms { get; set; }
 
 
@@ -377,22 +378,22 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public class ApiDevicePropertiesConfig
         {
+            [JsonProperty("deviceKey")]
             /// <summary>
             /// Gets or sets the DeviceKey
             /// </summary>
-            [JsonProperty("deviceKey")]
             public string DeviceKey { get; set; }
 
+            [JsonProperty("joinStart")]
             /// <summary>
             /// Gets or sets the JoinStart
             /// </summary>
-            [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
+            [JsonProperty("joinMapKey")]
             /// <summary>
             /// Gets or sets the JoinMapKey
             /// </summary>
-            [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 
@@ -401,22 +402,22 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public class ApiRoomPropertiesConfig
         {
+            [JsonProperty("roomKey")]
             /// <summary>
             /// Gets or sets the RoomKey
             /// </summary>
-            [JsonProperty("roomKey")]
             public string RoomKey { get; set; }
 
+            [JsonProperty("joinStart")]
             /// <summary>
             /// Gets or sets the JoinStart
             /// </summary>
-            [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
+            [JsonProperty("joinMapKey")]
             /// <summary>
             /// Gets or sets the JoinMapKey
             /// </summary>
-            [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 

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

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

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

@@ -1,6 +1,4 @@
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.Bridges.JoinMaps
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
 		public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
 		{

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

@@ -1,5 +1,4 @@
 using System;
-using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {

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

@@ -1,5 +1,4 @@
 using System;
-using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core.Bridges
 {

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

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Core.Bridges
 {

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

@@ -1,5 +1,4 @@
 using System;
-using PepperDash.Essentials.Core;
 namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
  /// <summary>

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

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DM;
 
 using PepperDash.Core;

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

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
 using PepperDash.Core;

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

@@ -1,16 +1,9 @@
 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
 
 
 namespace PepperDash.Essentials.Core

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

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

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

@@ -36,9 +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>
+  /// <summary>
+  /// CreateCommForDevice method
+  /// </summary>
 		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
 		{
 			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
@@ -54,38 +54,35 @@ namespace PepperDash.Essentials.Core
 					case eControlMethod.Com:
 						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams.Value, controlConfig);
 						break;
-					case eControlMethod.ComBridge:
-						comm = new CommBridge(deviceConfig.Key + "-simpl", deviceConfig.Name + " Simpl");
-						break;
-					case eControlMethod.Cec:
-						comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
-						break;
+                    case eControlMethod.Cec:
+                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
+                        break;
 					case eControlMethod.IR:
 						break;
-					case eControlMethod.Ssh:
-						{
-							var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
-							ssh.AutoReconnect = c.AutoReconnect;
-							if (ssh.AutoReconnect)
-								ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							comm = ssh;
-							break;
-						}
-					case eControlMethod.Tcpip:
-						{
-							var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
-							tcp.AutoReconnect = c.AutoReconnect;
-							if (tcp.AutoReconnect)
-								tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							comm = tcp;
-							break;
-						}
-					case eControlMethod.Udp:
-						{
-							var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-							comm = udp;
-							break;
-						}
+                    case eControlMethod.Ssh:
+                        {
+                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
+                            ssh.AutoReconnect = c.AutoReconnect;
+                            if(ssh.AutoReconnect)
+                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = ssh;
+                            break;
+                        }
+                    case eControlMethod.Tcpip:
+                        {
+                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
+                            tcp.AutoReconnect = c.AutoReconnect;
+                            if (tcp.AutoReconnect)
+                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = tcp;
+                            break;
+                        }
+                    case eControlMethod.Udp:
+                        {
+                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
+                            comm = udp;
+                            break;
+                        }
 					case eControlMethod.Telnet:
 						break;
 					case eControlMethod.SecureTcpIp:
@@ -99,7 +96,7 @@ namespace PepperDash.Essentials.Core
 						}
 					default:
 						break;
-				}
+				}				
 			}
 			catch (Exception e)
 			{
@@ -108,14 +105,15 @@ namespace PepperDash.Essentials.Core
 			}
 
 			// put it in the device manager if it's the right flavor
-			if (comm is Device comDev)
+			var comDev = comm as Device;
+			if (comDev != null)
 				DeviceManager.AddDevice(comDev);
 			return comm;
 		}
 
-		/// <summary>
-		/// GetComPort method
-		/// </summary>
+  /// <summary>
+  /// GetComPort method
+  /// </summary>
 		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
 		{
 			var comPar = config.ComParams;
@@ -126,74 +124,74 @@ namespace PepperDash.Essentials.Core
 			return null;
 		}
 
-		/// <summary>
-		///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
-		/// </summary>
-		/// <param name="config"></param>
-		/// <returns></returns>
-		/// <summary>
-		/// GetCecPort method
-		/// </summary>
-		public static ICec GetCecPort(ControlPropertiesConfig config)
-		{
-			try
-			{
-				var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
+        /// <summary>
+        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
+        /// </summary>
+        /// <param name="config"></param>
+        /// <returns></returns>
+        /// <summary>
+        /// GetCecPort method
+        /// </summary>
+        public static ICec GetCecPort(ControlPropertiesConfig config)
+        {
+	        try
+	        {
+		        var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
 
-				Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
-					? "is not valid, failed to get cec port"
-					: "found in device manager, attempting to get cec port");
+		        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: device '{0}' {1}", config.ControlPortDevKey, dev == null
+			        ? "is not valid, failed to get cec port"
+			        : "found in device manager, attempting to get cec port");
 
-				if (dev == null)
-					return null;
+		        if (dev == null)
+			        return null;
 
-				if (String.IsNullOrEmpty(config.ControlPortName))
-				{
-					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
-					return null;
-				}
+		        if (String.IsNullOrEmpty(config.ControlPortName))
+		        {
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
+			        return null;
+		        }
 
 
-				var inputsOutputs = dev as IRoutingInputsOutputs;
-				if (inputsOutputs == null)
-				{
+		        var inputsOutputs = dev as IRoutingInputsOutputs;
+		        if (inputsOutputs == null)
+		        {
 					Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not support IRoutingInputsOutputs, failed to get CEC port called '{1}'",
 						config.ControlPortDevKey, config.ControlPortName);
 
-					return null;
-				}
+			        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];
-				if (outputPort != null && outputPort.Port is ICec)
-					return outputPort.Port as ICec;
-			}
-			catch (Exception ex)
-			{
-				Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
-				Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
-				if (ex.InnerException != null)
-					Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);
-			}
+		        var outputPort = inputsOutputs.OutputPorts[config.ControlPortName];
+		        if (outputPort != null && outputPort.Port is ICec)
+					return outputPort.Port as ICec;		        
+	        }
+	        catch (Exception ex)
+	        {
+		        Debug.LogMessage(LogEventLevel.Debug, "GetCecPort Exception Message: {0}", ex.Message);
+		        Debug.LogMessage(LogEventLevel.Verbose, "GetCecPort Exception StackTrace: {0}", ex.StackTrace);
+		        if (ex.InnerException != null)
+			        Debug.LogMessage(LogEventLevel.Information, "GetCecPort Exception InnerException: {0}", ex.InnerException);				
+	        }
 
 			Debug.LogMessage(LogEventLevel.Information, "GetCecPort: Device '{0}' does not have a CEC port called '{1}'",
 					config.ControlPortDevKey, config.ControlPortName);
 
 			return null;
-		}
+        }
 
 		/// <summary>
 		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
 		/// return the ControlSystem object from the Global class.
 		/// </summary>
 		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
-		/// <summary>
-		/// GetIComPortsDeviceFromManagedDevice method
-		/// </summary>
+  /// <summary>
+  /// GetIComPortsDeviceFromManagedDevice method
+  /// </summary>
 		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
 		{
 			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
@@ -210,81 +208,81 @@ namespace PepperDash.Essentials.Core
 		}
 	}
 
-	/// <summary>
-	/// Represents a EssentialsControlPropertiesConfig
-	/// </summary>
-	public class EssentialsControlPropertiesConfig :
-			ControlPropertiesConfig
-	{
+    /// <summary>
+    /// Represents a EssentialsControlPropertiesConfig
+    /// </summary>
+    public class EssentialsControlPropertiesConfig :
+        ControlPropertiesConfig
+    {
 
-		[JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
-		[JsonConverter(typeof(ComSpecJsonConverter))]
-		public ComPort.ComPortSpec? ComParams { get; set; }
+        [JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ComSpecJsonConverter))]
+        public ComPort.ComPortSpec? ComParams { get; set; }
 
-		[JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
-		public string CresnetId { get; set; }
+        [JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)]
+        public string CresnetId { get; set; }
 
-		/// <summary>
-		/// Attempts to provide uint conversion of string CresnetId
-		/// </summary>
-		[JsonIgnore]
-		public uint CresnetIdInt
-		{
-			get
-			{
-				try
-				{
-					return Convert.ToUInt32(CresnetId, 16);
-				}
-				catch (Exception)
-				{
-					throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-				}
-			}
-		}
+        /// <summary>
+        /// Attempts to provide uint conversion of string CresnetId
+        /// </summary>
+        [JsonIgnore]
+        public uint CresnetIdInt
+        {
+            get
+            {
+                try
+                {
+                    return Convert.ToUInt32(CresnetId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
+                }
+            }
+        }
 
-		[JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
-		/// <summary>
-		/// Gets or sets the InfinetId
-		/// </summary>
-		public string InfinetId { get; set; }
+        [JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)]
+        /// <summary>
+        /// Gets or sets the InfinetId
+        /// </summary>
+        public string InfinetId { get; set; }
 
-		/// <summary>
-		/// Attepmts to provide uiont conversion of string InifinetId
-		/// </summary>
-		[JsonIgnore]
-		public uint InfinetIdInt
-		{
-			get
-			{
-				try
-				{
-					return Convert.ToUInt32(InfinetId, 16);
-				}
-				catch (Exception)
-				{
-					throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
-				}
-			}
-		}
-	}
+        /// <summary>
+        /// Attepmts to provide uiont conversion of string InifinetId
+        /// </summary>
+        [JsonIgnore]
+        public uint InfinetIdInt
+        {
+            get
+            {
+                try
+                {
+                    return Convert.ToUInt32(InfinetId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
+                }
+            }
+        }
+    }
 
-	/// <summary>
-	/// Represents a IrControlSpec
-	/// </summary>
-	public class IrControlSpec
-	{
-		/// <summary>
-		/// Gets or sets the PortDeviceKey
-		/// </summary>
-		public string PortDeviceKey { get; set; }
-		/// <summary>
-		/// Gets or sets the PortNumber
-		/// </summary>
-		public uint PortNumber { get; set; }
-		/// <summary>
-		/// Gets or sets the File
-		/// </summary>
-		public string File { get; set; }
-	}
+    /// <summary>
+    /// Represents a IrControlSpec
+    /// </summary>
+    public class IrControlSpec
+    {
+        /// <summary>
+        /// Gets or sets the PortDeviceKey
+        /// </summary>
+        public string PortDeviceKey { get; set; }
+        /// <summary>
+        /// Gets or sets the PortNumber
+        /// </summary>
+        public uint PortNumber { get; set; }
+        /// <summary>
+        /// Gets or sets the File
+        /// </summary>
+        public string File { get; set; }
+    }
 }

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

@@ -1,16 +1,4 @@
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
+using Crestron.SimplSharpPro;
 
 
 namespace PepperDash.Essentials.Core

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

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using Crestron.SimplSharp;
 
 using PepperDash.Core;

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

@@ -1,9 +1,6 @@
 
 
 using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
 using Newtonsoft.Json;

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

@@ -1,10 +1,5 @@
-using Crestron.SimplSharpPro;
-using Newtonsoft.Json;
-using System;
+using Newtonsoft.Json;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PepperDash.Essentials.Core.Config
 {

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

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

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

@@ -5,7 +5,6 @@ using System.Linq;
 using Newtonsoft.Json;
 
 using Newtonsoft.Json.Linq;
-using PepperDash.Essentials.Core.Devices;
 
 namespace PepperDash.Essentials.Core.Config
 {

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

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

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

@@ -1,15 +1,9 @@
 
 
 using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core.Config
 {
@@ -18,41 +12,41 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     public class DeviceConfig
     {
+        [JsonProperty("key")]
         /// <summary>
         /// Gets or sets the Key
         /// </summary>
-        [JsonProperty("key")]
         public string Key { get; set; }
 
+        [JsonProperty("uid")]
         /// <summary>
         /// Gets or sets the Uid
         /// </summary>
-        [JsonProperty("uid")]
         public int Uid { get; set; }
 
+        [JsonProperty("name")]
         /// <summary>
         /// Gets or sets the Name
         /// </summary>
-        [JsonProperty("name")]
         public string Name { get; set; }
 
+        [JsonProperty("group")]
         /// <summary>
         /// Gets or sets the Group
         /// </summary>
-        [JsonProperty("group")]
         public string Group { get; set; }
 
+        [JsonProperty("type")]
         /// <summary>
         /// Gets or sets the Type
         /// </summary>
-        [JsonProperty("type")]
         public string Type { get; set; }
 
+        [JsonProperty("properties")]
+        [JsonConverter(typeof(DevicePropertiesConverter))]
         /// <summary>
         /// Gets or sets the Properties
         /// </summary>
-        [JsonProperty("properties")]
-        [JsonConverter(typeof(DevicePropertiesConverter))]
         public JToken Properties { get; set; }
 
         public DeviceConfig(DeviceConfig dc)
@@ -68,7 +62,7 @@ namespace PepperDash.Essentials.Core.Config
             //Properties = JToken.FromObject(dc.Properties);
         }
 
-        public DeviceConfig() { }
+        public DeviceConfig() {}
     }
 
     /// <summary>

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

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using PepperDash.Core.Config;

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

@@ -1,15 +1,10 @@
 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Crestron.SimplSharp.Net.Http;
-using Crestron.SimplSharpPro.Diagnostics;
 
 using PepperDash.Core;
 using Serilog.Events;

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

@@ -1,9 +1,7 @@
 
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;

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

@@ -1,14 +1,7 @@
-
-
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
-
-using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
 
-using PepperDash.Core;
-
 namespace PepperDash.Essentials.Core.Config
 {
 	/// <summary>

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

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// Defines the contract for ILoadConfig

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

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

src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs

@@ -1,9 +1,7 @@
-using System;
-using System.Linq;
+using System.Linq;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
-using PepperDash.Core.JsonStandardObjects;
 using PepperDash.Essentials.Core.Bridges;
 using Serilog.Events;
 

src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs

@@ -6,50 +6,52 @@ using Crestron.SimplSharpPro;
 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 Serilog.Events;
 
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
-
+    [Description("Wrapper class for Digital Input")]
     /// <summary>
     /// Represents a GenericDigitalInputDevice
     /// </summary>
-    /// [Description("Wrapper class for Digital Input")]
-    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IHasFeedback
+    public class GenericDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
     {
-        private DigitalInput inputPort;
+        /// <summary>
+        /// Gets or sets the InputPort
+        /// </summary>
+        public DigitalInput InputPort { get; private set; }
 
         /// <summary>
         /// Gets or sets the InputStateFeedback
         /// </summary>
         public BoolFeedback InputStateFeedback { get; private set; }
 
-        /// <inheritdoc />
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
+        Func<bool> InputStateFeedbackFunc
+        {
+            get
+            {
+                return () => InputPort.State;
+            }
+        }
+
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericDigitalInputDevice"/> class.
-        /// </summary>
-        /// <param name="key">key for device</param>
-        /// <param name="name">name for device</param>
-        /// <param name="postActivationFunc">function to call after activation. Should return the DigitalInput</param>
-        /// <param name="config">config for device</param>
         public GenericDigitalInputDevice(string key, string name, Func<IOPortConfig, DigitalInput> postActivationFunc,
             IOPortConfig config)
             : base(key, name)
         {
-            InputStateFeedback = new BoolFeedback("inputState", () => inputPort.State);
+            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
 
             AddPostActivationAction(() =>
             {
-                inputPort = postActivationFunc(config);
+                InputPort = postActivationFunc(config);
 
-                inputPort.Register();
+                InputPort.Register();
+
+                InputPort.StateChange += InputPort_StateChange;
 
-                inputPort.StateChange += InputPort_StateChange;
             });
         }
 
@@ -66,31 +68,41 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         private static DigitalInput GetDigitalInput(IOPortConfig dc)
         {
+            IDigitalInputPorts ioPortDevice;
 
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsDigitalInput)
                 {
-                    Debug.LogError("GetDigitalInput: Processor does not support Digital Inputs");
+                    Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Processor does not support Digital Inputs");
                     return null;
                 }
-
-                return Global.ControlSystem.DigitalInputPorts[dc.PortNumber];
+                ioPortDevice = Global.ControlSystem;
             }
-
-            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IDigitalInputPorts ioPortDevice))
+            else
             {
-                Debug.LogError("GetDigitalInput: Device {key} is not a valid device", dc.PortDeviceKey);
+                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IDigitalInputPorts;
+                if (ioPortDev == null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                ioPortDevice = ioPortDev;
+            }
+            if (ioPortDevice == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device '0' is not a valid IDigitalInputPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfDigitalInputPorts)
             {
-                Debug.LogError("GetDigitalInput: Device {key} does not contain a digital input port {port}", dc.PortDeviceKey, dc.PortNumber);
-                return null;
+                Debug.LogMessage(LogEventLevel.Information, "GetDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
             }
 
             return ioPortDevice.DigitalInputPorts[dc.PortNumber];
+
+
         }
 
         #endregion
@@ -116,20 +128,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                this.LogError("Unable to link device {key}.  {message}", Key, e.Message);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
         }
 
@@ -138,22 +150,22 @@ namespace PepperDash.Essentials.Core.CrestronIO
         #region Factory
 
         /// <summary>
-        /// Factory for creating GenericDigitalInputDevice devices
+        /// Represents a GenericDigitalInputDeviceFactory
         /// </summary>
         public class GenericDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericDigitalInputDevice>
         {
-            /// <summary>
-            /// Constructor for GenericDigitalInputDeviceFactory
-            /// </summary>
             public GenericDigitalInputDeviceFactory()
             {
                 TypeNames = new List<string>() { "digitalinput" };
             }
 
+            /// <summary>
+            /// BuildDevice method
+            /// </summary>
             /// <inheritdoc />
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.LogDebug("Factory Attempting to create new Generic Digital Input Device");
+                Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Digital Input Device");
 
                 var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs

@@ -2,9 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs

@@ -4,62 +4,61 @@ using System;
 using System.Collections.Generic;
 using Crestron.SimplSharpPro;
 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.Bridges;
+
+
+using Newtonsoft.Json;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportAnalogInputDevice : EssentialsBridgeableDevice, IAnalogInput, IHasFeedback
+    public class GenericVersiportAnalogInputDevice : EssentialsBridgeableDevice, IAnalogInput
     {
-        private Versiport inputPort;
+        public Versiport InputPort { get; private set; }
 
-        /// <inheritdoc />
         public IntFeedback InputValueFeedback { get; private set; }
-
-        /// <summary>
-        /// Get the InputMinimumChangeFeedback
-        /// </summary>
-        /// <remarks>
-        /// Updates when the analog input minimum change value changes
-        /// </remarks>
         public IntFeedback InputMinimumChangeFeedback { get; private set; }
 
-        /// <inheritdoc />
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
+        Func<int> InputValueFeedbackFunc
+        {
+            get
+            {
+                return () => InputPort.AnalogIn;
+            }
+        }
+
+        Func<int> InputMinimumChangeFeedbackFunc
+        {
+            get { return () => InputPort.AnalogMinChange; }
+        } 
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericVersiportAnalogInputDevice"/> class.
-        /// </summary>
-        /// <param name="key">key for the device</param>
-        /// <param name="name">name for the device</param>
-        /// <param name="postActivationFunc">function to call after activation</param>
-        /// <param name="config">IO port configuration</param>
         public GenericVersiportAnalogInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
             base(key, name)
         {
-            InputValueFeedback = new IntFeedback("inputValue", () => inputPort.AnalogIn);
-            InputMinimumChangeFeedback = new IntFeedback("inputMinimumChange", () => inputPort.AnalogMinChange);
+            InputValueFeedback = new IntFeedback(InputValueFeedbackFunc);
+            InputMinimumChangeFeedback = new IntFeedback(InputMinimumChangeFeedbackFunc);
 
             AddPostActivationAction(() =>
             {
-                inputPort = postActivationFunc(config);
+                InputPort = postActivationFunc(config);
 
-                inputPort.Register();
+                InputPort.Register();
 
-                inputPort.SetVersiportConfiguration(eVersiportConfiguration.AnalogInput);
-                inputPort.AnalogMinChange = (ushort)(config.MinimumChange > 0 ? config.MinimumChange : 655);
+                InputPort.SetVersiportConfiguration(eVersiportConfiguration.AnalogInput);
+                InputPort.AnalogMinChange = (ushort)(config.MinimumChange > 0 ? config.MinimumChange : 655);
                 if (config.DisablePullUpResistor)
-                    inputPort.DisablePullUpResistor = true;
+                    InputPort.DisablePullUpResistor = true;
 
-                inputPort.VersiportChange += InputPort_VersiportChange;
+                InputPort.VersiportChange += InputPort_VersiportChange;
+
+                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportAnalogInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
 
-                this.LogDebug("Created GenericVersiportAnalogInputDevice on port {port}.  DisablePullUpResistor: {pullUpResistorDisabled}", config.PortNumber, inputPort.DisablePullUpResistor);
             });
 
         }
@@ -67,17 +66,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// <summary>
         /// Set minimum voltage change for device to update voltage changed method
         /// </summary>
-        /// <param name="value">valid values range from 0 - 65535, representing the full 100% range of the processor voltage source.  Check processor documentation for details</param>        
+        /// <param name="value">valid values range from 0 - 65535, representing the full 100% range of the processor voltage source.  Check processor documentation for details</param>
+        /// <summary>
+        /// SetMinimumChange method
+        /// </summary>
         public void SetMinimumChange(ushort value)
         {
-            inputPort.AnalogMinChange = value;
+            InputPort.AnalogMinChange = value;
         }
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-            this.LogDebug("Versiport change: {event}", args.Event);
+			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
 
-            if (args.Event == eVersiportEvent.AnalogInChange)
+            if(args.Event == eVersiportEvent.AnalogInChange)
                 InputValueFeedback.FireUpdate();
             if (args.Event == eVersiportEvent.AnalogMinChangeChange)
                 InputMinimumChangeFeedback.FireUpdate();
@@ -86,6 +88,9 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         #region Bridge Linking
 
+        /// <summary>
+        /// LinkToApi method
+        /// </summary>
         /// <inheritdoc />
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
@@ -102,12 +107,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                this.LogDebug("Linking to Trilist '{trilistId}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputValueFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputValue.JoinNumber]);
@@ -117,8 +122,8 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             catch (Exception e)
             {
-                this.LogError("Unable to link device {key}: {message}", Key, e.Message);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
 
             trilist.OnlineStatusChange += (d, args) =>
@@ -130,6 +135,11 @@ namespace PepperDash.Essentials.Core.CrestronIO
 
         }
 
+        void trilist_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
+        {
+            throw new NotImplementedException();
+        }
+
         #endregion
 
 
@@ -138,55 +148,70 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
         {
+         
+            IIOPorts ioPortDevice;
+
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.LogError("GetVersiportAnalogInput: Processor does not support Versiports");
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Processor does not support Versiports");
                     return null;
                 }
-                return Global.ControlSystem.VersiPorts[dc.PortNumber];
+                ioPortDevice = Global.ControlSystem;
             }
-
-            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
+            else
             {
-                Debug.LogError("GetVersiportAnalogInput: Device {key} is not a valid device", dc.PortDeviceKey);
+                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                if (ioPortDev == null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                ioPortDevice = ioPortDev;
+            }
+            if (ioPortDevice == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
             {
-                Debug.LogError("GetVersiportAnalogInput: Device {key} does not contain a port {port}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
                 return null;
             }
-            if (!ioPortDevice.VersiPorts[dc.PortNumber].SupportsAnalogInput)
+            if(!ioPortDevice.VersiPorts[dc.PortNumber].SupportsAnalogInput)
             {
-                Debug.LogError("GetVersiportAnalogInput: Device {key} does not support AnalogInput on port {port}", dc.PortDeviceKey, dc.PortNumber);
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportAnalogInput: Device {0} does not support AnalogInput on port {1}", dc.PortDeviceKey, dc.PortNumber);
                 return null;
             }
 
+
             return ioPortDevice.VersiPorts[dc.PortNumber];
+
+
         }
     }
 
 
     /// <summary>
-    /// Factory for creating GenericVersiportAnalogInputDevice devices
+    /// Represents a GenericVersiportAbalogInputDeviceFactory
     /// </summary>
-    public class GenericVersiportAnalogInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportAnalogInputDevice>
+    public class GenericVersiportAbalogInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportAnalogInputDevice>
     {
-        /// <summary>
-        /// Constructor for GenericVersiportAnalogInputDeviceFactory
-        /// </summary>
-        public GenericVersiportAnalogInputDeviceFactory()
+        public GenericVersiportAbalogInputDeviceFactory()
         {
             TypeNames = new List<string>() { "versiportanaloginput" };
         }
 
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs

@@ -4,80 +4,73 @@ using System;
 using System.Collections.Generic;
 using Crestron.SimplSharpPro;
 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.Bridges;
+
+
+using Newtonsoft.Json;
+using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IPartitionStateProvider, IHasFeedback
+    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IPartitionStateProvider
     {
-        private Versiport inputPort;
+        public Versiport InputPort { get; private set; }
 
-        /// <summary>
-        /// Gets or sets the InputStateFeedback
-        /// </summary>
         public BoolFeedback InputStateFeedback { get; private set; }
 
-        /// <inheritdoc />
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
+        Func<bool> InputStateFeedbackFunc
+        {
+            get
+            {
+                return () => InputPort.DigitalIn;
+            }
+        }
 
         /// <summary>
         /// Gets or sets the PartitionPresentFeedback
         /// </summary>
         public BoolFeedback PartitionPresentFeedback { get; }
 
-        /// <summary>
-        /// Get partition state
-        /// </summary>
-        public bool PartitionPresent => !inputPort.DigitalIn;
+        public bool PartitionPresent => !InputStateFeedbackFunc();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericVersiportDigitalInputDevice"/> class.
-        /// </summary>
-        /// <param name="key">key for device</param>
-        /// <param name="name">name for device</param>
-        /// <param name="postActivationFunc">function to call after activation. Should return the Versiport</param>
-        /// <param name="config">config for device</param>
         public GenericVersiportDigitalInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
             base(key, name)
         {
-            InputStateFeedback = new BoolFeedback("inputState", () => inputPort.DigitalIn);
-            PartitionPresentFeedback = new BoolFeedback("partitionPresent", () => !inputPort.DigitalIn);
+            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
+            PartitionPresentFeedback = new BoolFeedback(() => !InputStateFeedbackFunc());
 
             AddPostActivationAction(() =>
             {
-                inputPort = postActivationFunc(config);
+                InputPort = postActivationFunc(config);
 
-                inputPort.Register();
+                InputPort.Register();
 
-                inputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
+                InputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
                 if (config.DisablePullUpResistor)
-                    inputPort.DisablePullUpResistor = true;
+                    InputPort.DisablePullUpResistor = true;
 
-                inputPort.VersiportChange += InputPort_VersiportChange;
+                InputPort.VersiportChange += InputPort_VersiportChange;
 
                 InputStateFeedback.FireUpdate();
                 PartitionPresentFeedback.FireUpdate();
 
-                this.LogDebug("Created GenericVersiportDigitalInputDevice for port {port}.  DisablePullUpResistor: {pullUpResistorDisable}", config.PortNumber, inputPort.DisablePullUpResistor);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
 
             });
 
-            Feedbacks.Add(InputStateFeedback);
-            Feedbacks.Add(PartitionPresentFeedback);
         }
 
         void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-            this.LogDebug("Versiport change: {0}", args.Event);
+			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
 
-            if (args.Event == eVersiportEvent.DigitalInChange)
+            if(args.Event == eVersiportEvent.DigitalInChange)
             {
                 InputStateFeedback.FireUpdate();
                 PartitionPresentFeedback.FireUpdate();
@@ -106,20 +99,20 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 InputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.InputState.JoinNumber]);
             }
             catch (Exception e)
             {
-                this.LogError("Unable to link device {key}.  Input is null. {message}", Key, e.Message);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
         }
 
@@ -131,50 +124,63 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
         {
+         
+            IIOPorts ioPortDevice;
+
             if (dc.PortDeviceKey.Equals("processor"))
             {
                 if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.LogError("GetVersiportDigitalInput: Processor does not support Versiports");
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Processor does not support Versiports");
                     return null;
                 }
-                return Global.ControlSystem.VersiPorts[dc.PortNumber];
+                ioPortDevice = Global.ControlSystem;
             }
-
-            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
+            else
             {
-                Debug.LogError("GetVersiportDigitalInput: Device {key} is not a valid device", dc.PortDeviceKey);
+                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                if (ioPortDev == null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                ioPortDevice = ioPortDev;
+            }
+            if (ioPortDevice == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
                 return null;
             }
 
             if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
             {
-                Debug.LogError("GetVersiportDigitalInput: Device {key} does not contain versiport {port}", dc.PortDeviceKey, dc.PortNumber);
-                return null;
+                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
             }
 
             return ioPortDevice.VersiPorts[dc.PortNumber];
+
+
         }
     }
 
 
     /// <summary>
-    /// Factory class for GenericVersiportDigitalInputDevice
+    /// Represents a GenericVersiportDigitalInputDeviceFactory
     /// </summary>
     public class GenericVersiportDigitalInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
     {
-        /// <summary>
-        /// Constructor for GenericVersiportDigitalInputDeviceFactory
-        /// </summary>
         public GenericVersiportDigitalInputDeviceFactory()
         {
             TypeNames = new List<string>() { "versiportinput" };
         }
 
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs

@@ -4,11 +4,13 @@ using System;
 using System.Collections.Generic;
 using Crestron.SimplSharpPro;
 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.Bridges;
+
+
+using Newtonsoft.Json;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.CrestronIO
@@ -16,68 +18,76 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// <summary>
     /// Represents a generic digital input deviced tied to a versiport
     /// </summary>
-    public class GenericVersiportDigitalOutputDevice : EssentialsBridgeableDevice, IDigitalOutput, IHasFeedback
+    public class GenericVersiportDigitalOutputDevice : EssentialsBridgeableDevice, IDigitalOutput
     {
-        private Versiport outputPort;
+        public Versiport OutputPort { get; private set; }
 
-        /// <summary>
-        /// Gets or sets the OutputStateFeedback
-        /// </summary>
         public BoolFeedback OutputStateFeedback { get; private set; }
 
-        /// <inheritdoc />
-        public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();
+        Func<bool> OutputStateFeedbackFunc
+        {
+            get
+            {
+                return () => OutputPort.DigitalOut;
+            }
+        }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenericVersiportDigitalOutputDevice"/> class.
-        /// </summary>
         public GenericVersiportDigitalOutputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
             base(key, name)
         {
-            OutputStateFeedback = new BoolFeedback("outputState", () => outputPort.DigitalOut);
+            OutputStateFeedback = new BoolFeedback(OutputStateFeedbackFunc);
 
             AddPostActivationAction(() =>
             {
-                outputPort = postActivationFunc(config);
+                OutputPort = postActivationFunc(config);
 
-                outputPort.Register();
+                OutputPort.Register();
 
 
-                if (!outputPort.SupportsDigitalOutput)
+                if (!OutputPort.SupportsDigitalOutput)
                 {
-                    this.LogError("Device does not support configuration as a Digital Output");
+                    Debug.LogMessage(LogEventLevel.Information, this, "Device does not support configuration as a Digital Output");
                     return;
                 }
 
-                outputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalOutput);
+                OutputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalOutput);
 
 
-                outputPort.VersiportChange += OutputPort_VersiportChange;
+                OutputPort.VersiportChange += OutputPort_VersiportChange;
 
             });
+
         }
 
         void OutputPort_VersiportChange(Versiport port, VersiportEventArgs args)
         {
-            this.LogDebug("Versiport change: {event}", args.Event);
+			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);
 
-            if (args.Event == eVersiportEvent.DigitalOutChange)
+            if(args.Event == eVersiportEvent.DigitalOutChange)
                 OutputStateFeedback.FireUpdate();
         }
 
         /// <summary>
         /// Set value of the versiport digital output
         /// </summary>
-        /// <param name="state">value to set the output to</param>        
+        /// <param name="state">value to set the output to</param>
+        /// <summary>
+        /// SetOutput method
+        /// </summary>
         public void SetOutput(bool state)
         {
-            if (!outputPort.SupportsDigitalOutput)
-            {
-                this.LogError("Versiport does not support Digital Output Mode");
-                return;
-            }
+                if (OutputPort.SupportsDigitalOutput)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, this, "Passed the Check");
+
+                    OutputPort.DigitalOut = state;
+
+                }
+                else
+                {
+                    Debug.LogMessage(LogEventLevel.Information, this, "Versiport does not support Digital Output Mode");
+                }
 
-            outputPort.DigitalOut = state;
         }
 
         #region Bridge Linking
@@ -101,12 +111,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             else
             {
-                this.LogWarning("Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
             try
             {
-                this.LogDebug("Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+                Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
                 // Link feedback for input state
                 OutputStateFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OutputState.JoinNumber]);
@@ -114,8 +124,8 @@ namespace PepperDash.Essentials.Core.CrestronIO
             }
             catch (Exception e)
             {
-                this.LogError("Unable to link device: {message}", e.Message);
-                this.LogDebug(e, "Stack Trace: ");
+                Debug.LogMessage(LogEventLevel.Debug, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
             }
         }
 
@@ -127,28 +137,41 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// </summary>
         public static Versiport GetVersiportDigitalOutput(IOPortConfig dc)
         {
-            if (dc.PortDeviceKey.Equals("processor"))
-            {
-                if (!Global.ControlSystem.SupportsVersiport)
+
+                IIOPorts ioPortDevice;
+
+                if (dc.PortDeviceKey.Equals("processor"))
                 {
-                    Debug.LogError("GetVersiportDigitalOutput: Processor does not support Versiports");
+                    if (!Global.ControlSystem.SupportsVersiport)
+                    {
+                        Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Processor does not support Versiports");
+                        return null;
+                    }
+                    ioPortDevice = Global.ControlSystem;
+                }
+                else
+                {
+                    var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                    if (ioPortDev == null)
+                    {
+                        Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device {0} is not a valid device", dc.PortDeviceKey);
+                        return null;
+                    }
+                    ioPortDevice = ioPortDev;
+                }
+                if (ioPortDevice == null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device '0' is not a valid IOPorts Device", dc.PortDeviceKey);
                     return null;
                 }
-                return Global.ControlSystem.VersiPorts[dc.PortNumber];
-            }
 
-            if (!(DeviceManager.GetDeviceForKey(dc.PortDeviceKey) is IIOPorts ioPortDevice))
-            {
-                Debug.LogError("GetVersiportDigitalOutput: Device {key} is not a valid device", dc.PortDeviceKey);
-                return null;
-            }
+                if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOuptut: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                }
+                var port = ioPortDevice.VersiPorts[dc.PortNumber];
+                return port;
 
-            if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "GetVersiportDigitalOutput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-                return null;
-            }
-            return ioPortDevice.VersiPorts[dc.PortNumber];
         }
     }
 
@@ -158,18 +181,18 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public class GenericVersiportDigitalOutputDeviceFactory : EssentialsDeviceFactory<GenericVersiportDigitalInputDevice>
     {
-        /// <summary>
-        /// Initialize a new instance of the <see cref="GenericVersiportDigitalOutputDeviceFactory"/> class.
-        /// </summary>
         public GenericVersiportDigitalOutputDeviceFactory()
         {
             TypeNames = new List<string>() { "versiportoutput" };
         }
 
+        /// <summary>
+        /// BuildDevice method
+        /// </summary>
         /// <inheritdoc />
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogDebug("Factory Attempting to create new Generic Versiport Device");
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Versiport Device");
 
             var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
 

src/PepperDash.Essentials.Core/CrestronIO/IAnalogInput.cs

@@ -1,23 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.CrestronIO
+namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Defines the contract for IAnalogInput
     /// </summary>
     public interface IAnalogInput
     {
-        /// <summary>
-        /// Get the InputValueFeedback.
-        /// </summary>
-        /// <remarks>
-        /// Updates when the analog input value changes
-        /// </remarks>
         IntFeedback InputValueFeedback { get; }
     }
 }

src/PepperDash.Essentials.Core/CrestronIO/IDigitalInput.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core.CrestronIO
+namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a device that provides digital input

src/PepperDash.Essentials.Core/CrestronIO/IDigitalOutput.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core.CrestronIO
+namespace PepperDash.Essentials.Core.CrestronIO
 {
     /// <summary>
     /// Represents a device that provides digital input

src/PepperDash.Essentials.Core/CrestronIO/IHasCresnetBranches.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 
 namespace PepperDash.Essentials.Core

src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs

@@ -1,11 +1,4 @@
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {
@@ -14,28 +7,25 @@ namespace PepperDash.Essentials.Core.CrestronIO
     /// </summary>
     public class IOPortConfig
     {
+        [JsonProperty("portDeviceKey")]
         /// <summary>
         /// Gets or sets the PortDeviceKey
         /// </summary>
-        [JsonProperty("portDeviceKey")]
         public string PortDeviceKey { get; set; }
-
+        [JsonProperty("portNumber")]
         /// <summary>
         /// Gets or sets the PortNumber
         /// </summary>
-        [JsonProperty("portNumber")]
         public uint PortNumber { get; set; }
-
+        [JsonProperty("disablePullUpResistor")]
         /// <summary>
         /// Gets or sets the DisablePullUpResistor
         /// </summary>
-        [JsonProperty("disablePullUpResistor")]
         public bool DisablePullUpResistor { get; set; }
-
+        [JsonProperty("minimumChange")]
         /// <summary>
         /// Gets or sets the MinimumChange
         /// </summary>
-        [JsonProperty("minimumChange")]
         public int MinimumChange { get; set; }
     }
 }

src/PepperDash.Essentials.Core/CrestronIO/ISwitchedOutput.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {

src/PepperDash.Essentials.Core/Device Info/IDeviceInfoProvider.cs

@@ -1,5 +1,4 @@
-using System;
-using PepperDash.Core;
+using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.DeviceInfo
 {

src/PepperDash.Essentials.Core/Device Info/NetworkDeviceHelpers.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using PepperDash.Core;
 using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.DeviceInfo

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IChannel.cs

@@ -1,8 +1,4 @@
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
+using Crestron.SimplSharpPro.DeviceSupport;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IColorFunctions.cs

@@ -1,8 +1,4 @@
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
+using Crestron.SimplSharpPro.DeviceSupport;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ICustomMobileControl.cs

@@ -1,11 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Use this interface on a device or room if it uses custom Mobile Control messengers
-  /// </summary>
-  public interface ICustomMobileControl : IKeyed
-  {
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDPad.cs

@@ -1,8 +1,5 @@
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDiscPlayerControls.cs

@@ -1,9 +1,4 @@
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
 {
 
     /// <summary>

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDisplayBasic.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core.Devices.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.Devices.DeviceTypeInterfaces
 {
  /// <summary>
  /// Defines the contract for IDisplayBasic

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDumbSource.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
 {
  /// <summary>
  /// Defines the contract for IDumbSource

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDvr.cs

@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
+using Crestron.SimplSharpPro.DeviceSupport;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IEmergencyOSD.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     /// <summary>
     /// Defines the contract for IEmergencyOSD

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasBranding.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     /// <summary>
     /// Defines the contract for IHasBranding

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasPhoneDialing.cs

@@ -1,7 +1,4 @@
-using System;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     /// <summary>
     /// Defines the contract for IHasPhoneDialing

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasScreensWithLayouts.cs

@@ -1,9 +1,5 @@
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasSurroundSoundModes.cs

@@ -1,9 +1,4 @@
 using PepperDash.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasWebView.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHumiditySensor.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     /// <summary>
     /// Defines the contract for IHumiditySensor

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ILanguageDefinition.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ILevelControls.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMeterFeedback.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
 

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs

@@ -1,72 +1,155 @@
 using System;
+using System.Collections.ObjectModel;
+using Crestron.SimplSharpPro;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
+    /// <summary>
+    /// Use this interface on a device or room if it uses custom Mobile Control messengers
+    /// </summary>
+    public interface ICustomMobileControl : IKeyed
+    {
+    }
+
+    /*/// <summary>
+    /// Describes a MobileControlSystemController
+    /// </summary>
+    public interface IMobileControl : IKeyed
+    {
+        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+
+        void LinkSystemMonitorToAppServer();
+    }*/
 
     /// <summary>
     /// Defines the contract for IMobileControl
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        /// <summary>
-        /// Gets the Host
-        /// </summary>
         string Host { get; }
 
-        /// <summary>
-        /// Gets the Client App URL
-        /// </summary>
         string ClientAppUrl { get; }
 
-        /// <summary>
-        /// Gets the System UUID
-        /// </summary>
         string SystemUuid { get; }
 
-        /// <summary>
-        /// Gets the ApiOnlineAndAuthorized feedback
-        /// </summary>
         BoolFeedback ApiOnlineAndAuthorized { get; }
 
-        /// <summary>
-        /// Sends the message object to the AppServer
-        /// </summary>
-        /// <param name="o">Message to send</param>
         void SendMessageObject(IMobileControlMessage o);
 
-        /// <summary>
-        /// Adds an action for a messenger
-        /// </summary>
-        /// <typeparam name="T">Messenger type. Must implement IMobileControlMessenger</typeparam>
-        /// <param name="messenger">messenger to register</param>
-        /// <param name="action">action to add</param>
         void AddAction<T>(T messenger, Action<string, string, JToken> action) where T : IMobileControlMessenger;
 
-        /// <summary>
-        /// Removes an action for a messenger
-        /// </summary>
-        /// <param name="key">key for action</param>
         void RemoveAction(string key);
 
-        /// <summary>
-        /// Adds a device messenger
-        /// </summary>
-        /// <param name="messenger">Messenger to add</param>
         void AddDeviceMessenger(IMobileControlMessenger messenger);
 
-        /// <summary>
-        /// Check if a device messenger exists
-        /// </summary>
-        /// <param name="key">Messenger key to find</param>
         bool CheckForDeviceMessenger(string key);
 
-        /// <summary>
-        /// Get a Room Messenger by key
-        /// </summary>
-        /// <param name="key">messenger key to find</param>
-        /// <returns>Messenger if found, null otherwise</returns>
         IMobileControlRoomMessenger GetRoomMessenger(string key);
+
+    }
+
+    /// <summary>
+    /// Defines the contract for IMobileControlMessenger
+    /// </summary>
+    public interface IMobileControlMessenger : IKeyed
+    {
+        IMobileControl AppServerController { get; }
+        string MessagePath { get; }
+
+        string DeviceKey { get; }
+        void RegisterWithAppServer(IMobileControl appServerController);
+    }
+
+    public interface IMobileControlMessage
+    {
+        [JsonProperty("type")]
+        string Type { get; }
+
+        [JsonProperty("clientId", NullValueHandling = NullValueHandling.Ignore)]
+        string ClientId { get; }
+
+        [JsonProperty("content", NullValueHandling = NullValueHandling.Ignore)]
+        JToken Content { get; }
+
+    }
+
+    /// <summary>
+    /// Defines the contract for IMobileControlRoomMessenger
+    /// </summary>
+    public interface IMobileControlRoomMessenger : IKeyed
+    {
+        event EventHandler<EventArgs> UserCodeChanged;
+
+        event EventHandler<EventArgs> UserPromptedForCode;
+
+        event EventHandler<EventArgs> ClientJoined;
+
+        event EventHandler<EventArgs> AppUrlChanged;
+
+        string UserCode { get; }
+
+        string QrCodeUrl { get; }
+
+        string QrCodeChecksum { get; }
+
+        string McServerUrl { get; }
+
+        string RoomName { get; }
+
+        string AppUrl { get; }
+
+        void UpdateAppUrl(string url);
+    }
+
+    /// <summary>
+    /// Defines the contract for IMobileControlAction
+    /// </summary>
+    public interface IMobileControlAction
+    {
+        IMobileControlMessenger Messenger { get; }
+
+        Action<string, string, JToken> Action { get; }
+    }
+
+    /// <summary>
+    /// Defines the contract for IMobileControlTouchpanelController
+    /// </summary>
+    public interface IMobileControlTouchpanelController : IKeyed
+    {
+        /// <summary>
+        /// The default room key for the controller
+        /// </summary>
+        string DefaultRoomKey { get; }
+
+        /// <summary>
+        /// Sets the application URL for the controller
+        /// </summary>
+        /// <param name="url">The application URL</param>
+        void SetAppUrl(string url);
+
+        /// <summary>
+        /// Indicates whether the controller uses a direct server connection
+        /// </summary>
+        bool UseDirectServer { get; }
+
+        /// <summary>
+        /// Indicates whether the controller is a Zoom Room controller
+        /// </summary>
+        bool ZoomRoomController { get; }
+    }
+
+    /// <summary>
+    /// Describes a MobileControl Crestron Touchpanel Controller
+    /// This interface extends the IMobileControlTouchpanelController to include connected IP information
+    /// </summary>
+    public interface IMobileControlCrestronTouchpanelController : IMobileControlTouchpanelController
+    {
+        /// <summary>
+        /// Gets a collection of connected IP information for the touchpanel controller
+        /// </summary>
+        ReadOnlyCollection<ConnectedIpInformation> ConnectedIps { get; }
     }
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlAction.cs

@@ -1,15 +0,0 @@
-using System;
-using Newtonsoft.Json.Linq;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlAction
-  /// </summary>
-  public interface IMobileControlAction
-  {
-    IMobileControlMessenger Messenger { get; }
-
-    Action<string, string, JToken> Action { get; }
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlCrestronTouchpanelController.cs

@@ -1,17 +0,0 @@
-using System.Collections.ObjectModel;
-using Crestron.SimplSharpPro;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Describes a MobileControl Crestron Touchpanel Controller
-  /// This interface extends the IMobileControlTouchpanelController to include connected IP information
-  /// </summary>
-  public interface IMobileControlCrestronTouchpanelController : IMobileControlTouchpanelController
-  {
-    /// <summary>
-    /// Gets a collection of connected IP information for the touchpanel controller
-    /// </summary>
-    ReadOnlyCollection<ConnectedIpInformation> ConnectedIps { get; }
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlMessage.cs

@@ -1,18 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  public interface IMobileControlMessage
-  {
-    [JsonProperty("type")]
-    string Type { get; }
-
-    [JsonProperty("clientId", NullValueHandling = NullValueHandling.Ignore)]
-    string ClientId { get; }
-
-    [JsonProperty("content", NullValueHandling = NullValueHandling.Ignore)]
-    JToken Content { get; }
-
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlMessenger.cs

@@ -1,31 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlMessenger
-  /// </summary>
-  public interface IMobileControlMessenger : IKeyed
-  {
-    /// <summary>
-    /// Parent controller for this messenger
-    /// </summary>
-    IMobileControl AppServerController { get; }
-
-    /// <summary>
-    /// Path to listen for messages
-    /// </summary>
-    string MessagePath { get; }
-
-    /// <summary>
-    /// Key of the device this messenger is associated with
-    /// </summary>
-    string DeviceKey { get; }
-
-    /// <summary>
-    /// Register this messenger with the AppServerController
-    /// </summary>
-    /// <param name="appServerController"></param>
-    void RegisterWithAppServer(IMobileControl appServerController);
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlMessengerWithSubscriptions.cs

@@ -1,23 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlMessenger
-  /// </summary>
-  public interface IMobileControlMessengerWithSubscriptions : IMobileControlMessenger
-  {
-    /// <summary>
-    /// Unsubscribe a client from this messenger
-    /// </summary>
-    /// <param name="clientId"></param>
-    void UnsubscribeClient(string clientId);
-
-    /// <summary>
-    /// Register this messenger with the AppServerController
-    /// </summary>
-    /// <param name="appServerController">parent for this messenger</param>
-    /// <param name="enableMessengerSubscriptions">Enable messenger subscriptions</param>
-    void RegisterWithAppServer(IMobileControl appServerController, bool enableMessengerSubscriptions);
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlRoomMessenger.cs

@@ -1,33 +0,0 @@
-using System;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlRoomMessenger
-  /// </summary>
-  public interface IMobileControlRoomMessenger : IKeyed
-  {
-    event EventHandler<EventArgs> UserCodeChanged;
-
-    event EventHandler<EventArgs> UserPromptedForCode;
-
-    event EventHandler<EventArgs> ClientJoined;
-
-    event EventHandler<EventArgs> AppUrlChanged;
-
-    string UserCode { get; }
-
-    string QrCodeUrl { get; }
-
-    string QrCodeChecksum { get; }
-
-    string McServerUrl { get; }
-
-    string RoomName { get; }
-
-    string AppUrl { get; }
-
-    void UpdateAppUrl(string url);
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlTouchpanelController.cs

@@ -1,31 +0,0 @@
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-  /// <summary>
-  /// Defines the contract for IMobileControlTouchpanelController
-  /// </summary>
-  public interface IMobileControlTouchpanelController : IKeyed
-  {
-    /// <summary>
-    /// The default room key for the controller
-    /// </summary>
-    string DefaultRoomKey { get; }
-
-    /// <summary>
-    /// Sets the application URL for the controller
-    /// </summary>
-    /// <param name="url">The application URL</param>
-    void SetAppUrl(string url);
-
-    /// <summary>
-    /// Indicates whether the controller uses a direct server connection
-    /// </summary>
-    bool UseDirectServer { get; }
-
-    /// <summary>
-    /// Indicates whether the controller is a Zoom Room controller
-    /// </summary>
-    bool ZoomRoomController { get; }
-  }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INumeric.cs

@@ -1,7 +1,5 @@
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INvxNetworkPortInformation.cs

@@ -1,7 +1,6 @@
+using Crestron.SimplSharpPro.DM.Streaming;
 using System;
 using System.Collections.Generic;
-using Crestron.SimplSharpPro.DM.Streaming;
-using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
@@ -12,7 +11,7 @@ namespace PepperDash.Essentials.Core
     /// subscribers when the port information is updated. Implementations of this interface should ensure that the  <see
     /// cref="PortInformationChanged"/> event is raised whenever the <see cref="NetworkPorts"/> collection
     /// changes.</remarks>
-    public interface INvxNetworkPortInformation : IKeyed
+    public interface INvxNetworkPortInformation
     {
         /// <summary>
         /// Occurs when the port information changes.

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPasswordPrompt.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPower.cs

@@ -1,14 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.Fusion;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
+using Crestron.SimplSharpPro.DeviceSupport;
 
 
 namespace PepperDash.Essentials.Core

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IProjectorScreenLiftControl.cs

@@ -1,7 +1,4 @@
-using Crestron.SimplSharpPro.DeviceSupport;
-using System;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
+using System;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISetTopBoxControls.cs

@@ -1,8 +1,5 @@
 using Crestron.SimplSharpPro.DeviceSupport;
 
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-
 namespace PepperDash.Essentials.Core
 {
  /// <summary>

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IStateFeedback.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
 

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITemperatureSensor.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     /// <summary>
     /// Defines the contract for ITemperatureSensor

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IWarmingCooling.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
 {
 	/// <summary>
 	/// Defines a class that has warm up and cool down

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/LanguageLabel.cs

@@ -1,7 +1,4 @@
-using System;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     /// <summary>
     /// Represents a LanguageLabel

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/Template.cs

@@ -1,9 +1,4 @@
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
 {
 	
 }

src/PepperDash.Essentials.Core/Devices/AudioControlListItemBase.cs

@@ -1,9 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Devices/AudioInterfaces.cs

@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
 {
 
  /// <summary>

src/PepperDash.Essentials.Core/Devices/CodecInterfaces.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// Adds control of codec receive volume

src/PepperDash.Essentials.Core/Devices/CrestronProcessor.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.CrestronIO;

src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs

@@ -1,7 +1,6 @@
 
 
 using Newtonsoft.Json;
-using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Devices/DeviceApiBase.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Core.Devices
 {

src/PepperDash.Essentials.Core/Devices/DeviceFeedbackExtensions.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
+using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Devices/DeviceManager.cs

@@ -202,15 +202,14 @@ namespace PepperDash.Essentials.Core
 
         private static void ListDevices(string s)
         {
-            CrestronConsole.ConsoleCommandResponse($"{Devices.Count} Devices registered with Device Manager:\r\n");
-
+            Debug.LogMessage(LogEventLevel.Information, "{0} Devices registered with Device Manager:", Devices.Count);
             var sorted = Devices.Values.ToList();
             sorted.Sort((a, b) => a.Key.CompareTo(b.Key));
 
             foreach (var d in sorted)
             {
                 var name = d is IKeyName ? (d as IKeyName).Name : "---";
-                CrestronConsole.ConsoleCommandResponse($"  [{d.Key}] {name}\r\n");
+                Debug.LogMessage(LogEventLevel.Information, "  [{0}] {1}", d.Key, name);
             }
         }
 
@@ -219,17 +218,28 @@ namespace PepperDash.Essentials.Core
             var dev = GetDeviceForKey(devKey);
             if (dev == null)
             {
-                CrestronConsole.ConsoleCommandResponse($"Device '{devKey}' not found\r\n");
+                Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
                 return;
             }
             if (!(dev is IHasFeedback statusDev))
             {
-                CrestronConsole.ConsoleCommandResponse($"Device '{devKey}' does not have visible feedbacks\r\n");
+                Debug.LogMessage(LogEventLevel.Information, "Device '{0}' does not have visible feedbacks", devKey);
                 return;
             }
             statusDev.DumpFeedbacksToConsole(true);
         }
 
+        //static void ListDeviceCommands(string devKey)
+        //{
+        //    var dev = GetDeviceForKey(devKey);
+        //    if (dev == null)
+        //    {
+        //        Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
+        //        return;
+        //    }
+        //    Debug.LogMessage(LogEventLevel.Information, "This needs to be reworked.  Stay tuned.", devKey);
+        //}
+
         private static void ListDeviceCommStatuses(string input)
         {
 
@@ -239,6 +249,12 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+
+        //static void DoDeviceCommand(string command)
+        //{
+        //    Debug.LogMessage(LogEventLevel.Information, "Not yet implemented.  Stay tuned");
+        //}
+
         /// <summary>
         /// AddDevice method
         /// </summary>
@@ -459,9 +475,9 @@ namespace PepperDash.Essentials.Core
             if (String.IsNullOrEmpty(s) || s.Contains("?"))
             {
                 CrestronConsole.ConsoleCommandResponse(
-                    "SETDEVICESTREAMDEBUG [{deviceKey}] [OFF |TX | RX | BOTH] [timeOutInMinutes]\r\n" +
-                    "    {deviceKey} [OFF | TX | RX | BOTH] - Device to set stream debugging on, and which setting to use\r\n" +
-                    "    timeOutInMinutes - Set timeout for stream debugging. Default is 30 minutes");
+                    @"SETDEVICESTREAMDEBUG [{deviceKey}] [OFF |TX | RX | BOTH] [timeOutInMinutes]
+    {deviceKey} [OFF | TX | RX | BOTH] - Device to set stream debugging on, and which setting to use
+    timeOutInMinutes - Set timeout for stream debugging. Default is 30 minutes");
                 return;
             }
 

src/PepperDash.Essentials.Core/Devices/DisplayUiConstants.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core
 {
 	/// <summary>
 	/// Integers that represent the "source type number" for given sources.

src/PepperDash.Essentials.Core/Devices/EssentialsBridgeableDevice.cs

@@ -3,29 +3,16 @@ using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
-    /// <summary>
-    /// Base class for devices that can be bridged to an EISC API.
-    /// </summary>
-    public abstract class EssentialsBridgeableDevice : EssentialsDevice, IBridgeAdvanced
+    public abstract class EssentialsBridgeableDevice:EssentialsDevice, IBridgeAdvanced
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EssentialsBridgeableDevice"/> class with the specified key.
-        /// </summary>
-        /// <param name="key">The unique key for the device.</param>
         protected EssentialsBridgeableDevice(string key) : base(key)
         {
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EssentialsBridgeableDevice"/> class with the specified key and name.
-        /// </summary>
-        /// <param name="key">The unique key for the device.</param>
-        /// <param name="name">The display name for the device.</param>
         protected EssentialsBridgeableDevice(string key, string name) : base(key, name)
         {
         }
 
-        /// <inheritdoc />
         public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
     }
 }

src/PepperDash.Essentials.Core/Devices/EssentialsDeviceFactory.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Core
     public List<string> TypeNames { get; protected set; }
 
     /// <summary>
-    /// Build the device using the configuration
+    /// The method that will build the device
     /// </summary>
     /// <param name="dc">The device config</param>
     /// <returns>An instance of the device</returns>

src/PepperDash.Essentials.Core/Devices/GenericIRController.cs

@@ -1,7 +1,4 @@
-
-
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;

src/PepperDash.Essentials.Core/Devices/GenericMonitoredTcpDevice.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
+using PepperDash.Core;
 using Serilog.Events;
 
 

src/PepperDash.Essentials.Core/Devices/IAttachVideoStatusExtensions.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
+using System.Linq;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Devices/IHasFeedbacks.cs

@@ -1,90 +1,65 @@
 using System;
 using System.Linq;
-using Crestron.SimplSharp;
+
 using PepperDash.Core;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
-	/// Defines the contract for IHasFeedback
-	/// </summary>
+ /// <summary>
+ /// Defines the contract for IHasFeedback
+ /// </summary>
 	public interface IHasFeedback : IKeyed
 	{
 		/// <summary>
-		/// This method returns a list of all Output objects on a device,
+		/// This method shall return a list of all Output objects on a device,
 		/// including all "aggregate" devices.
 		/// </summary>
 		FeedbackCollection<Feedback> Feedbacks { get; }
 
 	}
 
-	/// <summary>
-	/// Extension methods for IHasFeedback
-	/// </summary>
+
 	public static class IHasFeedbackExtensions
 	{
-		/// <summary>
-		/// Gets the feedback type name for sorting purposes
-		/// </summary>
-		/// <param name="feedback">The feedback to get the type name for</param>
-		/// <returns>A string representing the feedback type</returns>
-		private static string GetFeedbackTypeName(Feedback feedback)
-		{
-			if (feedback is BoolFeedback)
-				return "boolean";
-			else if (feedback is IntFeedback)
-				return "integer";
-			else if (feedback is StringFeedback)
-				return "string";
-			else
-				return feedback.GetType().Name;
-		}
-
-		/// <summary>
-		/// Dumps the feedbacks to the console
-		/// </summary>
-		/// <param name="source"></param>
-		/// <param name="getCurrentStates"></param>
 		public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
 		{
+            Type t = source.GetType();
+            // get the properties and set them into a new collection of NameType wrappers
+            var props = t.GetProperties().Select(p => new PropertyNameType(p, t));
+
 			var feedbacks = source.Feedbacks;
-
-			if (feedbacks == null || feedbacks.Count == 0)
+			if (feedbacks != null)
 			{
-				CrestronConsole.ConsoleCommandResponse("No available feedbacks\r\n");
-				return;
-			}
-
-			CrestronConsole.ConsoleCommandResponse("Available feedbacks:\r\n");
-
-			// Sort feedbacks by type first, then by key
-			var sortedFeedbacks = feedbacks.OrderBy(f => GetFeedbackTypeName(f)).ThenBy(f => string.IsNullOrEmpty(f.Key) ? "" : f.Key);
-
-			foreach (var feedback in sortedFeedbacks)
-			{
-				string value = "";
-				string type = "";
-				if (getCurrentStates)
+				Debug.LogMessage(LogEventLevel.Information, source, "\n\nAvailable feedbacks:");
+				foreach (var f in feedbacks)
 				{
-					if (feedback is BoolFeedback)
+					string val = "";
+                    string type = "";
+					if (getCurrentStates)
 					{
-						value = feedback.BoolValue.ToString();
-						type = "boolean";
-					}
-					else if (feedback is IntFeedback)
-					{
-						value = feedback.IntValue.ToString();
-						type = "integer";
-					}
-					else if (feedback is StringFeedback)
-					{
-						value = feedback.StringValue;
-						type = "string";
+                        if (f is BoolFeedback)
+                        {
+                            val = f.BoolValue.ToString();
+                            type = "boolean";
+                        }
+                        else if (f is IntFeedback)
+                        {
+                            val = f.IntValue.ToString();
+                            type = "integer";
+                        }
+                        else if (f is StringFeedback)
+                        {
+                            val = f.StringValue;
+                            type = "string";
+                        }
 					}
+					Debug.LogMessage(LogEventLevel.Information, "{0,-12} {1, -25} {2}", type,
+						(string.IsNullOrEmpty(f.Key) ? "-no key-" : f.Key), val);
 				}
-				CrestronConsole.ConsoleCommandResponse($"  {type,-12} {(string.IsNullOrEmpty(feedback.Key) ? "-no key-" : feedback.Key),-25} {value}\r\n");
 			}
+			else
+				Debug.LogMessage(LogEventLevel.Information, source, "No available outputs:");
 		}
 	}
 }