ci(force-patch): add skip package check prop

feat: move MC into Essentials
In order to solve some dependency issues that keep cropping up, MC should be moved back into the Essentials repo and loaded automatically on startup. This will allow for all plugins that use the MC Messengers library to use the same version without fear of overwriting a dll due to loading of plugin libraries.
2026-01-29 04:15:00 +00:00 · 2025-03-24 22:39:52 -05:00 · 2025-03-24 22:28:27 -05:00 · 2025-03-12 12:55:42 -06:00 · 2025-03-12 13:54:13 -05:00 · 2025-03-12 13:41:21 -05:00
138 changed files with 17261 additions and 1745 deletions
--- a/.github/workflows/EssentialsPlugins-builds-4-series-caller.yml
+++ b/.github/workflows/EssentialsPlugins-builds-4-series-caller.yml
@@ -0,0 +1,22 @@
+name: Build PepperDash Essentials
+
+on:
+  push:
+    branches:
+      - '**'
+
+jobs:
+  getVersion:
+    uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-getversion.yml@main
+    secrets: inherit
+  build-4Series:
+    uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-4Series-builds.yml@main
+    secrets: inherit
+    needs: getVersion
+    if: needs.getVersion.outputs.newVersion == 'true'
+    with:
+      newVersion: ${{ needs.getVersion.outputs.newVersion }}
+      version: ${{ needs.getVersion.outputs.version }}
+      tag: ${{ needs.getVersion.outputs.tag }}
+      channel: ${{ needs.getVersion.outputs.channel }}
+      bypassPackageCheck: true
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,94 +0,0 @@
-name: Branch Build Using Docker
-
-on:
-  push:
-    branches:
-      - feature-2.0.0/*
-      - hotfix-2.0.0/*
-      - release-2.0.0/*
-      - development-2.0.0
-
-env:
-  # solution path doesn't need slashes unless there it is multiple folders deep
-  # solution name does not include extension. .sln is assumed
-  SOLUTION_PATH: .
-  SOLUTION_FILE: PepperDash.Essentials
-  # Do not edit this, we're just creating it here
-  VERSION: 0.0.0-buildtype-buildnumber
-  # Defaults to debug for build type
-  BUILD_TYPE: Debug
-  # Defaults to main as the release branch.  Change as necessary
-  RELEASE_BRANCH: main
-jobs:
-  Build_Project_4-Series:
-    runs-on: windows-latest
-    steps:      
-      - uses: actions/checkout@v3
-      - name: Set Version Number
-        id: setVersion
-        shell: powershell
-        run: |
-          $latestVersion = [version]"2.0.0"
-
-          $newVersion = [version]$latestVersion
-          $phase = ""
-          $newVersionString = ""
-
-          switch -regex ($Env:GITHUB_REF) {
-            '^refs\/pull\/*.' {
-              $phase = 'beta';
-              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            '^refs\/heads\/hotfix-2.0.0\/*.' {
-              $phase = 'hotfix'
-              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            '^refs\/heads\/release-2.0.0\/*.' {
-              $splitRef = $Env:GITHUB_REF -split "/"
-              $version = [version]($splitRef[-1] -replace "v", "")
-              $phase = 'rc'
-              $newVersionString = "{0}-{1}-{2}" -f $version, $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            '^refs\/heads\/feature-2.0.0\/*.' {
-              $phase = 'alpha'
-              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-            }
-            'development-2.0.0' {
-              $phase = 'beta'
-              $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-            }  
-          }          
-          echo "version=$newVersionString" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append      
-      - name: Setup MS Build
-        uses: microsoft/setup-msbuild@v1.1
-      - name: restore Nuget Packages
-        run: nuget restore .\$($Env:SOLUTION_FILE).sln
-      # Build the solutions in the docker image
-      - name: Build Solution        
-        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m
-      - name: Create tag for non-rc builds
-        if: contains(steps.setVersion.outputs.version, 'alpha')
-        run: |
-          git tag ${{ steps.setVersion.outputs.version }}
-          git push --tags origin
-      # Create the release on the source repo
-      - name: Create Release
-        id: create_release
-#        if: contains(steps.setVersion.outputs.version,'-rc-') ||
-#            contains(steps.setVersion.outputs.version,'-hotfix-') ||
-#            contains(steps.setVersion.outputs.version, '-beta-')
-        uses: ncipollo/release-action@v1
-        with:
-          artifacts: 'output\**\*.*(cpz|cplz)'
-          generateReleaseNotes: true
-          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
-          tag: ${{ steps.setVersion.outputs.version }}
-      - name: Setup Nuget
-        run: | 
-          nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username pepperdash -password ${{ secrets.GITHUB_TOKEN }}
-          nuget setApiKey ${{ secrets.GITHUB_TOKEN }} -Source github          
-          nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json          
-      - name: Publish to Nuget
-        run: nuget push .\output\*.nupkg -Source https://api.nuget.org/v3/index.json
-      - name: Publish to Github Nuget
-        run: nuget push .\output\*.nupkg -Source github
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,55 +0,0 @@
-name: main Build using Docker
-
-on:
-  release:
-    types:
-      - published
-    branches:
-      - main-2.0.0
-env:
-  # solution path doesn't need slashes unless there it is multiple folders deep
-  # solution name does not include extension. .sln is assumed
-  SOLUTION_PATH: PepperDashEssentials
-  SOLUTION_FILE: PepperDashEssentials
-  # Do not edit this, we're just creating it here
-  VERSION: 0.0.0-buildtype-buildnumber
-  # Defaults to debug for build type
-  BUILD_TYPE: Release
-  # Defaults to main as the release branch.  Change as necessary
-  RELEASE_BRANCH: main
-jobs:
-  Build_Project:
-    runs-on: windows-2019
-    steps:
-      # First we checkout the source repo
-      - name: Checkout repo
-        uses: actions/checkout@v3
-      # Generate the appropriate version number
-      - name: Set Version Number
-        shell: powershell
-        id: setVersion
-        env:
-          TAG_NAME: ${{ github.event.release.tag_name }}
-        run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
-      - name: Setup MS Build
-        uses: microsoft/setup-msbuild@v1.1
-      - name: restore Nuget Packages
-        run: nuget restore .\$($Env:SOLUTION_FILE).sln
-      - name: Build Solution        
-        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m      
-      - name: Upload Release
-        id: create_release
-        uses: ncipollo/release-action@v1
-        with:
-          updateRelease: true
-          artifacts: 'output\**\*.*(cpz|cplz)'          
-          tag: ${{ steps.setVersion.outputs.version }}
-      - name: Setup Nuget
-        run: | 
-          nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username pepperdash -password ${{ secrets.GITHUB_TOKEN }}
-          nuget setApiKey ${{ secrets.GITHUB_TOKEN }} -Source github          
-          nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json          
-      - name: Publish to Nuget
-        run: nuget push .\output\*.nupkg -Source https://api.nuget.org/v3/index.json
-      - name: Publish to Github Nuget
-        run: nuget push .\output\*.nupkg -Source github
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "Essentials-Template-UI"]
-	path = Essentials-Template-UI
-	url = https://github.com/PepperDash/Essentials-Template-UI.git
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -0,0 +1,36 @@
+{
+  "plugins": [
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "releaseRules": [
+          { "scope": "force-patch", "release": "patch" },
+          { "scope": "no-release", "release": false }
+        ]
+      }
+    ],
+    "@semantic-release/release-notes-generator",    
+    ["@semantic-release/changelog", 
+      {
+        "changelogFile": "CHANGELOG.md"
+      }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "verifyReleaseCmd": "echo \"newVersion=true\" >> $GITHUB_OUTPUT",
+        "publishCmd": "echo \"version=${nextRelease.version}\" >> $GITHUB_OUTPUT && echo \"tag=${nextRelease.gitTag}\" >> $GITHUB_OUTPUT && echo \"type=${nextRelease.type}\" >> $GITHUB_OUTPUT && echo \"channel=${nextRelease.channel}\" >> $GITHUB_OUTPUT"
+      }
+    ]
+  ],  
+  "branches": [
+    "main",
+    {"name": "development", "prerelease": "beta", "channel": "beta"},
+    {"name": "release", "prerelease": "rc", "channel": "rc"},
+    {
+      "name": "replace-me-feature-branch",
+      "prerelease": "replace-me-prerelease",
+      "channel": "replace-me-prerelease"
+    }
+  ]
+}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,8 +91,8 @@ we receive and the availability of resources to evaluate contributions, we antic
  project remains dynamic and relevant.  This may  affect our responsiveness and ability to accept pull requests 
  quickly.  This does not mean we are ignoring them.
 - Not all innovative ideas need to be accepted as pull requests into this GitHub project to be valuable to the community.        
-  There may be times when we recommend that you just share your code for some enhancement to Ghidra from your own 
-  repository. As we identify and recognize extensions that are of general interest to the reverse engineering community, we 
+  There may be times when we recommend that you just share your code for some enhancement to Essentials from your own 
+  repository. As we identify and recognize extensions that are of general interest to Essentials, we 
  may seek to incorporate them with our baseline.

 ## Legal
--- a/1
+++ b/1
--- a/PepperDash.Essentials.4Series.sln
+++ b/PepperDash.Essentials.4Series.sln
@@ -9,6 +9,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Core", "src\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj", "{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Control", "Mobile Control", "{B24989D7-32B5-48D5-9AE1-5F3B17D25206}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials.MobileControl", "src\PepperDash.Essentials.MobileControl\PepperDash.Essentials.MobileControl.csproj", "{F6D362DE-2256-44B1-927A-8CE4705D839A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Essentials.MobileControl.Messengers", "src\PepperDash.Essentials.MobileControl.Messengers\PepperDash.Essentials.MobileControl.Messengers.csproj", "{B438694F-8FF7-464A-9EC8-10427374471F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Essentials", "Essentials", "{AD98B742-8D85-481C-A69D-D8D8ABED39EA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug 4.7.2|Any CPU = Debug 4.7.2|Any CPU
@@ -34,10 +42,29 @@ Global
 		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug 4.7.2|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug 4.7.2|Any CPU.Build.0 = Debug|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6D362DE-2256-44B1-927A-8CE4705D839A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug 4.7.2|Any CPU.ActiveCfg = Debug|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug 4.7.2|Any CPU.Build.0 = Debug|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B438694F-8FF7-464A-9EC8-10427374471F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{53E204B7-97DD-441D-A96C-721DF014DF82} = {AD98B742-8D85-481C-A69D-D8D8ABED39EA}
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E} = {AD98B742-8D85-481C-A69D-D8D8ABED39EA}
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B} = {AD98B742-8D85-481C-A69D-D8D8ABED39EA}
+		{F6D362DE-2256-44B1-927A-8CE4705D839A} = {B24989D7-32B5-48D5-9AE1-5F3B17D25206}
+		{B438694F-8FF7-464A-9EC8-10427374471F} = {B24989D7-32B5-48D5-9AE1-5F3B17D25206}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6907A4BF-7201-47CF-AAB1-3597F3B8E1C3}
 	EndGlobalSection
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,26 +1,41 @@
 <Project>
  <ItemGroup>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cpz" Condition="$(ProjectType) == 'Program'">
+    <None Include="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" Condition="$(ProjectType) == 'Program'">
      <Pack>true</Pack>
      <PackagePath>build;</PackagePath>
    </None>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
+    <None Include="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
      <Pack>true</Pack>
      <PackagePath>build;</PackagePath>
    </None>
  </ItemGroup>
-  <Target Name="Create CPLZ" AfterTargets="Build; AfterRebuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
+  <PropertyGroup Condition="$(ProjectType) == 'ProgramLibrary'">
+    <FileName>$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz</FileName>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(ProjectType) == 'Program'">
+    <FileName>$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz</FileName>
+  </PropertyGroup>
+  <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 files: '@(DeletedList)'" />
+  </Target>
+  <Target Name="CreateCPLZ" AfterTargets="Build" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''" DependsOnTargets="DeleteCPLZ">
    <Message Text="Creating CPLZ $(TargetDir)"></Message>
-    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />
-    <MakeDir Directories="$(PackageOutputPath)\$(AssemblyName)" Condition="!Exists('$(PackageOutputPath)\$(AssemblyName)')" />
-    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>    
+    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />    
+    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>
+    <Copy SourceFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz" />
  </Target>
-  <Target Name="Copy CPZ NET6" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' == 'net6.0' ) Or ( '$(TargetFramework)' == 'net8.0' ))">
-    <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+  <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 files: '@(DeletedList)'" />
  </Target>
-  <Target Name="Copy CPZ NET47" AfterTargets="SimplSharpPostProcess47" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
+  <Target Name="Copy CPZ" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
    <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Copy SourceFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cpz" />
  </Target>
 </Project>
--- a/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs
+++ b/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs
@@ -18,81 +18,6 @@ using Serilog.Events;

 namespace PepperDash.Essentials.Core.Bridges
 {
-    /// <summary>
-    /// Helper methods for bridges
-    /// </summary>
-    public static class BridgeHelper
-    {
-        public static void PrintJoinMap(string command)
-        {
-            var targets = command.Split(' ');
-
-            var bridgeKey = targets[0].Trim();
-
-            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
-
-            if (bridge == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
-                return;
-            }
-
-            if (targets.Length > 1)
-            {
-                var deviceKey = targets[1].Trim();
-
-                if (string.IsNullOrEmpty(deviceKey)) return;
-                bridge.PrintJoinMapForDevice(deviceKey);
-            }
-            else
-            {
-                bridge.PrintJoinMaps();
-            }
-        }
-        public static void JoinmapMarkdown(string command)
-        {
-            var targets = command.Split(' ');
-
-            var bridgeKey = targets[0].Trim();
-
-            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
-
-            if (bridge == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
-                return;
-            }
-
-            if (targets.Length > 1)
-            {
-                var deviceKey = targets[1].Trim();
-
-                if (string.IsNullOrEmpty(deviceKey)) return;
-                bridge.MarkdownJoinMapForDevice(deviceKey, bridgeKey);
-            }
-            else
-            {
-                bridge.MarkdownForBridge(bridgeKey);
-
-            }
-        }
-    }
-
-
-    /// <summary>
-    /// Base class for all bridge class variants
-    /// </summary>
-    public class BridgeBase : EssentialsDevice
-    {
-        public BridgeApi Api { get; protected set; }
-
-        public BridgeBase(string key) :
-            base(key)
-        {
-
-        }
-    }
-
    /// <summary>
    /// Base class for bridge API variants
    /// </summary>
@@ -168,19 +93,15 @@ namespace PepperDash.Essentials.Core.Bridges

                Debug.LogMessage(LogEventLevel.Debug, this, "Linking Device: '{0}'", device.Key);

-                if (!typeof(IBridgeAdvanced).IsAssignableFrom(device.GetType().GetType()))
+                if (device is IBridgeAdvanced bridge)
                {
-                    Debug.LogMessage(LogEventLevel.Information, this,
-                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
-                        device.Key);
+                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
                    continue;
                }

-                var bridge = device as IBridgeAdvanced;
-                if (bridge != null)
-                {
-                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
-                }
+                Debug.LogMessage(LogEventLevel.Information, this,
+                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
+                        device.Key);
            }
        }

@@ -249,11 +170,11 @@ namespace PepperDash.Essentials.Core.Bridges
        /// </summary>
        public virtual void PrintJoinMaps()
        {
-            Debug.LogMessage(LogEventLevel.Information, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
+            CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));

            foreach (var joinMap in JoinMaps)
            {
-                Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}':", joinMap.Key);
+                CrestronConsole.ConsoleCommandResponse("Join map for device '{0}':", joinMap.Key);
                joinMap.Value.PrintJoinMapInfo();
            }
        }
--- a/src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs
+++ b/src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs
@@ -0,0 +1,66 @@
+using PepperDash.Core;
+using Serilog.Events;
+
+//using PepperDash.Essentials.Devices.Common.Cameras;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    /// <summary>
+    /// Helper methods for bridges
+    /// </summary>
+    public static class BridgeHelper
+    {
+        public static void PrintJoinMap(string command)
+        {
+            var targets = command.Split(' ');
+
+            var bridgeKey = targets[0].Trim();
+
+            if (!(DeviceManager.GetDeviceForKey(bridgeKey) is EiscApiAdvanced bridge))
+            {
+                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+                return;
+            }
+
+            if (targets.Length > 1)
+            {
+                var deviceKey = targets[1].Trim();
+
+                if (string.IsNullOrEmpty(deviceKey)) return;
+                bridge.PrintJoinMapForDevice(deviceKey);
+            }
+            else
+            {
+                bridge.PrintJoinMaps();
+            }
+        }
+        public static void JoinmapMarkdown(string command)
+        {
+            var targets = command.Split(' ');
+
+            var bridgeKey = targets[0].Trim();
+
+            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
+
+            if (bridge == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+                return;
+            }
+
+            if (targets.Length > 1)
+            {
+                var deviceKey = targets[1].Trim();
+
+                if (string.IsNullOrEmpty(deviceKey)) return;
+                bridge.MarkdownJoinMapForDevice(deviceKey, bridgeKey);
+            }
+            else
+            {
+                bridge.MarkdownForBridge(bridgeKey);
+
+            }
+        }
+    }
+
+}
--- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AirMediaControllerJoinMap.cs
+++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AirMediaControllerJoinMap.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace PepperDash.Essentials.Core.Bridges
 {
--- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs
+++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace PepperDash.Essentials.Core.Bridges
 {
--- a/src/PepperDash.Essentials.Core/Comm
+++ b/src/PepperDash.Essentials.Core/Comm
@@ -93,6 +93,7 @@ namespace PepperDash.Essentials.Core

        void OnDataReceived(string s)
        {
+			var eventSubscribed = false;

            var bytesHandler = BytesReceived;
            if (bytesHandler != null)
@@ -101,7 +102,7 @@ namespace PepperDash.Essentials.Core
 				if (StreamDebugging.RxStreamDebuggingIsEnabled)
 					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
-				return;
+				eventSubscribed = true;
            }
            var textHandler = TextReceived;
            if (textHandler != null)
@@ -109,10 +110,10 @@ namespace PepperDash.Essentials.Core
 				if (StreamDebugging.RxStreamDebuggingIsEnabled)
 					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
-				return;
+				eventSubscribed = true;
            }

-			Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
+			if(!eventSubscribed) Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
        }

 		public override bool Deactivate()
--- a/src/PepperDash.Essentials.Core/Config/BasicConfig.cs
+++ b/src/PepperDash.Essentials.Core/Config/BasicConfig.cs
@@ -55,7 +55,7 @@ namespace PepperDash.Essentials.Core.Config
 		/// </summary>
 		public Dictionary<string, SourceListItem> GetSourceListForKey(string key)
 		{
-			if (string.IsNullOrEmpty(key) || !SourceLists.ContainsKey(key))
+			if (SourceLists == null || string.IsNullOrEmpty(key) || !SourceLists.ContainsKey(key))
 				return null;
 			
 			return SourceLists[key];
@@ -68,7 +68,7 @@ namespace PepperDash.Essentials.Core.Config
        /// <returns>DestinationList if the key exists, null otherwise</returns>
 	    public Dictionary<string, DestinationListItem> GetDestinationListForKey(string key)
 	    {
-	        if (string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key))
+	        if (DestinationLists == null || string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key))
 	        {
 	            return null;
 	        }
@@ -83,7 +83,7 @@ namespace PepperDash.Essentials.Core.Config
        /// <returns>AudioControlPointList if the key exists, null otherwise</returns>
        public AudioControlPointListItem GetAudioControlPointListForKey(string key)
        {
-            if (string.IsNullOrEmpty(key) || !AudioControlPointLists.ContainsKey(key))
+            if (AudioControlPointLists == null ||  string.IsNullOrEmpty(key) || !AudioControlPointLists.ContainsKey(key))
                return null;

            return AudioControlPointLists[key];
@@ -94,7 +94,7 @@ namespace PepperDash.Essentials.Core.Config
        /// </summary>
        public Dictionary<string, CameraListItem> GetCameraListForKey(string key)
        {
-            if (string.IsNullOrEmpty(key) || !CameraLists.ContainsKey(key))
+            if (CameraLists == null || string.IsNullOrEmpty(key) || !CameraLists.ContainsKey(key))
                return null;

            return CameraLists[key];
--- a/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs
+++ b/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs
@@ -31,9 +31,17 @@ namespace PepperDash.Essentials.Core.Config
 				if (string.IsNullOrEmpty(SystemUrl))
 					return "missing url";

-                var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
-                string uuid = result.Groups[1].Value;
-                return uuid;
+				if (SystemUrl.Contains("#"))
+				{
+					var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
+					string uuid = result.Groups[1].Value;
+					return uuid;
+				} else
+				{
+                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*");
+                    string uuid = result.Groups[1].Value;
+                    return uuid;
+                }
            }
        }

@@ -44,10 +52,18 @@ namespace PepperDash.Essentials.Core.Config
            {
 				if (string.IsNullOrEmpty(TemplateUrl))
 					return "missing template url";
-       
-				var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
-                string uuid = result.Groups[1].Value;
-                return uuid;
+
+				if (TemplateUrl.Contains("#"))
+				{
+					var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
+					string uuid = result.Groups[1].Value;
+					return uuid;
+				} else
+				{
+                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*");
+                    string uuid = result.Groups[2].Value;
+                    return uuid;
+                }
            }
        }

--- a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs
+++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs
@@ -21,7 +21,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
    /// <summary>
    /// Represents a generic digital input deviced tied to a versiport
    /// </summary>
-    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput
+    public class GenericVersiportDigitalInputDevice : EssentialsBridgeableDevice, IDigitalInput, IPartitionStateProvider
    {
        public Versiport InputPort { get; private set; }

@@ -35,10 +35,15 @@ namespace PepperDash.Essentials.Core.CrestronIO
            }
        }

+        public BoolFeedback PartitionPresentFeedback { get; }
+
+        public bool PartitionPresent => !InputStateFeedbackFunc();
+
        public GenericVersiportDigitalInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
            base(key, name)
        {
            InputStateFeedback = new BoolFeedback(InputStateFeedbackFunc);
+            PartitionPresentFeedback = new BoolFeedback(() => !InputStateFeedbackFunc());

            AddPostActivationAction(() =>
            {
@@ -52,7 +57,8 @@ namespace PepperDash.Essentials.Core.CrestronIO

                InputPort.VersiportChange += InputPort_VersiportChange;

-
+                InputStateFeedback.FireUpdate();
+                PartitionPresentFeedback.FireUpdate();

                Debug.LogMessage(LogEventLevel.Debug, this, "Created GenericVersiportDigitalInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);

@@ -65,7 +71,10 @@ namespace PepperDash.Essentials.Core.CrestronIO
 			Debug.LogMessage(LogEventLevel.Debug, this, "Versiport change: {0}", args.Event);

            if(args.Event == eVersiportEvent.DigitalInChange)
+            {
                InputStateFeedback.FireUpdate();
+                PartitionPresentFeedback.FireUpdate();
+            }
        }


--- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IEmergencyOSD.cs
+++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IEmergencyOSD.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface IEmergencyOSD
+    {
+        void ShowEmergencyMessage(string url);
+        void HideEmergencyMessage();
+    }
+}
--- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHumiditySensor.cs
+++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHumiditySensor.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface IHumiditySensor
+    {
+        /// <summary>
+        ///  Reports the relative humidity level. Level ranging from 0 to 100 (for 0% to 100%
+        ///  RH). EventIds: HumidityFeedbackFeedbackEventId will trigger to indicate change.
+        /// </summary>
+        IntFeedback HumidityFeedback { get; }
+
+    }
+}
--- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITemperatureSensor.cs
+++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITemperatureSensor.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface ITemperatureSensor
+    {
+        /// <summary>
+        ///  The values will range from -400 to +1760 (for -40° to +176° F) or -400 to +800
+        ///    (for -40° to +80° C)in tenths of a degree.
+        /// </summary>
+        IntFeedback TemperatureFeedback { get; }
+
+
+        BoolFeedback TemperatureInCFeedback { get; }
+
+        void SetTemperatureFormat(bool setToC);
+    }
+}
--- a/src/PepperDash.Essentials.Core/Devices/AudioControlListItemBase.cs
+++ b/src/PepperDash.Essentials.Core/Devices/AudioControlListItemBase.cs
@@ -9,9 +9,15 @@ namespace PepperDash.Essentials.Core
 {
    public abstract class AudioControlListItemBase
    {
+        /// <summary>
+        /// Key of the parent device in the DeviceManager
+        /// </summary>
        [JsonProperty("parentDeviceKey")]
        public string ParentDeviceKey { get; set; }

+        /// <summary>
+        /// Optional key of the item in the parent device
+        /// </summary>
        [JsonProperty("itemKey")]
        public string ItemKey { get; set; }

--- a/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs
+++ b/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs
@@ -1,83 +1,78 @@
-
-
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using Serilog.Events;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Crestron.SimplSharp;
 using System.Reflection;
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using Serilog.Events;
-
+using System.Threading.Tasks;

 namespace PepperDash.Essentials.Core
 {
-	public class DeviceJsonApi
-	{
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="json"></param>
-		public static void DoDeviceActionWithJson(string json)
-		{
-		    if (String.IsNullOrEmpty(json))
-		    {
-		        CrestronConsole.ConsoleCommandResponse(
-		            "Please provide a JSON object matching the format {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}.\r\nIf the method has no parameters, the \"params\" object may be omitted.");
-		        return;
-		    }
-		    try
-		    {
-		        var action = JsonConvert.DeserializeObject<DeviceActionWrapper>(json);
+    public class DeviceJsonApi
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="json"></param>
+        public static void DoDeviceActionWithJson(string json)
+        {
+            if (String.IsNullOrEmpty(json))
+            {
+                CrestronConsole.ConsoleCommandResponse(
+                    "Please provide a JSON object matching the format {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}.\r\nIf the method has no parameters, the \"params\" object may be omitted.");
+                return;
+            }
+            try
+            {
+                var action = JsonConvert.DeserializeObject<DeviceActionWrapper>(json);

-		        DoDeviceAction(action);
-		    }
-		    catch (Exception ex)
-		    {
-		        CrestronConsole.ConsoleCommandResponse("Incorrect format for JSON. Please check that the format matches {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}");
-		    }
-		    
-		}
+                DoDeviceAction(action);
+            }
+            catch (Exception)
+            {
+                CrestronConsole.ConsoleCommandResponse("Incorrect format for JSON. Please check that the format matches {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}");
+            }
+
+        }


-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="action"></param>
-		public static void DoDeviceAction(DeviceActionWrapper action)
-		{
-			var key = action.DeviceKey;
-			var obj = FindObjectOnPath(key);
-		    if (obj == null)
-		    {
-		        CrestronConsole.ConsoleCommandResponse("Unable to find object at path {0}", key);
-		        return;
-		    }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="action"></param>
+        public static void DoDeviceAction(DeviceActionWrapper action)
+        {
+            var key = action.DeviceKey;
+            var obj = FindObjectOnPath(key);
+            if (obj == null)
+            {
+                CrestronConsole.ConsoleCommandResponse("Unable to find object at path {0}", key);
+                return;
+            }

-		    if (action.Params == null)
-		    {
+            if (action.Params == null)
+            {
                //no params, so setting action.Params to empty array
-		        action.Params = new object[0];
-		    }
+                action.Params = new object[0];
+            }

-		    Type t = obj.GetType();
-		    try
-		    {
-		        var methods = t.GetMethods().Where(m => m.Name == action.MethodName).ToList();
+            Type t = obj.GetType();
+            try
+            {
+                var methods = t.GetMethods().Where(m => m.Name == action.MethodName).ToList();

-		        var method = methods.Count == 1 ? methods[0] : methods.FirstOrDefault(m => m.GetParameters().Length == action.Params.Length);
+                var method = methods.Count == 1 ? methods[0] : methods.FirstOrDefault(m => m.GetParameters().Length == action.Params.Length);

-		        if (method == null)
-		        {
-		            CrestronConsole.ConsoleCommandResponse(
-		                "Unable to find method with name {0} and that matches parameters {1}", action.MethodName,
-		                action.Params);
-		            return;
-		        }
+                if (method == null)
+                {
+                    CrestronConsole.ConsoleCommandResponse(
+                        "Unable to find method with name {0} and that matches parameters {1}", action.MethodName,
+                        action.Params);
+                    return;
+                }
                var mParams = method.GetParameters();

                var convertedParams = mParams
@@ -85,60 +80,124 @@ namespace PepperDash.Essentials.Core
                                    .ToArray();

                Task.Run(() =>
-					{
-						try
-						{
-							Debug.LogMessage(LogEventLevel.Verbose, "Calling method {methodName} on device {deviceKey}", null, method.Name, action.DeviceKey);
-							method.Invoke(obj, convertedParams);
-						}
-						catch(Exception e)
-						{
-							Debug.LogMessage(e, "Error invoking method {methodName} on device {deviceKey}", null, method.Name, action.DeviceKey);
-						}
-					});                
+                    {
+                        try
+                        {
+                            Debug.LogMessage(LogEventLevel.Verbose, "Calling method {methodName} on device {deviceKey}", null, method.Name, action.DeviceKey);
+                            method.Invoke(obj, convertedParams);
+                        }
+                        catch (Exception e)
+                        {
+                            Debug.LogMessage(e, "Error invoking method {methodName} on device {deviceKey}", null, method.Name, action.DeviceKey);
+                        }
+                    });

-		        CrestronConsole.ConsoleCommandResponse("Method {0} successfully called on device {1}", method.Name,
-		            action.DeviceKey);
-		    }
-		    catch (Exception ex)
-		    {
-		        CrestronConsole.ConsoleCommandResponse("Unable to call method with name {0}. {1}", action.MethodName,
-		            ex.Message);}
-		}
+                CrestronConsole.ConsoleCommandResponse("Method {0} successfully called on device {1}", method.Name,
+                    action.DeviceKey);
+            }
+            catch (Exception ex)
+            {
+                CrestronConsole.ConsoleCommandResponse("Unable to call method with name {0}. {1}", action.MethodName,
+                    ex.Message);
+            }
+        }

-	    private static object ConvertType(object value, Type conversionType)
-	    {
-	        if (!conversionType.IsEnum)
-	        {
-	            return Convert.ChangeType(value, conversionType, System.Globalization.CultureInfo.InvariantCulture);
-	        }
+        public static async Task DoDeviceActionAsync(DeviceActionWrapper action)
+        {
+            var key = action.DeviceKey;
+            var obj = FindObjectOnPath(key);
+            if (obj == null)
+            {
+                Debug.LogMessage(LogEventLevel.Warning, "Unable to find object at path {deviceKey}", null, key);
+                return;
+            }

-	        var stringValue = Convert.ToString(value);
+            if (action.Params == null)
+            {
+                //no params, so setting action.Params to empty array
+                action.Params = new object[0];
+            }

-	        if (String.IsNullOrEmpty(stringValue))
-	        {
-	            throw new InvalidCastException(
-	                String.Format("{0} cannot be converted to a string prior to conversion to enum"));
-	        }
-	        return Enum.Parse(conversionType, stringValue, true);
-	    }
+            Type t = obj.GetType();
+            try
+            {
+                var methods = t.GetMethods().Where(m => m.Name == action.MethodName).ToList();

-		/// <summary>
-		/// Gets the properties on a device
-		/// </summary>
-		/// <param name="key"></param>
-		/// <returns></returns>
-		public static string GetProperties(string deviceObjectPath)
-		{
-			var obj = FindObjectOnPath(deviceObjectPath);
-			if (obj == null)
-				return "{ \"error\":\"No Device\"}";
+                var method = methods.Count == 1 ? methods[0] : methods.FirstOrDefault(m => m.GetParameters().Length == action.Params.Length);

-			Type t = obj.GetType();
-			// get the properties and set them into a new collection of NameType wrappers
-			var props = t.GetProperties().Select(p => new PropertyNameType(p, obj));
-			return JsonConvert.SerializeObject(props, Formatting.Indented);
-		}
+                if (method == null)
+                {
+                    Debug.LogMessage(LogEventLevel.Warning,
+                        "Unable to find method with name {methodName} and that matches parameters {@parameters}", null, action.MethodName,
+                        action.Params);
+                    return;
+                }
+                var mParams = method.GetParameters();
+
+                var convertedParams = mParams
+                                    .Select((p, i) => ConvertType(action.Params[i], p.ParameterType))
+                                    .ToArray();
+
+                try
+                {
+                    Debug.LogMessage(LogEventLevel.Verbose, "Calling method {methodName} on device {deviceKey} with {@params}", null, method.Name, action.DeviceKey, action.Params);
+                    var result = method.Invoke(obj, convertedParams);
+                    
+                    // If the method returns a Task, await it
+                    if (result is Task task)
+                    {
+                        await task;
+                    }
+                    // If the method returns a Task<T>, await it
+                    else if (result != null && result.GetType().IsGenericType && result.GetType().GetGenericTypeDefinition() == typeof(Task<>))
+                    {
+                        await (Task)result;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Debug.LogMessage(e, "Error invoking method {methodName} on device {deviceKey}", null, method.Name, action.DeviceKey);
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.LogMessage(ex, "Unable to call method with name {methodName} with {@parameters}", null, action.MethodName, action.Params);
+            }
+        }
+
+        private static object ConvertType(object value, Type conversionType)
+        {
+            if (!conversionType.IsEnum)
+            {
+                return Convert.ChangeType(value, conversionType, System.Globalization.CultureInfo.InvariantCulture);
+            }
+
+            var stringValue = Convert.ToString(value);
+
+            if (String.IsNullOrEmpty(stringValue))
+            {
+                throw new InvalidCastException(
+                    String.Format("{0} cannot be converted to a string prior to conversion to enum"));
+            }
+            return Enum.Parse(conversionType, stringValue, true);
+        }
+
+        /// <summary>
+        /// Gets the properties on a device
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static string GetProperties(string deviceObjectPath)
+        {
+            var obj = FindObjectOnPath(deviceObjectPath);
+            if (obj == null)
+                return "{ \"error\":\"No Device\"}";
+
+            Type t = obj.GetType();
+            // get the properties and set them into a new collection of NameType wrappers
+            var props = t.GetProperties().Select(p => new PropertyNameType(p, obj));
+            return JsonConvert.SerializeObject(props, Formatting.Indented);
+        }

        /// <summary>
        /// Gets a property from a device path by name
@@ -149,10 +208,10 @@ namespace PepperDash.Essentials.Core
        public static object GetPropertyByName(string deviceObjectPath, string propertyName)
        {
            var dev = FindObjectOnPath(deviceObjectPath);
-            if(dev == null)
+            if (dev == null)
                return "{ \"error\":\"No Device\"}";
-	
-            object prop = dev.GetType().GetType().GetProperty(propertyName).GetValue(dev, null);
+
+            object prop = dev.GetType().GetProperty(propertyName).GetValue(dev, null);

            // var prop = t.GetProperty(propertyName);
            if (prop != null)
@@ -166,126 +225,126 @@ namespace PepperDash.Essentials.Core
            }
        }

-		/// <summary>
-		/// Gets the methods on a device
-		/// </summary>
-		/// <param name="key"></param>
-		/// <returns></returns>
-		public static string GetMethods(string deviceObjectPath)
-		{
-			var obj = FindObjectOnPath(deviceObjectPath);
-			if (obj == null)
-				return "{ \"error\":\"No Device\"}";
+        /// <summary>
+        /// Gets the methods on a device
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static string GetMethods(string deviceObjectPath)
+        {
+            var obj = FindObjectOnPath(deviceObjectPath);
+            if (obj == null)
+                return "{ \"error\":\"No Device\"}";

-			// Package up method names using helper objects
-			Type t = obj.GetType();
-			var methods = t.GetMethods()
-				.Where(m => !m.IsSpecialName)
-				.Select(p => new MethodNameParams(p));
-			return JsonConvert.SerializeObject(methods, Formatting.Indented);
-		}
+            // Package up method names using helper objects
+            Type t = obj.GetType();
+            var methods = t.GetMethods()
+                .Where(m => !m.IsSpecialName)
+                .Select(p => new MethodNameParams(p));
+            return JsonConvert.SerializeObject(methods, Formatting.Indented);
+        }

-		public static string GetApiMethods(string deviceObjectPath)
-		{
-			var obj = FindObjectOnPath(deviceObjectPath);
-			if (obj == null)
-				return "{ \"error\":\"No Device\"}";
+        public static string GetApiMethods(string deviceObjectPath)
+        {
+            var obj = FindObjectOnPath(deviceObjectPath);
+            if (obj == null)
+                return "{ \"error\":\"No Device\"}";

-			// Package up method names using helper objects
-			Type t = obj.GetType();
-			var methods = t.GetMethods()
-				.Where(m => !m.IsSpecialName)
-				.Where(m => m.GetCustomAttributes(typeof(ApiAttribute), true).Any())
-				.Select(p => new MethodNameParams(p));
-			return JsonConvert.SerializeObject(methods, Formatting.Indented);
-		}
-			
+            // Package up method names using helper objects
+            Type t = obj.GetType();
+            var methods = t.GetMethods()
+                .Where(m => !m.IsSpecialName)
+                .Where(m => m.GetCustomAttributes(typeof(ApiAttribute), true).Any())
+                .Select(p => new MethodNameParams(p));
+            return JsonConvert.SerializeObject(methods, Formatting.Indented);
+        }

-		/// <summary>
-		///  Walks down a dotted object path, starting with a Device, and returns the object
-		///  at the end of the path
-		/// </summary>
-		public static object FindObjectOnPath(string deviceObjectPath)
-		{
-			var path = deviceObjectPath.Split('.');

-			var dev = DeviceManager.GetDeviceForKey(path[0]);
-			if (dev == null)
-			{
-				Debug.LogMessage(LogEventLevel.Information, "Device {0} not found", path[0]);
-				return null;
-			}
+        /// <summary>
+        ///  Walks down a dotted object path, starting with a Device, and returns the object
+        ///  at the end of the path
+        /// </summary>
+        public static object FindObjectOnPath(string deviceObjectPath)
+        {
+            var path = deviceObjectPath.Split('.');

-			// loop through any dotted properties
-			object obj = dev;
-			if (path.Length > 1)
-			{
-				for (int i = 1; i < path.Length; i++)
-				{
-					var objName = path[i];
-					string indexStr = null;
-					var indexOpen = objName.IndexOf('[');
-					if (indexOpen != -1)
-					{
-						var indexClose = objName.IndexOf(']');
-						if (indexClose == -1)
-						{
-							Debug.LogMessage(LogEventLevel.Information, dev, "ERROR Unmatched index brackets");
-							return null;
-						}
-						// Get the index and strip quotes if any
-						indexStr = objName.Substring(indexOpen + 1, indexClose - indexOpen - 1).Replace("\"", "");
-						objName = objName.Substring(0, indexOpen);
-						Debug.LogMessage(LogEventLevel.Information, dev, "  Checking for collection '{0}', index '{1}'", objName, indexStr);
-					}
+            var dev = DeviceManager.GetDeviceForKey(path[0]);
+            if (dev == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "Device {0} not found", path[0]);
+                return null;
+            }

-					Type oType = obj.GetType();
-					var prop = oType.GetProperty(objName);
-					if (prop == null)
-					{
-						Debug.LogMessage(LogEventLevel.Information, dev, "Property {0} not found on {1}", objName, path[i - 1]);
-						return null;
-					}
-					// if there's an index, try to get the property
-					if (indexStr != null)
-					{
-						if (!typeof(ICollection).IsAssignableFrom(prop.PropertyType))
-						{
-							Debug.LogMessage(LogEventLevel.Information, dev, "Property {0} is not collection", objName);
-							return null;
-						}
-						var collection = prop.GetValue(obj, null) as ICollection;
-						// Get the indexed items "property"
-						var indexedPropInfo = prop.PropertyType.GetProperty("Item");
-						// These are the parameters for the indexing. Only care about one
-						var indexParams = indexedPropInfo.GetIndexParameters();
-						if (indexParams.Length > 0)
-						{
-							Debug.LogMessage(LogEventLevel.Information, "  Indexed, param type: {0}", indexParams[0].ParameterType.Name);
-							var properParam = Convert.ChangeType(indexStr, indexParams[0].ParameterType,
-								System.Globalization.CultureInfo.InvariantCulture);
-							try
-							{
-								obj = indexedPropInfo.GetValue(collection, new object[] { properParam });
-							}
-							// if the index is bad, catch it here.
-							catch (TargetInvocationException e)
-							{
-								if (e.InnerException is ArgumentOutOfRangeException)
-									Debug.LogMessage(LogEventLevel.Information, "  Index Out of range");
-								else if (e.InnerException is KeyNotFoundException)
-									Debug.LogMessage(LogEventLevel.Information, "  Key not found");
-								return null;
-							}
-						}
+            // loop through any dotted properties
+            object obj = dev;
+            if (path.Length > 1)
+            {
+                for (int i = 1; i < path.Length; i++)
+                {
+                    var objName = path[i];
+                    string indexStr = null;
+                    var indexOpen = objName.IndexOf('[');
+                    if (indexOpen != -1)
+                    {
+                        var indexClose = objName.IndexOf(']');
+                        if (indexClose == -1)
+                        {
+                            Debug.LogMessage(LogEventLevel.Information, dev, "ERROR Unmatched index brackets");
+                            return null;
+                        }
+                        // Get the index and strip quotes if any
+                        indexStr = objName.Substring(indexOpen + 1, indexClose - indexOpen - 1).Replace("\"", "");
+                        objName = objName.Substring(0, indexOpen);
+                        Debug.LogMessage(LogEventLevel.Information, dev, "  Checking for collection '{0}', index '{1}'", objName, indexStr);
+                    }

-					}
-					else
-						obj = prop.GetValue(obj, null);
-				}
-			}
-			return obj;
-		}
+                    Type oType = obj.GetType();
+                    var prop = oType.GetProperty(objName);
+                    if (prop == null)
+                    {
+                        Debug.LogMessage(LogEventLevel.Information, dev, "Property {0} not found on {1}", objName, path[i - 1]);
+                        return null;
+                    }
+                    // if there's an index, try to get the property
+                    if (indexStr != null)
+                    {
+                        if (!typeof(ICollection).IsAssignableFrom(prop.PropertyType))
+                        {
+                            Debug.LogMessage(LogEventLevel.Information, dev, "Property {0} is not collection", objName);
+                            return null;
+                        }
+                        var collection = prop.GetValue(obj, null) as ICollection;
+                        // Get the indexed items "property"
+                        var indexedPropInfo = prop.PropertyType.GetProperty("Item");
+                        // These are the parameters for the indexing. Only care about one
+                        var indexParams = indexedPropInfo.GetIndexParameters();
+                        if (indexParams.Length > 0)
+                        {
+                            Debug.LogMessage(LogEventLevel.Information, "  Indexed, param type: {0}", indexParams[0].ParameterType.Name);
+                            var properParam = Convert.ChangeType(indexStr, indexParams[0].ParameterType,
+                                System.Globalization.CultureInfo.InvariantCulture);
+                            try
+                            {
+                                obj = indexedPropInfo.GetValue(collection, new object[] { properParam });
+                            }
+                            // if the index is bad, catch it here.
+                            catch (TargetInvocationException e)
+                            {
+                                if (e.InnerException is ArgumentOutOfRangeException)
+                                    Debug.LogMessage(LogEventLevel.Information, "  Index Out of range");
+                                else if (e.InnerException is KeyNotFoundException)
+                                    Debug.LogMessage(LogEventLevel.Information, "  Key not found");
+                                return null;
+                            }
+                        }
+
+                    }
+                    else
+                        obj = prop.GetValue(obj, null);
+                }
+            }
+            return obj;
+        }

        /// <summary>
        /// Sets a property on an object.
@@ -308,78 +367,85 @@ namespace PepperDash.Essentials.Core
            //return JsonConvert.SerializeObject(props, Formatting.Indented);
        }

-        
-	}

-	public class DeviceActionWrapper
-	{
-		public string DeviceKey { get; set; }
-		public string MethodName { get; set; }
-		public object[] Params { get; set; }
-	}
+    }

-	public class PropertyNameType
-	{
-        object Parent;
+    public class DeviceActionWrapper
+    {
+        public string DeviceKey { get; set; }
+        public string MethodName { get; set; }
+        public object[] Params { get; set; }
+    }

-		[JsonIgnore]
-		public PropertyInfo PropInfo { get; private set; }
-		public string Name { get { return PropInfo.Name; } }
-		public string Type { get { return PropInfo.PropertyType.Name; } }
-        public string Value { get 
+    public class PropertyNameType
+    {
+        private object Parent;
+
+        [JsonIgnore]
+        public PropertyInfo PropInfo { get; private set; }
+        public string Name { get { return PropInfo.Name; } }
+        public string Type { get { return PropInfo.PropertyType.Name; } }
+        public string Value
        {
-            if (PropInfo.CanRead)
+            get
            {
-                try
+                if (PropInfo.CanRead)
                {
-                    return PropInfo.GetValue(Parent, null).ToString();
+                    try
+                    {
+                        return PropInfo.GetValue(Parent, null).ToString();
+                    }
+                    catch (Exception)
+                    {
+                        return null;
+                    }
                }
-                catch (Exception)
-                {
+                else
                    return null;
-                }
            }
-            else
-                return null;    
-        } }
+        }

        public bool CanRead { get { return PropInfo.CanRead; } }
        public bool CanWrite { get { return PropInfo.CanWrite; } }


-		public PropertyNameType(PropertyInfo info, object parent)
-		{
-			PropInfo = info;
+        public PropertyNameType(PropertyInfo info, object parent)
+        {
+            PropInfo = info;
            Parent = parent;
-		}
-	}
+        }
+    }

-	public class MethodNameParams
-	{
-		[JsonIgnore]
-		public MethodInfo MethodInfo { get; private set; }
+    public class MethodNameParams
+    {
+        [JsonIgnore]
+        public MethodInfo MethodInfo { get; private set; }

-		public string Name { get { return MethodInfo.Name; } }
-		public IEnumerable<NameType> Params { get {
-			return MethodInfo.GetParameters().Select(p => 
-				new NameType { Name = p.Name, Type = p.ParameterType.Name });
-		} }
+        public string Name { get { return MethodInfo.Name; } }
+        public IEnumerable<NameType> Params
+        {
+            get
+            {
+                return MethodInfo.GetParameters().Select(p =>
+                    new NameType { Name = p.Name, Type = p.ParameterType.Name });
+            }
+        }

-		public MethodNameParams(MethodInfo info)
-		{
-			MethodInfo = info;
-		}
-	}
+        public MethodNameParams(MethodInfo info)
+        {
+            MethodInfo = info;
+        }
+    }

-	public class NameType
-	{
-		public string Name { get; set; }
-		public string Type { get; set; }
-	}
+    public class NameType
+    {
+        public string Name { get; set; }
+        public string Type { get; set; }
+    }

-	[AttributeUsage(AttributeTargets.All)]
-	public class ApiAttribute : Attribute
-	{
+    [AttributeUsage(AttributeTargets.All)]
+    public class ApiAttribute : Attribute
+    {

-	}
+    }
 }
--- a/src/PepperDash.Essentials.Core/Devices/DeviceManager.cs
+++ b/src/PepperDash.Essentials.Core/Devices/DeviceManager.cs
@@ -1,50 +1,50 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-
 using PepperDash.Core;
 using Serilog.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;


 namespace PepperDash.Essentials.Core
 {
-	public static class DeviceManager
-	{
+    public static class DeviceManager
+    {
        public static event EventHandler<EventArgs> AllDevicesActivated;
        public static event EventHandler<EventArgs> AllDevicesRegistered;
+        public static event EventHandler<EventArgs> AllDevicesInitialized;

-	    private static readonly CCriticalSection DeviceCriticalSection = new CCriticalSection();
-	    private static readonly CEvent AllowAddDevicesCEvent = new CEvent(false, true);
-		//public static List<Device> Devices { get { return _Devices; } }
-		//static List<Device> _Devices = new List<Device>();
+        private static readonly CCriticalSection DeviceCriticalSection = new CCriticalSection();
+        private static readonly CEvent AllowAddDevicesCEvent = new CEvent(false, true);

-		static readonly Dictionary<string, IKeyed> Devices = new Dictionary<string, IKeyed>(StringComparer.OrdinalIgnoreCase);
+        //public static List<Device> Devices { get { return _Devices; } }
+        //static List<Device> _Devices = new List<Device>();

-		/// <summary>
-		/// Returns a copy of all the devices in a list
-		/// </summary>
-		public static List<IKeyed> AllDevices { get { return new List<IKeyed>(Devices.Values); } }
+        private static readonly Dictionary<string, IKeyed> Devices = new Dictionary<string, IKeyed>(StringComparer.OrdinalIgnoreCase);

-	    public static bool AddDeviceEnabled;
+        /// <summary>
+        /// Returns a copy of all the devices in a list
+        /// </summary>
+        public static List<IKeyed> AllDevices { get { return new List<IKeyed>(Devices.Values); } }

-		public static void Initialize(CrestronControlSystem cs)
-		{
-		    AddDeviceEnabled = true;
-			CrestronConsole.AddNewConsoleCommand(ListDeviceCommStatuses, "devcommstatus", "Lists the communication status of all devices",
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(ListDeviceFeedbacks, "devfb", "Lists current feedbacks", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(ListDevices, "devlist", "Lists current managed devices", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(DeviceJsonApi.DoDeviceActionWithJson, "devjson", "", 
-				ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetProperties(s)), "devprops", "", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetMethods(s)), "devmethods", "", ConsoleAccessLevelEnum.AccessOperator);
-			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s)), "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
+        public static bool AddDeviceEnabled;
+
+        public static void Initialize(CrestronControlSystem cs)
+        {
+            AddDeviceEnabled = true;
+            CrestronConsole.AddNewConsoleCommand(ListDeviceCommStatuses, "devcommstatus", "Lists the communication status of all devices",
+                ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(ListDeviceFeedbacks, "devfb", "Lists current feedbacks",
+                ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(ListDevices, "devlist", "Lists current managed devices",
+                ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(DeviceJsonApi.DoDeviceActionWithJson, "devjson", "",
+                ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetProperties(s)), "devprops", "", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetMethods(s)), "devmethods", "", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s)), "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
            CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
                "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);

@@ -52,77 +52,89 @@ namespace PepperDash.Essentials.Core
            CrestronConsole.AddNewConsoleCommand(s => DisableAllDeviceStreamDebugging(), "disableallstreamdebug", "disables stream debugging on all devices", ConsoleAccessLevelEnum.AccessOperator);
        }

-		/// <summary>
-		/// Calls activate steps on all Device class items
-		/// </summary>
-		public static void ActivateAll()
-		{
-		    try
-		    {
+        /// <summary>
+        /// Calls activate steps on all Device class items
+        /// </summary>
+        public static void ActivateAll()
+        {
+            try
+            {
                OnAllDevicesRegistered();

-		        DeviceCriticalSection.Enter();
+                DeviceCriticalSection.Enter();
                AddDeviceEnabled = false;
-		        // PreActivate all devices
-                Debug.LogMessage(LogEventLevel.Information,"****PreActivation starting...****");
-		        foreach (var d in Devices.Values)
-		        {
-		            try
-		            {
-		                if (d is Device)
-		                    (d as Device).PreActivate();
-		            }
-		            catch (Exception e)
-		            {
+                // PreActivate all devices
+                Debug.LogMessage(LogEventLevel.Information, "****PreActivation starting...****");
+                foreach (var d in Devices.Values)
+                {
+                    try
+                    { 
+                        if (d is Device)
+                            (d as Device).PreActivate();
+                    }
+                    catch (Exception e)
+                    {
                        Debug.LogMessage(LogEventLevel.Information, d, "ERROR: Device {1} PreActivation failure: {0}", e.Message, d.Key);
                        Debug.LogMessage(LogEventLevel.Debug, d, "Stack Trace: {0}", e.StackTrace);
-		            }
-		        }
+                    }
+                }
                Debug.LogMessage(LogEventLevel.Information, "****PreActivation complete****");
-		        Debug.LogMessage(LogEventLevel.Information, "****Activation starting...****");
+                Debug.LogMessage(LogEventLevel.Information, "****Activation starting...****");

-		        // Activate all devices
-		        foreach (var d in Devices.Values)
-		        {
-		            try
-		            {
-		                if (d is Device)
-		                    (d as Device).Activate();
-		            }
-		            catch (Exception e)
-		            {
+                // Activate all devices
+                foreach (var d in Devices.Values)
+                {
+                    try
+                    {
+                        if (d is Device)
+                            (d as Device).Activate();
+                    }
+                    catch (Exception e)
+                    {
                        Debug.LogMessage(LogEventLevel.Information, d, "ERROR: Device {1} Activation failure: {0}", e.Message, d.Key);
                        Debug.LogMessage(LogEventLevel.Debug, d, "Stack Trace: {0}", e.StackTrace);
-		            }
-		        }
+                    }
+                }

                Debug.LogMessage(LogEventLevel.Information, "****Activation complete****");
                Debug.LogMessage(LogEventLevel.Information, "****PostActivation starting...****");

-		        // PostActivate all devices
-		        foreach (var d in Devices.Values)
-		        {
-		            try
-		            {
-		                if (d is Device)
-		                    (d as Device).PostActivate();
-		            }
-		            catch (Exception e)
-		            {
-		                Debug.LogMessage(LogEventLevel.Information, d, "ERROR: Device {1} PostActivation failure: {0}", e.Message, d.Key);
-		                Debug.LogMessage(LogEventLevel.Debug, d, "Stack Trace: {0}", e.StackTrace);
-		            }
-		        }
+                // PostActivate all devices
+                foreach (var d in Devices.Values)
+                {
+                    try
+                    {
+                        if (d is Device)
+                            (d as Device).PostActivate();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.LogMessage(LogEventLevel.Information, d, "ERROR: Device {1} PostActivation failure: {0}", e.Message, d.Key);
+                        Debug.LogMessage(LogEventLevel.Debug, d, "Stack Trace: {0}", e.StackTrace);
+                    }
+                }

                Debug.LogMessage(LogEventLevel.Information, "****PostActivation complete****");

                OnAllDevicesActivated();
-		    }
-		    finally
-		    {
+            }
+            finally
+            {
                DeviceCriticalSection.Leave();
-		    }
-		}
+            }
+        }
+
+        private static void DeviceManager_Initialized(object sender, EventArgs e)
+        {
+            var allInitialized = Devices.Values.OfType<EssentialsDevice>().All(d => d.IsInitialized);
+
+            if (allInitialized)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "****All Devices Initalized****");
+
+                OnAllDevicesInitialized();
+            }
+        }

        private static void OnAllDevicesActivated()
        {
@@ -142,77 +154,85 @@ namespace PepperDash.Essentials.Core
            }
        }

-		/// <summary>
-		/// Calls activate on all Device class items
-		/// </summary>
-		public static void DeactivateAll()
-		{
-		    try
-		    {
-		        DeviceCriticalSection.Enter();
-		        foreach (var d in Devices.Values.OfType<Device>())
-		        {
-		            d.Deactivate();
-		        }
-		    }
-		    finally
-		    {
-		        DeviceCriticalSection.Leave();
-		    }
-		}
+        private static void OnAllDevicesInitialized()
+        {
+            var handler = AllDevicesInitialized;
+            if (handler != null)
+            {
+                handler(null, new EventArgs());
+            }
+        }

-		//static void ListMethods(string devKey)
-		//{
-		//    var dev = GetDeviceForKey(devKey);
-		//    if(dev != null)
-		//    {
-		//        var type = dev.GetType().GetType();
-		//        var methods = type.GetMethods(BindingFlags.Public|BindingFlags.Instance);
-		//        var sb = new StringBuilder();
-		//        sb.AppendLine(string.Format("{2} methods on [{0}] ({1}):", dev.Key, type.Name, methods.Length));
-		//        foreach (var m in methods)
-		//        {
-		//            sb.Append(string.Format("{0}(", m.Name));
-		//            var pars = m.GetParameters();
-		//            foreach (var p in pars)
-		//                sb.Append(string.Format("({1}){0} ", p.Name, p.ParameterType.Name));
-		//            sb.AppendLine(")");
-		//        }
-		//        CrestronConsole.ConsoleCommandResponse(sb.ToString());
-		//    }
-		//}
+        /// <summary>
+        /// Calls activate on all Device class items
+        /// </summary>
+        public static void DeactivateAll()
+        {
+            try
+            {
+                DeviceCriticalSection.Enter();
+                foreach (var d in Devices.Values.OfType<Device>())
+                {
+                    d.Deactivate();
+                }
+            }
+            finally
+            {
+                DeviceCriticalSection.Leave();
+            }
+        }

-	    private static void ListDevices(string s)
-	    {
-	        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));
+        //static void ListMethods(string devKey)
+        //{
+        //    var dev = GetDeviceForKey(devKey);
+        //    if(dev != null)
+        //    {
+        //        var type = dev.GetType().GetType();
+        //        var methods = type.GetMethods(BindingFlags.Public|BindingFlags.Instance);
+        //        var sb = new StringBuilder();
+        //        sb.AppendLine(string.Format("{2} methods on [{0}] ({1}):", dev.Key, type.Name, methods.Length));
+        //        foreach (var m in methods)
+        //        {
+        //            sb.Append(string.Format("{0}(", m.Name));
+        //            var pars = m.GetParameters();
+        //            foreach (var p in pars)
+        //                sb.Append(string.Format("({1}){0} ", p.Name, p.ParameterType.Name));
+        //            sb.AppendLine(")");
+        //        }
+        //        CrestronConsole.ConsoleCommandResponse(sb.ToString());
+        //    }
+        //}

-	        foreach (var d in sorted)
-	        {
-	            var name = d is IKeyName ? (d as IKeyName).Name : "---";
-	            Debug.LogMessage(LogEventLevel.Information, "  [{0}] {1}", d.Key, name);
-	        }
-	    }
+        private static void ListDevices(string s)
+        {
+            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));

-	    private static void ListDeviceFeedbacks(string devKey)
-	    {
-	        var dev = GetDeviceForKey(devKey);
-	        if (dev == null)
-	        {
-	            Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
-	            return;
-	        }
-	        var statusDev = dev as IHasFeedback;
-	        if (statusDev == null)
-	        {
-	            Debug.LogMessage(LogEventLevel.Information, "Device '{0}' does not have visible feedbacks", devKey);
-	            return;
-	        }
-	        statusDev.DumpFeedbacksToConsole(true);
-	    }
+            foreach (var d in sorted)
+            {
+                var name = d is IKeyName ? (d as IKeyName).Name : "---";
+                Debug.LogMessage(LogEventLevel.Information, "  [{0}] {1}", d.Key, name);
+            }
+        }

-	    //static void ListDeviceCommands(string devKey)
+        private static void ListDeviceFeedbacks(string devKey)
+        {
+            var dev = GetDeviceForKey(devKey);
+            if (dev == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
+                return;
+            }
+            if (!(dev is IHasFeedback statusDev))
+            {
+                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)
@@ -223,134 +243,135 @@ namespace PepperDash.Essentials.Core
        //    Debug.LogMessage(LogEventLevel.Information, "This needs to be reworked.  Stay tuned.", devKey);
        //}

-	    private static void ListDeviceCommStatuses(string input)
-	    {
-	        var sb = new StringBuilder();
-	        foreach (var dev in Devices.Values.OfType<ICommunicationMonitor>())
-	        {
-	            sb.Append(string.Format("{0}: {1}\r", dev,
-	                dev.CommunicationMonitor.Status));
-	        }
-	        CrestronConsole.ConsoleCommandResponse(sb.ToString());
-	    }
+        private static void ListDeviceCommStatuses(string input)
+        {
+
+            foreach (var dev in Devices.Values.OfType<ICommunicationMonitor>())
+            {
+                CrestronConsole.ConsoleCommandResponse($"{dev}: {dev.CommunicationMonitor.Status}{Environment.NewLine}");
+            }
+        }


-	    //static void DoDeviceCommand(string command)
+        //static void DoDeviceCommand(string command)
        //{
        //    Debug.LogMessage(LogEventLevel.Information, "Not yet implemented.  Stay tuned");
        //}

-		public static void AddDevice(IKeyed newDev)
-		{
-		    try
-		    {
-		        if (!DeviceCriticalSection.TryEnter())
-		        {
-		            Debug.LogMessage(LogEventLevel.Information, "Currently unable to add devices to Device Manager. Please try again");
-		            return;
-		        }
-		        // Check for device with same key
-		        //var existingDevice = _Devices.FirstOrDefault(d => d.Key.Equals(newDev.Key, StringComparison.OrdinalIgnoreCase));
-		        ////// If it exists, remove or warn??
-		        //if (existingDevice != null)
+        public static void AddDevice(IKeyed newDev)
+        {
+            try
+            {
+                if (!DeviceCriticalSection.TryEnter())
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "Currently unable to add devices to Device Manager. Please try again");
+                    return;
+                }
+                // Check for device with same key
+                //var existingDevice = _Devices.FirstOrDefault(d => d.Key.Equals(newDev.Key, StringComparison.OrdinalIgnoreCase));
+                ////// If it exists, remove or warn??
+                //if (existingDevice != null)

-		        if (!AddDeviceEnabled)
-		        {
-		            Debug.LogMessage(LogEventLevel.Information, "All devices have been activated. Adding new devices is not allowed.");
-		            return;
-		        }
+                if (!AddDeviceEnabled)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "All devices have been activated. Adding new devices is not allowed.");
+                    return;
+                }

-		        if (Devices.ContainsKey(newDev.Key))
-		        {
-		            Debug.LogMessage(LogEventLevel.Information, newDev, "WARNING: A device with this key already exists.  Not added to manager");
-		            return;
-		        }
-		        Devices.Add(newDev.Key, newDev);
-		        //if (!(_Devices.Contains(newDev)))
-		        //    _Devices.Add(newDev);
-		    }
-		    finally
-		    {
-		        DeviceCriticalSection.Leave();
-		    }
-		}
+                if (Devices.ContainsKey(newDev.Key))
+                {
+                    Debug.LogMessage(LogEventLevel.Information, newDev, "WARNING: A device with this key already exists.  Not added to manager");
+                    return;
+                }
+                Devices.Add(newDev.Key, newDev);
+                //if (!(_Devices.Contains(newDev)))
+                //    _Devices.Add(newDev);

-	    public static void AddDevice(IEnumerable<IKeyed> devicesToAdd)
-	    {
-	        try
-	        {
-	            if (!DeviceCriticalSection.TryEnter())
-	            {
-	                Debug.LogMessage(LogEventLevel.Information,
-	                    "Currently unable to add devices to Device Manager. Please try again");
-	                return;
-	            }
-	            if (!AddDeviceEnabled)
-	            {
-	                Debug.LogMessage(LogEventLevel.Information,
-	                    "All devices have been activated. Adding new devices is not allowed.");
-	                return;
-	            }
+                if (newDev is EssentialsDevice essentialsDev)
+                    essentialsDev.Initialized += DeviceManager_Initialized;
+            }
+            finally
+            {
+                DeviceCriticalSection.Leave();
+            }
+        }

-	            foreach (var dev in devicesToAdd)
-	            {
-	                try
-	                {
-	                    Devices.Add(dev.Key, dev);
-	                }
-	                catch (ArgumentException ex)
-	                {
-	                    Debug.LogMessage(LogEventLevel.Information, "Error adding device with key {0} to Device Manager: {1}\r\nStack Trace: {2}",
-	                        dev.Key, ex.Message, ex.StackTrace);
-	                }
-	            }
-	        }
-	        finally
-	        {
-	            DeviceCriticalSection.Leave();
-	        }
-	    }
+        public static void AddDevice(IEnumerable<IKeyed> devicesToAdd)
+        {
+            try
+            {
+                if (!DeviceCriticalSection.TryEnter())
+                {
+                    Debug.LogMessage(LogEventLevel.Information,
+                        "Currently unable to add devices to Device Manager. Please try again");
+                    return;
+                }
+                if (!AddDeviceEnabled)
+                {
+                    Debug.LogMessage(LogEventLevel.Information,
+                        "All devices have been activated. Adding new devices is not allowed.");
+                    return;
+                }

-		public static void RemoveDevice(IKeyed newDev)
-		{
-		    try
-		    {
+                foreach (var dev in devicesToAdd)
+                {
+                    try
+                    {
+                        Devices.Add(dev.Key, dev);
+                    }
+                    catch (ArgumentException ex)
+                    {
+                        Debug.LogMessage(LogEventLevel.Information, "Error adding device with key {0} to Device Manager: {1}\r\nStack Trace: {2}",
+                            dev.Key, ex.Message, ex.StackTrace);
+                    }
+                }
+            }
+            finally
+            {
+                DeviceCriticalSection.Leave();
+            }
+        }
+
+        public static void RemoveDevice(IKeyed newDev)
+        {
+            try
+            {
                DeviceCriticalSection.Enter();
-		        if (newDev == null)
-		            return;
-		        if (Devices.ContainsKey(newDev.Key))
-		            Devices.Remove(newDev.Key);
-		            //if (_Devices.Contains(newDev))
-		            //    _Devices.Remove(newDev);
-		        else
-		            Debug.LogMessage(LogEventLevel.Information, "Device manager: Device '{0}' does not exist in manager.  Cannot remove", newDev.Key);
-		    }
-		    finally
-		    {
-		        DeviceCriticalSection.Leave();
-		    }
-		}
+                if (newDev == null)
+                    return;
+                if (Devices.ContainsKey(newDev.Key))
+                    Devices.Remove(newDev.Key);
+                //if (_Devices.Contains(newDev))
+                //    _Devices.Remove(newDev);
+                else
+                    Debug.LogMessage(LogEventLevel.Information, "Device manager: Device '{0}' does not exist in manager.  Cannot remove", newDev.Key);
+            }
+            finally
+            {
+                DeviceCriticalSection.Leave();
+            }
+        }

-		public static IEnumerable<string> GetDeviceKeys()
-		{
-		        //return _Devices.Select(d => d.Key).ToList();
-		        return Devices.Keys;
-		}
+        public static IEnumerable<string> GetDeviceKeys()
+        {
+            //return _Devices.Select(d => d.Key).ToList();
+            return Devices.Keys;
+        }

-		public static IEnumerable<IKeyed> GetDevices()
-		{
-		        //return _Devices.Select(d => d.Key).ToList();
-		        return Devices.Values;
-		}
+        public static IEnumerable<IKeyed> GetDevices()
+        {
+            //return _Devices.Select(d => d.Key).ToList();
+            return Devices.Values;
+        }

-		public static IKeyed GetDeviceForKey(string key)
-		{
-		        //return _Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-		        if (key != null && Devices.ContainsKey(key))
-		            return Devices[key];
+        public static IKeyed GetDeviceForKey(string key)
+        {
+            //return _Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
+            if (key != null && Devices.ContainsKey(key))
+                return Devices[key];

-		        return null;
-		}
+            return null;
+        }

        /// <summary>
        /// Console handler that simulates com port data receive 
@@ -367,8 +388,7 @@ namespace PepperDash.Essentials.Core
            }
            //Debug.LogMessage(LogEventLevel.Verbose, "**** {0} - {1} ****", match.Groups[1].Value, match.Groups[2].Value);

-            var com = GetDeviceForKey(match.Groups[1].Value) as ComPortController;
-            if (com == null)
+            if (!(GetDeviceForKey(match.Groups[1].Value) is ComPortController com))
            {
                CrestronConsole.ConsoleCommandResponse("'{0}' is not a comm port device", match.Groups[1].Value);
                return;
@@ -423,16 +443,15 @@ namespace PepperDash.Essentials.Core
            var deviceKey = args[0];
            var setting = args[1];

-            var timeout= String.Empty;
+            var timeout = String.Empty;

            if (args.Length >= 3)
            {
                timeout = args[2];
            }

-            var device = GetDeviceForKey(deviceKey) as IStreamDebugging;

-            if (device == null)
+            if (!(GetDeviceForKey(deviceKey) is IStreamDebugging device))
            {
                CrestronConsole.ConsoleCommandResponse("Unable to get device with key: {0}", deviceKey);
                return;
@@ -479,13 +498,11 @@ namespace PepperDash.Essentials.Core
        {
            foreach (var device in AllDevices)
            {
-                var streamDevice = device as IStreamDebugging;
-
-                if (streamDevice != null)
+                if (device is IStreamDebugging streamDevice)
                {
                    streamDevice.StreamDebugging.SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting.Off);
                }
            }
        }
-	}
+    }
 }
--- a/src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs
+++ b/src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs
@@ -17,6 +17,24 @@ namespace PepperDash.Essentials.Core
    [Description("The base Essentials Device Class")]
    public abstract class EssentialsDevice : Device
    {
+        public event EventHandler Initialized;
+
+        private bool _isInitialized;
+        public bool IsInitialized { 
+            get { return _isInitialized; }
+            private set 
+            { 
+                if (_isInitialized == value) return;
+                
+                _isInitialized = value;
+
+                if (_isInitialized)
+                {
+                    Initialized?.Invoke(this, new EventArgs());
+                }
+            } 
+        }
+
        protected EssentialsDevice(string key)
            : base(key)
        {
@@ -41,6 +59,8 @@ namespace PepperDash.Essentials.Core
                try
                {
                    Initialize();
+
+                    IsInitialized = true;
                }
                catch (Exception ex)
                {
--- a/src/PepperDash.Essentials.Core/Devices/LevelControlListItem.cs
+++ b/src/PepperDash.Essentials.Core/Devices/LevelControlListItem.cs
@@ -51,8 +51,18 @@ namespace PepperDash.Essentials.Core
        /// The key of the device in the DeviceManager for control
        /// </summary>
        [JsonProperty("deviceKey")]
-        public string DeviceKey => DeviceManager.AllDevices.
-            Where(d => d.Key.Contains(ParentDeviceKey) && d.Key.Contains(ItemKey)).FirstOrDefault()?.Key ?? $"{ParentDeviceKey}--{ItemKey}";
+        public string DeviceKey
+        {
+            get
+            {
+                if(string.IsNullOrEmpty(ItemKey)) return ParentDeviceKey;
+                else
+                {
+                    return DeviceManager.AllDevices.
+                    Where(d => d.Key.Contains(ParentDeviceKey) && d.Key.Contains(ItemKey)).FirstOrDefault()?.Key ?? $"{ParentDeviceKey}--{ItemKey}";
+                }
+            }
+        }

        /// <summary>
        /// Indicates if the item is a level, mute , or both
--- a/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs
+++ b/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs
@@ -1,128 +1,121 @@
-
-
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Linq;
 using PepperDash.Core;
+using System.Collections.Generic;

 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
-	/// 
-	/// </summary>
-	public enum eSourceListItemType
-	{
-		Route, Off, Other, SomethingAwesomerThanThese
-	}
+    /// <summary>
+    /// 
+    /// </summary>
+    public enum eSourceListItemType
+    {
+        Route, Off, Other, SomethingAwesomerThanThese
+    }

-	/// <summary>
-	/// Represents an item in a source list - can be deserialized into.
-	/// </summary>
-	public class SourceListItem
-	{
-		[JsonProperty("sourceKey")]
-		public string SourceKey { get; set; }
+    /// <summary>
+    /// Represents an item in a source list - can be deserialized into.
+    /// </summary>
+    public class SourceListItem
+    {
+        [JsonProperty("sourceKey")]
+        public string SourceKey { get; set; }

-		/// <summary>
-		/// Returns the source Device for this, if it exists in DeviceManager
-		/// </summary>
-		[JsonIgnore]
-		public Device SourceDevice
-		{
-			get
-			{
-				if (_SourceDevice == null)
-					_SourceDevice = DeviceManager.GetDeviceForKey(SourceKey) as Device;
-				return _SourceDevice;
-			}
-		}
-		Device _SourceDevice;
+        /// <summary>
+        /// Returns the source Device for this, if it exists in DeviceManager
+        /// </summary>
+        [JsonIgnore]
+        public Device SourceDevice
+        {
+            get
+            {
+                if (_SourceDevice == null)
+                    _SourceDevice = DeviceManager.GetDeviceForKey(SourceKey) as Device;
+                return _SourceDevice;
+            }
+        }

-		/// <summary>
-		/// Gets either the source's Name or this AlternateName property, if 
-		/// defined.  If source doesn't exist, returns "Missing source"
-		/// </summary>
-		[JsonProperty("preferredName")]
-		public string PreferredName
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(Name))
-				{
-					if (SourceDevice == null)
-						return "---";
-					return SourceDevice.Name;
-				}
-				return Name;
-			}
-		}
+        private Device _SourceDevice;

-		/// <summary>
-		/// A name that will override the source's name on the UI
-		/// </summary>
-		[JsonProperty("name")]
-		public string Name { get; set; }
+        /// <summary>
+        /// Gets either the source's Name or this AlternateName property, if 
+        /// defined.  If source doesn't exist, returns "Missing source"
+        /// </summary>
+        [JsonProperty("preferredName")]
+        public string PreferredName
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Name))
+                {
+                    if (SourceDevice == null)
+                        return "---";
+                    return SourceDevice.Name;
+                }
+                return Name;
+            }
+        }
+
+        /// <summary>
+        /// A name that will override the source's name on the UI
+        /// </summary>
+        [JsonProperty("name")]
+        public string Name { get; set; }

        /// <summary>
        /// Specifies and icon for the source list item
        /// </summary>
 		[JsonProperty("icon")]
-		public string Icon { get; set; }
+        public string Icon { get; set; }

        /// <summary>
        /// Alternate icon
        /// </summary>
 		[JsonProperty("altIcon")]
-		public string AltIcon { get; set; }
+        public string AltIcon { get; set; }

        /// <summary>
        /// Indicates if the item should be included in the source list
        /// </summary>
 		[JsonProperty("includeInSourceList")]
-		public bool IncludeInSourceList { get; set; }
+        public bool IncludeInSourceList { get; set; }

        /// <summary>
        /// Used to specify the order of the items in the source list when displayed
        /// </summary>
 		[JsonProperty("order")]
-		public int Order { get; set; }
+        public int Order { get; set; }

        /// <summary>
        /// The key of the device for volume control
        /// </summary>
 		[JsonProperty("volumeControlKey")]
-		public string VolumeControlKey { get; set; }
+        public string VolumeControlKey { get; set; }

        /// <summary>
        /// The type of source list item
        /// </summary>
 		[JsonProperty("type")]
-		[JsonConverter(typeof(StringEnumConverter))]
-		public eSourceListItemType Type { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public eSourceListItemType Type { get; set; }

        /// <summary>
        /// The list of routes to execute for this source list item
        /// </summary>
 		[JsonProperty("routeList")]
-		public List<SourceRouteListItem> RouteList { get; set; }
+        public List<SourceRouteListItem> RouteList { get; set; }

        /// <summary>
        /// Indicates if this source should be disabled for sharing to the far end call participants via codec content
        /// </summary>
 		[JsonProperty("disableCodecSharing")]
-		public bool DisableCodecSharing { get; set; }
+        public bool DisableCodecSharing { get; set; }

        /// <summary>
        /// Indicates if this source should be disabled for routing to a shared output
        /// </summary>
 		[JsonProperty("disableRoutedSharing")]
-		public bool DisableRoutedSharing { get; set; }
+        public bool DisableRoutedSharing { get; set; }

        [JsonProperty("destinations")]
        public List<eSourceListItemDestinationTypes> Destinations { get; set; }
@@ -156,10 +149,10 @@ namespace PepperDash.Essentials.Core
        [JsonProperty("disableSimpleRouting")]
        public bool DisableSimpleRouting { get; set; }

-		public SourceListItem()
-		{
-			Icon = "Blank";
-		}
+        public SourceListItem()
+        {
+            Icon = "Blank";
+        }

        public override string ToString()
        {
@@ -167,23 +160,23 @@ namespace PepperDash.Essentials.Core
        }
    }

-	public class SourceRouteListItem
-	{
-		[JsonProperty("sourceKey")]
-		public string SourceKey { get; set; }
+    public class SourceRouteListItem
+    {
+        [JsonProperty("sourceKey")]
+        public string SourceKey { get; set; }

        [JsonProperty("sourcePortKey")]
        public string SourcePortKey { get; set; }

-		[JsonProperty("destinationKey")]
-		public string DestinationKey { get; set; }
+        [JsonProperty("destinationKey")]
+        public string DestinationKey { get; set; }

        [JsonProperty("destinationPortKey")]
        public string DestinationPortKey { get; set; }

-		[JsonProperty("type")]
-		public eRoutingSignalType Type { get; set; }
-	}
+        [JsonProperty("type")]
+        public eRoutingSignalType Type { get; set; }
+    }

    /// <summary>
    /// Defines the valid destination types for SourceListItems in a room
@@ -193,8 +186,12 @@ namespace PepperDash.Essentials.Core
        defaultDisplay,
        leftDisplay,
        rightDisplay,
-		centerDisplay,
+        centerDisplay,
        programAudio,
-        codecContent
+        codecContent,
+        frontLeftDisplay,
+        frontRightDisplay,
+        rearLeftDisplay,
+        rearRightDisplay,
    }
 }
--- a/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs
+++ b/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs
@@ -107,19 +107,20 @@ namespace PepperDash.Essentials.Core
        }

        protected void AddJoins(Type type)
-        {
+        {            
            var fields =
-                type.GetType()
-                    .GetFields(BindingFlags.Public | BindingFlags.Instance)
-                    .Where(f => f.IsDefined(typeof (JoinNameAttribute), true));
+                type.GetFields(BindingFlags.Public | BindingFlags.Instance)
+                    .Where(f => f.IsDefined(typeof (JoinNameAttribute), true)).ToList();
+
+            Debug.LogMessage(LogEventLevel.Debug, "Got {fields} with JoinNameAttribute", fields.Count);

            foreach (var field in fields)
            {
                var childClass = Convert.ChangeType(this, type, null);

-                var value = field.GetValue(childClass) as JoinDataComplete; //this here is JoinMapBaseAdvanced, not the child class. JoinMapBaseAdvanced has no fields.
+                //this here is JoinMapBaseAdvanced, not the child class. JoinMapBaseAdvanced has no fields.

-                if (value == null)
+                if (!(field.GetValue(childClass) is JoinDataComplete value))
                {
                    Debug.LogMessage(LogEventLevel.Information, "Unable to cast base class to {0}", type.Name);
                    continue;
@@ -129,7 +130,7 @@ namespace PepperDash.Essentials.Core

                var joinName = value.GetNameAttribute(field);

-                if (String.IsNullOrEmpty(joinName)) continue;
+                if (string.IsNullOrEmpty(joinName)) continue;

                Joins.Add(joinName, value);
            }
@@ -155,29 +156,37 @@ namespace PepperDash.Essentials.Core
        {
            var sb = new StringBuilder();

-            // Get the joins of each type and print them
-            sb.AppendLine(String.Format("# {0}", GetType().Name));
-            sb.AppendLine();
-            sb.AppendLine("## Digitals");
-            sb.AppendLine();
-            // Get the joins of each type and print them
-            var digitals =
-                Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Digital) == eJoinType.Digital)
-                    .ToDictionary(j => j.Key, j => j.Value);
-            var digitalSb = AppendJoinList(GetSortedJoins(digitals));
-            digitalSb.AppendLine("## Analogs");
-            digitalSb.AppendLine();
+            var lineEnding = "\r\n";

-            var analogs =
-                Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Analog) == eJoinType.Analog)
+            var digitals =
+                Joins.Where(j => j.Value.Metadata.JoinType.HasFlag(eJoinType.Digital))
+                    .ToDictionary(j => j.Key, j => j.Value);
+
+            var analogs = Joins.Where(j => j.Value.Metadata.JoinType.HasFlag(eJoinType.Analog))
                    .ToDictionary(j => j.Key, j => j.Value);
-            var analogSb = AppendJoinList(GetSortedJoins(analogs));
-            analogSb.AppendLine("## Serials");
-            analogSb.AppendLine();

            var serials =
-                Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Serial) == eJoinType.Serial)
+                Joins.Where(j => j.Value.Metadata.JoinType.HasFlag(eJoinType.Serial))
                    .ToDictionary(j => j.Key, j => j.Value);
+
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Digital join count {digitalCount} Analog join count {analogCount} Serial join count {serialCount}", null, digitals.Count, analogs.Count, serials.Count);
+
+            // Get the joins of each type and print them
+            sb.Append($"# {GetType().Name}\r\n");
+            sb.Append(lineEnding);
+            sb.Append($"## Digitals{lineEnding}");
+            sb.Append(lineEnding);
+            // Get the joins of each type and print them
+            
+            var digitalSb = AppendJoinList(GetSortedJoins(digitals));
+            digitalSb.Append($"## Analogs{lineEnding}");
+            digitalSb.Append(lineEnding);
+            
+            var analogSb = AppendJoinList(GetSortedJoins(analogs));
+            analogSb.Append($"## Serials{lineEnding}");
+            analogSb.Append(lineEnding);
+
+            
            var serialSb = AppendJoinList(GetSortedJoins(serials));

            sb.EnsureCapacity(sb.Length + digitalSb.Length + analogSb.Length + serialSb.Length);
@@ -202,7 +211,7 @@ namespace PepperDash.Essentials.Core

        private static void WriteJoinmapMarkdown(StringBuilder stringBuilder, string pluginType, string bridgeKey, string deviceKey)
        {
-            var fileName = String.Format("{0}{1}{2}__{3}__{4}.md", Global.FilePathPrefix, "joinMaps/", pluginType, bridgeKey, deviceKey);
+            var fileName = string.Format("{0}{1}{2}__{3}__{4}.md", Global.FilePathPrefix, "joinMaps/", pluginType, bridgeKey, deviceKey);

            using (var sw = new StreamWriter(fileName))
            {
@@ -230,7 +239,7 @@ namespace PepperDash.Essentials.Core
        static StringBuilder AppendJoinList(List<KeyValuePair<string, JoinDataComplete>> joins)
        {
            var sb = new StringBuilder();
-            const string stringFormatter = "| {0} | {1} | {2} | {3} | {4} |";
+            const string stringFormatter = "| {0} | {1} | {2} | {3} | {4} |\r\n";
            const int joinNumberLen = 11;
            const int joinSpanLen = 9;
            const int typeLen = 19;
@@ -238,25 +247,25 @@ namespace PepperDash.Essentials.Core
            var descriptionLen = (from @join in joins select @join.Value into j select j.Metadata.Description.Length).Concat(new[] {11}).Max();

            //build header
-            sb.AppendLine(String.Format(stringFormatter, 
-                String.Format("Join Number").PadRight(joinNumberLen, ' '), 
-                String.Format("Join Span").PadRight(joinSpanLen, ' '), 
-                String.Format("Description").PadRight(descriptionLen, ' '), 
-                String.Format("Type").PadRight(typeLen, ' '),
-                 String.Format("Capabilities").PadRight(capabilitiesLen, ' ')));
+            sb.Append(string.Format(stringFormatter,
+                string.Format("Join Number").PadRight(joinNumberLen, ' '),
+                string.Format("Join Span").PadRight(joinSpanLen, ' '),
+                string.Format("Description").PadRight(descriptionLen, ' '),
+                string.Format("Type").PadRight(typeLen, ' '),
+                 string.Format("Capabilities").PadRight(capabilitiesLen, ' ')));
            //build table seperator
-            sb.AppendLine(String.Format(stringFormatter,
-                new String('-', joinNumberLen),
-                new String('-', joinSpanLen),
-                new String('-', descriptionLen),
-                new String('-', typeLen),
-                new String('-', capabilitiesLen)));
+            sb.Append(string.Format(stringFormatter,
+                new string('-', joinNumberLen),
+                new string('-', joinSpanLen),
+                new string('-', descriptionLen),
+                new string('-', typeLen),
+                new string('-', capabilitiesLen)));

            foreach (var join in joins)
            {
-                sb.AppendLine(join.Value.GetMarkdownFormattedData(stringFormatter, descriptionLen));
+                sb.Append(join.Value.GetMarkdownFormattedData(stringFormatter, descriptionLen));
            }
-            sb.AppendLine();
+            sb.Append("\r\n");
            return sb;
        }

@@ -411,10 +420,10 @@ namespace PepperDash.Essentials.Core
        {

            //Fixed Width Headers
-            var joinNumberLen = String.Format("Join Number").Length;
-            var joinSpanLen = String.Format("Join Span").Length;
-            var typeLen = String.Format("AnalogDigitalSerial").Length;
-            var capabilitiesLen = String.Format("ToFromFusion").Length;
+            var joinNumberLen = string.Format("Join Number").Length;
+            var joinSpanLen = string.Format("Join Span").Length;
+            var typeLen = string.Format("AnalogDigitalSerial").Length;
+            var capabilitiesLen = string.Format("ToFromFusion").Length;

            //Track which one failed, if it did
            const string placeholder = "unknown";
@@ -430,13 +439,13 @@ namespace PepperDash.Essentials.Core

            try
            {
-                dataArray["joinNumber"] = String.Format("{0}", JoinNumber.ToString(CultureInfo.InvariantCulture).ReplaceIfNullOrEmpty(placeholder)).PadRight(joinNumberLen, ' ');
-                dataArray["joinSpan"] = String.Format("{0}", JoinSpan.ToString(CultureInfo.InvariantCulture).ReplaceIfNullOrEmpty(placeholder)).PadRight(joinSpanLen, ' ');
-                dataArray["description"] = String.Format("{0}", Metadata.Description.ReplaceIfNullOrEmpty(placeholder)).PadRight(descriptionLen, ' ');
-                dataArray["joinType"] = String.Format("{0}", Metadata.JoinType.ToString().ReplaceIfNullOrEmpty(placeholder)).PadRight(typeLen, ' ');
-                dataArray["capabilities"] = String.Format("{0}", Metadata.JoinCapabilities.ToString().ReplaceIfNullOrEmpty(placeholder)).PadRight(capabilitiesLen, ' ');
+                dataArray["joinNumber"] = string.Format("{0}", JoinNumber.ToString(CultureInfo.InvariantCulture).ReplaceIfNullOrEmpty(placeholder)).PadRight(joinNumberLen, ' ');
+                dataArray["joinSpan"] = string.Format("{0}", JoinSpan.ToString(CultureInfo.InvariantCulture).ReplaceIfNullOrEmpty(placeholder)).PadRight(joinSpanLen, ' ');
+                dataArray["description"] = string.Format("{0}", Metadata.Description.ReplaceIfNullOrEmpty(placeholder)).PadRight(descriptionLen, ' ');
+                dataArray["joinType"] = string.Format("{0}", Metadata.JoinType.ToString().ReplaceIfNullOrEmpty(placeholder)).PadRight(typeLen, ' ');
+                dataArray["capabilities"] = string.Format("{0}", Metadata.JoinCapabilities.ToString().ReplaceIfNullOrEmpty(placeholder)).PadRight(capabilitiesLen, ' ');

-                return String.Format(stringFormatter,
+                return string.Format(stringFormatter,
                    dataArray["joinNumber"],
                    dataArray["joinSpan"],
                    dataArray["description"],
@@ -454,8 +463,8 @@ namespace PepperDash.Essentials.Core
                    errorKey = item.Key;
                    break;
                }
-                Debug.LogMessage(LogEventLevel.Information, "Unable to decode join metadata {1}- {0}", e.Message, !String.IsNullOrEmpty(errorKey) ? (' ' + errorKey) : String.Empty);
-                return String.Format(stringFormatter,
+                Debug.LogMessage(LogEventLevel.Information, "Unable to decode join metadata {1}- {0}", e.Message, !string.IsNullOrEmpty(errorKey) ? (' ' + errorKey) : string.Empty);
+                return string.Format(stringFormatter,
                    dataArray["joinNumber"],
                    dataArray["joinSpan"],
                    dataArray["description"],
@@ -520,7 +529,7 @@ namespace PepperDash.Essentials.Core

        public JoinNameAttribute(string name)
        {
-            Debug.LogMessage(LogEventLevel.Verbose, "Setting Attribute Name: {0}", name);
+            Debug.LogMessage(LogEventLevel.Verbose, "Setting Attribute Name: {0}",null, name);
            _Name = name;
        }

--- a/src/PepperDash.Essentials.Core/PartitionSensor/EssentialsPartitionController.cs
+++ b/src/PepperDash.Essentials.Core/PartitionSensor/EssentialsPartitionController.cs
@@ -104,6 +104,7 @@ namespace PepperDash.Essentials.Core
            {
                _partitionSensor.PartitionPresentFeedback.OutputChange -= PartitionPresentFeedback_OutputChange;
                _partitionSensor.PartitionPresentFeedback.OutputChange += PartitionPresentFeedback_OutputChange;
+                PartitionPresent = _partitionSensor.PartitionPresentFeedback.BoolValue;
            }

            PartitionPresentFeedback.FireUpdate();
@@ -126,6 +127,7 @@ namespace PepperDash.Essentials.Core
            if (_partitionSensor != null)
            {
                _partitionSensor.PartitionPresentFeedback.OutputChange -= PartitionPresentFeedback_OutputChange;
+                PartitionPresent = _partitionSensor.PartitionPresentFeedback.BoolValue;
            }

            PartitionPresentFeedback.FireUpdate();
@@ -137,6 +139,7 @@ namespace PepperDash.Essentials.Core
            if (!IsInAutoMode)
            {
                PartitionPresent = true;
+                PartitionPresentFeedback.FireUpdate();
            }
        }

@@ -145,6 +148,7 @@ namespace PepperDash.Essentials.Core
            if (!IsInAutoMode)
            {
                PartitionPresent = false;
+                PartitionPresentFeedback.FireUpdate();
            }
        }

--- a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
+++ b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
@@ -4,7 +4,7 @@
    <Configurations>Debug;Release;Debug 4.7.2</Configurations>
  </PropertyGroup>
  <PropertyGroup>
-    <TargetFrameworks>net472;net6</TargetFrameworks>
+    <TargetFramework>net472</TargetFramework>
    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
    <OutputPath>bin\$(Configuration)\</OutputPath>
    <AssemblyName>PepperDash_Essentials_Core</AssemblyName>
@@ -25,8 +25,8 @@
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.66" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-424" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="PepperDashCore" Version="2.0.1" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />
--- a/src/PepperDash.Essentials.Core/PepperDash_Essentials_Core.csproj
+++ b/src/PepperDash.Essentials.Core/PepperDash_Essentials_Core.csproj
@@ -1,432 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDash.Essentials.Core</RootNamespace>
-    <AssemblyName>PepperDash_Essentials_Core</AssemblyName>
-    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
-    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
-    <OSVersion>5.0</OSVersion>
-    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <NativePlatformName>Windows CE</NativePlatformName>
-    <FormFactorID>
-    </FormFactorID>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.ThreeSeriesCards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
-    </Reference>
-    <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SimplSharpCWSHelperInterface, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCWSHelperInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Bridges\BridgeBase.cs" />
-    <Compile Include="Bridges\IBridge.cs" />
-    <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\GenericIrControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\HdPsXxxControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\IAnalogInputJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\IDigitalOutputJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\PduJoinMapBase.cs" />
-    <Compile Include="Bridges\JoinMaps\C2nRthsControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\CameraControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\CenOdtOccupancySensorBaseJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DigitalLoggerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DisplayControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmBladeChassisControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmChassisControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmpsAudioOutputControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmpsMicrophoneControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmpsRoutingControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmRmcControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\DmTxControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\GenericLightingJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\GenericRelayControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\GlsOccupancySensorBaseJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\GlsPartitionSensorJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\HdMdNxM4kEControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\HdMdxxxCEControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\Hrxxx0WirelessRemoteControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\IBasicCommunicationJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\IDigitalInputJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\IRBlurayBaseJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\VideoCodecControllerJoinMap.cs" />
-    <Compile Include="Comm and IR\CecPortController.cs" />
-    <Compile Include="Comm and IR\CommFactory.cs" />
-    <Compile Include="Comm and IR\CommunicationExtras.cs" />
-    <Compile Include="Comm and IR\ComPortController.cs" />
-    <Compile Include="Comm and IR\ComSpecJsonConverter.cs" />
-    <Compile Include="Comm and IR\ConsoleCommMockDevice.cs" />
-    <Compile Include="Comm and IR\GenericComm.cs" />
-    <Compile Include="Comm and IR\GenericHttpClient.cs" />
-    <Compile Include="Comm and IR\IRPortHelper.cs" />
-    <Compile Include="Config\Essentials\ConfigUpdater.cs" />
-    <Compile Include="Config\Essentials\ConfigReader.cs" />
-    <Compile Include="Config\Essentials\ConfigWriter.cs" />
-    <Compile Include="Config\Essentials\EssentialsConfig.cs" />
-    <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
-    <Compile Include="Crestron IO\C2nIo\C2nIoController.cs" />
-    <Compile Include="Crestron IO\C2nRts\C2nRthsController.cs" />
-    <Compile Include="Crestron IO\Cards\C3CardControllerBase.cs" />
-    <Compile Include="Crestron IO\Cards\C3Com3Controller.cs" />
-    <Compile Include="Crestron IO\Cards\C3Io16Controller.cs" />
-    <Compile Include="Crestron IO\Cards\C3Ir8Controller.cs" />
-    <Compile Include="Crestron IO\Cards\C3Ry16Controller.cs" />
-    <Compile Include="Crestron IO\Cards\C3Ry8Controller.cs" />
-    <Compile Include="Crestron IO\Cards\CenCi31Controller.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Crestron IO\Cards\CenCi33Controller.cs" />
-    <Compile Include="Crestron IO\Cards\InternalCardCageController.cs" />
-    <Compile Include="Crestron IO\DinCenCn\DinCenCnController.cs" />
-    <Compile Include="Crestron IO\DinCenCn\IHasCresnetBranches.cs" />
-    <Compile Include="Crestron IO\DinIo8\DinIo8Controller.cs" />
-    <Compile Include="Crestron IO\Inputs\CenIoDigIn104Controller.cs" />
-    <Compile Include="Crestron IO\Inputs\GenericVersiportAnalogInputDevice.cs" />
-    <Compile Include="Crestron IO\Inputs\GenericDigitalInputDevice.cs" />
-    <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
-    <Compile Include="Crestron IO\Inputs\IAnalogInput.cs" />
-    <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
-    <Compile Include="Crestron IO\IOPortConfig.cs" />
-    <Compile Include="Crestron IO\Ir\CenIoIr104Controller.cs" />
-    <Compile Include="Crestron IO\Outputs\GenericVersiportOutputDevice.cs" />
-    <Compile Include="Crestron IO\Outputs\IDigitalOutput.cs" />
-    <Compile Include="Crestron IO\Relay\CenIoRy104Controller.cs" />
-    <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
-    <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
-    <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
-    <Compile Include="Device Info\NetworkDeviceHelpers.cs" />
-    <Compile Include="Devices\PowerInterfaces.cs" />
-    <Compile Include="Web\RequestHandlers\AppDebugRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\GetFeedbacksForDeviceRequestHandler.cs" />
-    <Compile Include="Web\EssentialsWebApiHelpers.cs" />
-    <Compile Include="Web\RequestHandlers\GetTypesByFilterRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\GetJoinMapForDeviceKeyRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\DefaultRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\DevListRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\DevPropsRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\DevJsonRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\SetDeviceStreamDebugRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\DisableAllStreamDebugRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\ShowConfigRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\GetTypesRequestHandler.cs" />
-    <Compile Include="Web\RequestHandlers\GetJoinMapForBridgeKeyRequestHandler.cs" />
-    <Compile Include="Web\EssemtialsWebApi.cs" />
-    <Compile Include="Web\EssentialsWebApiFactory.cs" />
-    <Compile Include="Web\EssentialsWebApiPropertiesConfig.cs" />
-    <Compile Include="Web\RequestHandlers\ReportVersionsRequestHandler.cs" />
-    <Compile Include="Device Info\DeviceInfo.cs" />
-    <Compile Include="Device Info\DeviceInfoEventArgs.cs" />
-    <Compile Include="Device Info\IDeviceInfoProvider.cs" />
-    <Compile Include="Devices\CodecInterfaces.cs" />
-    <Compile Include="Devices\CrestronProcessor.cs" />
-    <Compile Include="Devices\DestinationListItem.cs" />
-    <Compile Include="Devices\DeviceApiBase.cs" />
-    <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
-    <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
-    <Compile Include="Devices\EssentialsDevice.cs" />
-    <Compile Include="Devices\GenericIRController.cs" />
-    <Compile Include="Devices\IDspPreset.cs" />
-    <Compile Include="Devices\IProjectorInterfaces.cs" />
-    <Compile Include="Devices\IReconfigurableDevice.cs" />
-    <Compile Include="Devices\PC\InRoomPc.cs" />
-    <Compile Include="Devices\PC\Laptop.cs" />
-    <Compile Include="Devices\PduInterfaces.cs" />
-    <Compile Include="Devices\ReconfigurableDevice.cs" />
-    <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
-    <Compile Include="DeviceTypeInterfaces\IPasswordPrompt.cs" />
-    <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
-    <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
-    <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
-    <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
-    <Compile Include="DeviceTypeInterfaces\ILanguageDefinition.cs" />
-    <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
-    <Compile Include="DeviceTypeInterfaces\IHasPhoneDialing.cs" />
-    <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
-    <Compile Include="Extensions\JsonExtensions.cs" />
-    <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="Factory\DeviceFactory.cs" />
-    <Compile Include="Factory\IDeviceFactory.cs" />
-    <Compile Include="Factory\ReadyEventArgs.cs" />
-    <Compile Include="Feedbacks\BoolFeedback.cs" />
-    <Compile Include="Feedbacks\FeedbackCollection.cs" />
-    <Compile Include="Feedbacks\FeedbackEventArgs.cs" />
-    <Compile Include="Feedbacks\IntFeedback.cs" />
-    <Compile Include="Feedbacks\SerialFeedback.cs" />
-    <Compile Include="Feedbacks\StringFeedback.cs" />
-    <Compile Include="File\FileIO.cs" />
-    <Compile Include="Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" />
-    <Compile Include="Fusion\FusionCustomPropertiesBridge.cs" />
-    <Compile Include="Fusion\FusionEventHandlers.cs" />
-    <Compile Include="Fusion\FusionProcessorQueries.cs" />
-    <Compile Include="Fusion\EssentialsHuddleSpaceRoomFusionRoomJoinMap.cs" />
-    <Compile Include="Fusion\FusionRviDataClasses.cs" />
-    <Compile Include="Gateways\CenRfgwController.cs" />
-    <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
-    <Compile Include="Global\EthernetAdapterInfo.cs" />
-    <Compile Include="Interfaces\ILogStrings.cs" />
-    <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
-    <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
-    <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
-    <Compile Include="PartitionSensor\EssentialsPartitionController.cs" />
-    <Compile Include="PartitionSensor\GlsPartitionSensorPropertiesConfig.cs" />
-    <Compile Include="PartitionSensor\IPartitionStateProvider.cs" />
-    <Compile Include="Occupancy\OccupancyAggregatorConfig.cs" />
-    <Compile Include="Queues\ComsMessage.cs" />
-    <Compile Include="Queues\ProcessStringMessage.cs" />
-    <Compile Include="Queues\GenericQueue.cs" />
-    <Compile Include="Global\JobTimer.cs" />
-    <Compile Include="Global\Scheduler.cs" />
-    <Compile Include="Queues\IQueue.cs" />
-    <Compile Include="JoinMaps\JoinMapBase.cs" />
-    <Compile Include="Lighting\Lighting Interfaces.cs" />
-    <Compile Include="Lighting\LightingBase.cs" />
-    <Compile Include="Monitoring\SystemMonitorController.cs" />
-    <Compile Include="Microphone Privacy\MicrophonePrivacyController.cs" />
-    <Compile Include="Microphone Privacy\MicrophonePrivacyControllerConfig.cs" />
-    <Compile Include="Occupancy\CenOdtOccupancySensorBaseController.cs" />
-    <Compile Include="Occupancy\GlsOccupancySensorBaseController.cs" />
-    <Compile Include="Occupancy\GlsOdtOccupancySensorController.cs" />
-    <Compile Include="Occupancy\IOccupancyStatusProviderAggregator.cs" />
-    <Compile Include="PartitionSensor\GlsPartitionSensorController.cs" />
-    <Compile Include="Plugins\PluginLoader.cs" />
-    <Compile Include="Presets\PresetBase.cs" />
-    <Compile Include="Plugins\IPluginDeviceFactory.cs" />
-    <Compile Include="Queues\IQueueMessage.cs" />
-    <Compile Include="Ramps and Increments\ActionIncrementer.cs" />
-    <Compile Include="Config\BasicConfig.cs" />
-    <Compile Include="Config\ConfigPropertiesHelpers.cs" />
-    <Compile Include="Config\InfoConfig.cs" />
-    <Compile Include="Config\DeviceConfig.cs" />
-    <Compile Include="Devices\DisplayUiConstants.cs" />
-    <Compile Include="Devices\IUsageTracking.cs" />
-    <Compile Include="Devices\DeviceJsonApi.cs" />
-    <Compile Include="Devices\SourceListItem.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDisplayBasic.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDumbSource.cs" />
-    <Compile Include="DeviceTypeInterfaces\IWarmingCooling.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDiscPlayerControls.cs" />
-    <Compile Include="DeviceTypeInterfaces\IPower.cs" />
-    <Compile Include="DeviceTypeInterfaces\IUiDisplayInfo.cs" />
-    <Compile Include="DeviceTypeInterfaces\ISetTopBoxControls.cs" />
-    <Compile Include="DeviceTypeInterfaces\IChannel.cs" />
-    <Compile Include="DeviceTypeInterfaces\IColorFunctions.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDPad.cs" />
-    <Compile Include="DeviceTypeInterfaces\IDvr.cs" />
-    <Compile Include="DeviceTypeInterfaces\Template.cs" />
-    <Compile Include="DeviceTypeInterfaces\ITransport.cs" />
-    <Compile Include="Devices\GenericMonitoredTcpDevice.cs" />
-    <Compile Include="DeviceTypeInterfaces\INumeric.cs" />
-    <Compile Include="Devices\IVolumeAndAudioInterfaces.cs" />
-    <Compile Include="Display\BasicIrDisplay.cs" />
-    <Compile Include="Feedbacks\BoolFeedbackOneShot.cs" />
-    <Compile Include="Ramps and Increments\NumericalHelpers.cs" />
-    <Compile Include="Ramps and Increments\UshortSigIncrementer.cs" />
-    <Compile Include="Remotes\ButtonExtensions.cs" />
-    <Compile Include="Remotes\CrestronRemotePropertiesConfig.cs" />
-    <Compile Include="Remotes\Hrxx0WirelessRemoteController.cs" />
-    <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
-    <Compile Include="Room\Combining\EssentialsRoomCombiner.cs" />
-    <Compile Include="Room\Combining\EssentialsRoomCombinerPropertiesConfig.cs" />
-    <Compile Include="Room\Combining\IEssentialsRoomCombiner.cs" />
-    <Compile Include="Room\Combining\RoomCombinationScenario.cs" />
-    <Compile Include="Room\EssentialsRoomBase.cs" />
-    <Compile Include="Room\Config\EssentialsRoomScheduledEventsConfig.cs" />
-    <Compile Include="Room\IEssentialsRoom.cs" />
-    <Compile Include="Room\Interfaces.cs" />
-    <Compile Include="Room\iOccupancyStatusProvider.cs" />
-    <Compile Include="Routing\DummyRoutingInputsDevice.cs" />
-    <Compile Include="Routing\ICardPortsDevice.cs" />
-    <Compile Include="InUseTracking\IInUseTracking.cs" />
-    <Compile Include="InUseTracking\InUseTracking.cs" />
-    <Compile Include="Routing\IRoutingInputsExtensions.cs" />
-    <Compile Include="Monitoring\StatusMonitorCollection.cs" />
-    <Compile Include="Monitoring\CrestronGenericBaseCommunicationMonitor.cs" />
-    <Compile Include="Monitoring\StatusMonitorBase.cs" />
-    <Compile Include="Monitoring\Interfaces.cs" />
-    <Compile Include="Monitoring\GenericCommunicationMonitor.cs" />
-    <Compile Include="Devices\AudioInterfaces.cs" />
-    <Compile Include="Devices\IAttachVideoStatusExtensions.cs" />
-    <Compile Include="Devices\IHasFeedbacks.cs" />
-    <Compile Include="Devices\SmartObjectBaseTypes.cs" />
-    <Compile Include="Devices\PresentationDeviceType.cs" />
-    <Compile Include="Display\MockDisplay.cs" />
-    <Compile Include="Ethernet\EthernetStatistics.cs" />
-    <Compile Include="Global\Global.cs" />
-    <Compile Include="License\EssentialsLicenseManager.cs" />
-    <Compile Include="Feedbacks\BoolOutputLogicals.cs" />
-    <Compile Include="Presets\Interfaces.cs" />
-    <Compile Include="Presets\PresetsListSubpageReferenceListItem.cs" />
-    <Compile Include="Presets\DevicePresetsView.cs" />
-    <Compile Include="Presets\PresetChannel.cs" />
-    <Compile Include="Presets\DevicePresets.cs" />
-    <Compile Include="Routing\RoutingInterfaces.cs" />
-    <Compile Include="Routing\RoutingPort.cs" />
-    <Compile Include="Routing\RoutingPortCollection.cs" />
-    <Compile Include="Feedbacks\BoolFeedbackPulseExtender.cs" />
-    <Compile Include="Routing\RoutingPortNames.cs" />
-    <Compile Include="Routing\TieLineConfig.cs" />
-    <Compile Include="Secrets\CrestronGlobalSecretsProvider.cs" />
-    <Compile Include="Secrets\CrestronLocalSecretsProvider.cs" />
-    <Compile Include="Secrets\CrestronSecret.cs" />
-    <Compile Include="Secrets\Interfaces.cs" />
-    <Compile Include="Secrets\SecretsManager.cs" />
-    <Compile Include="Secrets\SecretsPropertiesConfig.cs" />
-    <Compile Include="Shades\Shade Interfaces.cs" />
-    <Compile Include="Shades\ShadeBase.cs" />
-    <Compile Include="Shades\ShadeController.cs" />
-    <Compile Include="SmartObjects\SmartObjectNumeric.cs" />
-    <Compile Include="SmartObjects\SmartObjectDynamicList.cs" />
-    <Compile Include="SmartObjects\SmartObjectDPad.cs" />
-    <Compile Include="SmartObjects\SmartObjectHelperBase.cs" />
-    <Compile Include="Routing\TieLine.cs" />
-    <Compile Include="Queues\StringResponseProcessor.cs" />
-    <Compile Include="Timers\CountdownTimer.cs" />
-    <Compile Include="Timers\RetriggerableTimer.cs" />
-    <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
-    <Compile Include="Touchpanels\Interfaces.cs" />
-    <Compile Include="Touchpanels\Keyboards\HabaneroKeyboardController.cs" />
-    <Compile Include="Touchpanels\Mpc3Touchpanel.cs" />
-    <Compile Include="Touchpanels\TriListExtensions.cs" />
-    <Compile Include="UI PageManagers\BlurayPageManager.cs" />
-    <Compile Include="UI PageManagers\SetTopBoxThreePanelPageManager.cs" />
-    <Compile Include="UI PageManagers\SinglePageManager.cs" />
-    <Compile Include="UI PageManagers\PageManager.cs" />
-    <Compile Include="UI PageManagers\SetTopBoxTwoPanelPageManager.cs" />
-    <Compile Include="UI\TouchpanelBase.cs" />
-    <Compile Include="Utilities\ActionSequence.cs" />
-    <Compile Include="VideoStatus\VideoStatusOutputs.cs" />
-    <Compile Include="Crestron\CrestronGenericBaseDevice.cs" />
-    <Compile Include="DeviceControlsParentInterfaces\IPresentationSource.cs" />
-    <Compile Include="Devices\DeviceManager.cs" />
-    <Compile Include="Devices\IrOutputPortController.cs" />
-    <Compile Include="Display\DisplayBase.cs" />
-    <Compile Include="Feedbacks\FeedbackBase.cs" />
-    <Compile Include="Room\Room.cs" />
-    <Compile Include="SmartObjects\SubpageReferencList\SourceListSubpageReferenceList.cs" />
-    <Compile Include="Touchpanels\ModalDialog.cs" />
-    <Compile Include="TriListBridges\HandlerBridge.cs" />
-    <Compile Include="Devices\FIND HOMES Interfaces.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SigHelper.cs" />
-    <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceList.cs" />
-    <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceListItem.cs" />
-    <None Include="app.config" />
-    <None Include="Properties\ControlSystem.cfg" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>rem S# Pro preparation will execute after these operations</PostBuildEvent>
-  </PropertyGroup>
-</Project>
--- a/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs
+++ b/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs
@@ -130,6 +130,8 @@ namespace PepperDash.Essentials.Core.Presets
                    var pl = JsonConvert.DeserializeObject<PresetsList>(File.ReadToEnd(_filePath, Encoding.ASCII));
                    Name = pl.Name;
                    PresetsList = pl.Channels;
+
+                    Debug.LogMessage(LogEventLevel.Verbose, this, "Loaded {0} presets", PresetsList.Count);
                }
                catch (Exception e)
                {
--- a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs
+++ b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs
@@ -5,6 +5,8 @@ using Serilog.Events;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;

 namespace PepperDash.Essentials.Core
 {
@@ -48,6 +50,8 @@ namespace PepperDash.Essentials.Core

        private int _scenarioChangeDebounceTimeSeconds = 10; // default to 10s

+        private Mutex _scenarioChange = new Mutex();
+
        public EssentialsRoomCombiner(string key, EssentialsRoomCombinerPropertiesConfig props)
            : base(key)
        {
@@ -80,7 +84,15 @@ namespace PepperDash.Essentials.Core
                SetupPartitionStateProviders();

                SetRooms();
+            });

+
+            // Subscribe to the AllDevicesInitialized event
+            // We need to wait until all devices are initialized in case
+            // any actions are dependent on 3rd party devices already being
+            // connected and initialized
+            DeviceManager.AllDevicesInitialized += (o, a) =>
+            {
                if (IsInAutoMode)
                {
                    DetermineRoomCombinationScenario();
@@ -89,7 +101,7 @@ namespace PepperDash.Essentials.Core
                {
                    SetRoomCombinationScenario(_propertiesConfig.defaultScenarioKey);
                }
-            });
+            };
        }

        private void CreateScenarios()
@@ -107,11 +119,20 @@ namespace PepperDash.Essentials.Core

            foreach (var roomKey in _propertiesConfig.RoomKeys)
            {
-                if (DeviceManager.GetDeviceForKey(roomKey) is IEssentialsRoom room)
+                var room = DeviceManager.GetDeviceForKey(roomKey);
+
+                if (DeviceManager.GetDeviceForKey(roomKey) is IEssentialsRoom essentialsRoom)
                {
-                    _rooms.Add(room);
+                    _rooms.Add(essentialsRoom);
                }
            }
+
+            var rooms = DeviceManager.AllDevices.OfType<IEssentialsRoom>().Cast<Device>();
+
+            foreach (var room in rooms)
+            {
+                room.Deactivate();
+            }
        }

        private void SetupPartitionStateProviders()
@@ -189,10 +210,40 @@ namespace PepperDash.Essentials.Core
            if (currentScenario != null)
            {
                this.LogInformation("Found combination Scenario {scenarioKey}", currentScenario.Key);
-                CurrentScenario = currentScenario;
+                ChangeScenario(currentScenario);
            }
        }

+        private async Task ChangeScenario(IRoomCombinationScenario newScenario)
+        {
+            
+
+                if (newScenario == _currentScenario)
+                {
+                    return;
+                }
+
+                // Deactivate the old scenario first
+                if (_currentScenario != null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "Deactivating scenario {currentScenario}", this, _currentScenario.Name);
+                    await _currentScenario.Deactivate();
+                }
+
+                _currentScenario = newScenario;
+
+                // Activate the new scenario
+                if (_currentScenario != null)
+                {
+                    Debug.LogMessage(LogEventLevel.Debug, $"Current Scenario: {_currentScenario.Name}", this);
+                    await _currentScenario.Activate();
+                }
+
+                RoomCombinationScenarioChanged?.Invoke(this, new EventArgs());
+
+            
+        }
+
        #region IEssentialsRoomCombiner Members

        public event EventHandler<EventArgs> RoomCombinationScenarioChanged;
@@ -203,33 +254,6 @@ namespace PepperDash.Essentials.Core
            {
                return _currentScenario;
            }
-            private set
-            {
-                if (value != _currentScenario)
-                {
-                    // Deactivate the old scenario first
-                    if (_currentScenario != null)
-                    {
-                        _currentScenario.Deactivate();
-                    }
-
-                    _currentScenario = value;
-
-                    // Activate the new scenario
-                    if (_currentScenario != null)
-                    {
-                        _currentScenario.Activate();
-
-                        Debug.LogMessage(LogEventLevel.Debug, $"Current Scenario: {_currentScenario.Name}", this);
-                    }
-
-                    var handler = RoomCombinationScenarioChanged;
-                    if (handler != null)
-                    {
-                        handler(this, new EventArgs());
-                    }
-                }
-            }
        }

        public BoolFeedback IsInAutoModeFeedback { get; private set; }
--- a/src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs
+++ b/src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using PepperDash.Core;

@@ -87,12 +88,12 @@ namespace PepperDash.Essentials.Core
        /// <summary>
        /// Activates this room combination scenario
        /// </summary>
-        void Activate();
+        Task Activate();

        /// <summary>
        /// Deactivates this room combination scenario
        /// </summary>
-        void Deactivate();
+        Task Deactivate();

        /// <summary>
        /// The state of the partitions that would activate this scenario
--- a/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs
+++ b/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs
@@ -3,6 +3,7 @@ using PepperDash.Core;
 using PepperDash.Core.Logging;
 using Serilog.Events;
 using System.Collections.Generic;
+using System.Threading.Tasks;

 namespace PepperDash.Essentials.Core
 {
@@ -69,32 +70,36 @@ namespace PepperDash.Essentials.Core
            IsActiveFeedback = new BoolFeedback(() => _isActive);
        }

-        public void Activate()
+        public async Task Activate()
        {
-            Debug.LogMessage(LogEventLevel.Debug, "Activating Scenario: '{name}' with {activationActionCount} action(s) defined", this, Name, activationActions.Count);
+            this.LogInformation("Activating Scenario {name} with {activationActionCount} action(s) defined", Name, activationActions.Count);
+
+            List<Task> tasks = new List<Task>();

            if (activationActions != null)
            {
                foreach (var action in activationActions)
                {
-                    this.LogDebug("Running Activation action {@action}", action);
-                    DeviceJsonApi.DoDeviceAction(action);
+                    this.LogInformation("Running Activation action {@action}", action);
+                    await DeviceJsonApi.DoDeviceActionAsync(action);
                }
            }

            IsActive = true;
        }

-        public void Deactivate()
+        public async Task Deactivate()
        {
-            Debug.LogMessage(LogEventLevel.Debug, "Deactivating Scenario: '{name}' with {deactivationActionCount} action(s) defined", this, Name, deactivationActions.Count);
+            this.LogInformation("Deactivating Scenario {name} with {deactivationActionCount} action(s) defined", Name, deactivationActions.Count);
+
+            List<Task> tasks = new List<Task>();

            if (deactivationActions != null)
            {
                foreach (var action in deactivationActions)
                {
-                    this.LogDebug("Running deactivation action {@action}", action);
-                    DeviceJsonApi.DoDeviceAction(action);
+                    this.LogInformation("Running deactivation action {actionDeviceKey}:{actionMethod}", action.DeviceKey, action.MethodName);
+                    await DeviceJsonApi.DoDeviceActionAsync(action);
                }
            }

--- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs
+++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs
@@ -24,6 +24,7 @@ namespace PepperDash.Essentials.Room.Config
                //switch on emergency type here.  Right now only contact and shutdown
                var e = new EssentialsRoomEmergencyContactClosure(room.Key + "-emergency", props.Emergency, room);
                DeviceManager.AddDevice(e);
+                return e;
            }
            return null;
        }
--- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomEmergencyConfig.cs
+++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomEmergencyConfig.cs
@@ -16,7 +16,7 @@
    public class EssentialsRoomEmergencyTriggerConfig
    {
        /// <summary>
-        /// contact,
+        /// contact,versiport
        /// </summary>
        public string Type { get; set; }
        /// <summary>
--- a/src/PepperDash.Essentials.Core/Room/EsentialsRoomEmergencyContactClosure.cs
+++ b/src/PepperDash.Essentials.Core/Room/EsentialsRoomEmergencyContactClosure.cs
@@ -4,12 +4,16 @@ using PepperDash.Essentials.Room.Config;

 namespace PepperDash.Essentials.Core
 {
-    public class EssentialsRoomEmergencyContactClosure : EssentialsRoomEmergencyBase
+    public class EssentialsRoomEmergencyContactClosure : EssentialsRoomEmergencyBase, IEssentialsRoomEmergency
    {
+        public event EventHandler<EventArgs> EmergencyStateChange;
+
        IEssentialsRoom Room;
        string Behavior;
        bool TriggerOnClose;

+        public bool InEmergency { get; private set; }
+
        public EssentialsRoomEmergencyContactClosure(string key, EssentialsRoomEmergencyConfig config, IEssentialsRoom room) :
            base(key)
        {
@@ -25,14 +29,49 @@ namespace PepperDash.Essentials.Core
                    cs.DigitalInputPorts[portNum].StateChange += EsentialsRoomEmergencyContactClosure_StateChange;
                }
            }
+            else if (config.Trigger.Type.Equals("versiport", StringComparison.OrdinalIgnoreCase))
+            {
+                var portNum = (uint)config.Trigger.Number;
+                if (portNum <= cs.NumberOfVersiPorts)
+                {
+                    cs.VersiPorts[portNum].Register();
+                    cs.VersiPorts[portNum].SetVersiportConfiguration(eVersiportConfiguration.DigitalInput);
+                    cs.VersiPorts[portNum].DisablePullUpResistor = true;
+                    cs.VersiPorts[portNum].VersiportChange += EssentialsRoomEmergencyContactClosure_VersiportChange;
+                }
+            }
            Behavior = config.Behavior;
            TriggerOnClose = config.Trigger.TriggerOnClose;
        }

+        private void EssentialsRoomEmergencyContactClosure_VersiportChange(Versiport port, VersiportEventArgs args)
+        {
+            if (args.Event == eVersiportEvent.DigitalInChange)
+            {
+                ContactClosure_StateChange(port.DigitalIn);
+            }
+        }
+
        void EsentialsRoomEmergencyContactClosure_StateChange(DigitalInput digitalInput, DigitalInputEventArgs args)
        {
-            if (args.State && TriggerOnClose || !args.State && !TriggerOnClose)
+            ContactClosure_StateChange(args.State);
+        }
+
+        void ContactClosure_StateChange(bool portState)
+        {
+            if (portState && TriggerOnClose || !portState && !TriggerOnClose)
+            {
+                InEmergency = true;
+                if (EmergencyStateChange != null)
+                    EmergencyStateChange(this, new EventArgs());
                RunEmergencyBehavior();
+            }
+            else
+            {
+                InEmergency = false;
+                if (EmergencyStateChange != null)
+                    EmergencyStateChange(this, new EventArgs());
+            }
        }

        /// <summary>
@@ -44,4 +83,14 @@ namespace PepperDash.Essentials.Core
                Room.Shutdown();
        }
    }
+
+    /// <summary>
+    /// Describes the functionality of a room emergency contact closure
+    /// </summary>
+    public interface IEssentialsRoomEmergency
+    {
+        event EventHandler<EventArgs> EmergencyStateChange;
+
+        bool InEmergency { get; }
+    }
 }
--- a/src/PepperDash.Essentials.Core/Routing/Extensions.cs
+++ b/src/PepperDash.Essentials.Core/Routing/Extensions.cs
@@ -1,9 +1,10 @@
-using Serilog.Events;
+using PepperDash.Essentials.Core.Queues;
+using PepperDash.Essentials.Core.Routing;
+using Serilog.Events;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using Debug = PepperDash.Core.Debug;


@@ -18,12 +19,13 @@ namespace PepperDash.Essentials.Core
    {
        private static readonly Dictionary<string, RouteRequest> RouteRequests = new Dictionary<string, RouteRequest>();

+        private static readonly GenericQueue routeRequestQueue = new GenericQueue("routingQueue");
+
        /// <summary>
        /// Gets any existing RouteDescriptor for a destination, clears it using ReleaseRoute
        /// and then attempts a new Route and if sucessful, stores that RouteDescriptor
        /// in RouteDescriptorCollection.DefaultCollection
-        /// </summary>
-        [MethodImpl(MethodImplOptions.NoInlining)] // REMOVE ME
+        /// </summary>        
        public static void ReleaseAndMakeRoute(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType, string destinationPortKey = "", string sourcePortKey = "")
        {
            // Remove this line before committing!!!!!
@@ -35,110 +37,25 @@ namespace PepperDash.Essentials.Core

            ReleaseAndMakeRoute(destination, source, signalType, inputPort, outputPort);
        }
-
-        private static void ReleaseAndMakeRoute(IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType, RoutingInputPort destinationPort = null, RoutingOutputPort sourcePort = null)
-        {
-            if (destination == null) throw new ArgumentNullException(nameof(destination));
-            if (source == null) throw new ArgumentNullException(nameof(source));
-            if (destinationPort == null) Debug.LogMessage(LogEventLevel.Information, "Destination port is null");
-            if (sourcePort == null) Debug.LogMessage(LogEventLevel.Information, "Source port is null");
-
-            var routeRequest = new RouteRequest
-            {
-                Destination = destination,
-                DestinationPort = destinationPort,
-                Source = source,
-                SourcePort = sourcePort,
-                SignalType = signalType
-            };
-
-            var coolingDevice = destination as IWarmingCooling;
-
-
-            //We already have a route request for this device, and it's a cooling device and is cooling
-            if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRouteRequest) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
-
-                RouteRequests[destination.Key] = routeRequest;
-
-                Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is cooling down and already has a routing request stored.  Storing new route request to route to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
-
-                return;
-            }
-
-            //New Request
-            if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= routeRequest.HandleCooldown;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
-
-                RouteRequests.Add(destination.Key, routeRequest);
-
-                Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is cooling down.  Storing route request to route to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
-                return;
-            }
-
-            if (RouteRequests.ContainsKey(destination.Key) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == false)
-            {
-                RouteRequests.Remove(destination.Key);
-                Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is NOT cooling down.  Removing stored route request and routing to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
-            }
-
-            destination.ReleaseRoute();
-
-            RunRouteRequest(routeRequest);
-        }
-
-        private static void RunRouteRequest(RouteRequest request)
-        {
-            if (request.Source == null)
-                return;
-
-            var (audioOrSingleRoute, videoRoute) = request.Destination.GetRouteToSource(request.Source, request.SignalType, request.DestinationPort, request.SourcePort);
-
-            if (audioOrSingleRoute == null && videoRoute == null)
-                return;
-
-            RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(audioOrSingleRoute);
-
-            if (videoRoute != null)
-            {
-                RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(videoRoute);
-            }
-
-            Debug.LogMessage(LogEventLevel.Verbose, "Executing full route", request.Destination);
-
-            audioOrSingleRoute.ExecuteRoutes();
-            videoRoute?.ExecuteRoutes();
-        }
-
-        /// <summary>
-        /// Will release the existing route on the destination, if it is found in 
-        /// RouteDescriptorCollection.DefaultCollection
-        /// </summary>
-        /// <param name="destination"></param>
        public static void ReleaseRoute(this IRoutingInputs destination)
        {
+            routeRequestQueue.Enqueue(new ReleaseRouteQueueItem(ReleaseRouteInternal, destination, string.Empty));
+        }

-            if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRequest) && destination is IWarmingCooling)
-            {
-                var coolingDevice = destination as IWarmingCooling;
+        public static void ReleaseRoute(this IRoutingInputs destination, string inputPortKey)
+        {
+            routeRequestQueue.Enqueue(new ReleaseRouteQueueItem(ReleaseRouteInternal, destination, inputPortKey));
+        }

-                coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRequest.HandleCooldown;
-            }
+        public static void RemoveRouteRequestForDestination(string destinationKey)
+        {
+            Debug.LogMessage(LogEventLevel.Information, "Removing route request for {destination}", null, destinationKey);

-            RouteRequests.Remove(destination.Key);
+            var result = RouteRequests.Remove(destinationKey);

-            var current = RouteDescriptorCollection.DefaultCollection.RemoveRouteDescriptor(destination);
-            if (current != null)
-            {
-                Debug.LogMessage(LogEventLevel.Debug, "Releasing current route: {0}", destination, current.Source.Key);
-                current.ReleaseRoutes();
-            }
+            var messageTemplate = result ? "Route Request for {destination} removed" : "Route Request for {destination} not found";
+
+            Debug.LogMessage(LogEventLevel.Information, messageTemplate, null, destinationKey);
        }

        /// <summary>
@@ -153,13 +70,14 @@ namespace PepperDash.Essentials.Core
            // if it's a single signal type, find the route
            if (!signalType.HasFlag(eRoutingSignalType.AudioVideo))
            {
-                var singleTypeRouteDescriptor = new RouteDescriptor(source, destination, signalType);
+                var singleTypeRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, signalType);
                Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {sourceKey} of type {type}", destination, source.Key, signalType);

                if (!destination.GetRouteToSource(source, null, null, signalType, 0, singleTypeRouteDescriptor, destinationPort, sourcePort))
                    singleTypeRouteDescriptor = null;

-                foreach (var route in singleTypeRouteDescriptor.Routes)
+                var routes = singleTypeRouteDescriptor?.Routes ?? new List<RouteSwitchDescriptor>();
+                foreach (var route in routes)
                {
                    Debug.LogMessage(LogEventLevel.Verbose, "Route for device: {route}", destination, route.ToString());
                }
@@ -170,14 +88,14 @@ namespace PepperDash.Essentials.Core

            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {sourceKey} of type {type}", destination, source.Key);

-            var audioRouteDescriptor = new RouteDescriptor(source, destination, eRoutingSignalType.Audio);
+            var audioRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, eRoutingSignalType.Audio);

            var audioSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Audio, 0, audioRouteDescriptor, destinationPort, sourcePort);

            if (!audioSuccess)
                Debug.LogMessage(LogEventLevel.Debug, "Cannot find audio route to {0}", destination, source.Key);

-            var videoRouteDescriptor = new RouteDescriptor(source, destination, eRoutingSignalType.Video);
+            var videoRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, eRoutingSignalType.Video);

            var videoSuccess = destination.GetRouteToSource(source, null, null, eRoutingSignalType.Video, 0, videoRouteDescriptor, destinationPort, sourcePort);

@@ -202,6 +120,126 @@ namespace PepperDash.Essentials.Core
            return (audioRouteDescriptor, videoRouteDescriptor);
        }

+        private static void ReleaseAndMakeRoute(IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType, RoutingInputPort destinationPort = null, RoutingOutputPort sourcePort = null)
+        {
+            if (destination == null) throw new ArgumentNullException(nameof(destination));
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (destinationPort == null) Debug.LogMessage(LogEventLevel.Information, "Destination port is null");
+            if (sourcePort == null) Debug.LogMessage(LogEventLevel.Information, "Source port is null");
+
+            var routeRequest = new RouteRequest
+            {
+                Destination = destination,
+                DestinationPort = destinationPort,
+                Source = source,
+                SourcePort = sourcePort,
+                SignalType = signalType
+            };            
+
+            var coolingDevice = destination as IWarmingCooling;
+
+            //We already have a route request for this device, and it's a cooling device and is cooling
+            if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRouteRequest) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
+            {                
+                coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
+
+                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
+
+                RouteRequests[destination.Key] = routeRequest;
+
+                Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is cooling down and already has a routing request stored.  Storing new route request to route to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
+
+                return;
+            }
+
+            //New Request
+            if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
+            {               
+                coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
+
+                RouteRequests.Add(destination.Key, routeRequest);
+
+                Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is cooling down. Storing route request to route to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
+                return;
+            }
+
+            if (RouteRequests.ContainsKey(destination.Key) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == false)
+            {
+                var handledRequest = RouteRequests[destination.Key];
+
+                coolingDevice.IsCoolingDownFeedback.OutputChange -= handledRequest.HandleCooldown;
+
+                RouteRequests.Remove(destination.Key);
+
+                Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is NOT cooling down.  Removing stored route request and routing to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
+            }
+
+            routeRequestQueue.Enqueue(new ReleaseRouteQueueItem(ReleaseRouteInternal, destination,destinationPort?.Key ?? string.Empty));
+
+            routeRequestQueue.Enqueue(new RouteRequestQueueItem(RunRouteRequest, routeRequest));            
+        }
+
+        private static void RunRouteRequest(RouteRequest request)
+        {
+            try
+            {
+                if (request.Source == null)
+                    return;
+
+                var (audioOrSingleRoute, videoRoute) = request.Destination.GetRouteToSource(request.Source, request.SignalType, request.DestinationPort, request.SourcePort);
+
+                if (audioOrSingleRoute == null && videoRoute == null)
+                    return;
+
+                RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(audioOrSingleRoute);
+
+                if (videoRoute != null)
+                {
+                    RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(videoRoute);
+                }
+
+                Debug.LogMessage(LogEventLevel.Verbose, "Executing full route", request.Destination);
+
+                audioOrSingleRoute.ExecuteRoutes();
+                videoRoute?.ExecuteRoutes();
+            } catch(Exception ex)
+            {
+                Debug.LogMessage(ex, "Exception Running Route Request {request}", null, request);
+            }
+        }        
+
+        /// <summary>
+        /// Will release the existing route on the destination, if it is found in 
+        /// RouteDescriptorCollection.DefaultCollection
+        /// </summary>
+        /// <param name="destination"></param>       
+        private static void ReleaseRouteInternal(IRoutingInputs destination, string inputPortKey)
+        {
+            try
+            {
+                Debug.LogMessage(LogEventLevel.Information, "Release route for '{destination}':'{inputPortKey}'", destination?.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
+
+                if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRequest) && destination is IWarmingCooling)
+                {
+                    var coolingDevice = destination as IWarmingCooling;
+
+                    coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRequest.HandleCooldown;
+                }
+
+                RouteRequests.Remove(destination.Key);
+
+                var current = RouteDescriptorCollection.DefaultCollection.RemoveRouteDescriptor(destination, inputPortKey);
+                if (current != null)
+                {
+                    Debug.LogMessage(LogEventLevel.Information, "Releasing current route: {0}", destination, current.Source.Key);
+                    current.ReleaseRoutes();
+                }
+            } catch (Exception ex)
+            {
+                Debug.LogMessage(ex, "Exception releasing route for '{destination}':'{inputPortKey}'",null, destination?.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
+            }
+        }
+
        /// <summary>
        /// The recursive part of this.  Will stop on each device, search its inputs for the 
        /// desired source and if not found, invoke this function for the each input port
--- a/src/PepperDash.Essentials.Core/Routing/RouteDescriptor.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RouteDescriptor.cs
@@ -12,35 +12,43 @@ namespace PepperDash.Essentials.Core
    /// Represents an collection of individual route steps between Source and Destination
    /// </summary>
    public class RouteDescriptor
-	{
-		public IRoutingInputs Destination { get; private set; }
-		public IRoutingOutputs Source { get; private set; }
-		public eRoutingSignalType SignalType { get; private set; }
-		public List<RouteSwitchDescriptor> Routes { get; private set; }
+    {
+        public IRoutingInputs Destination { get; private set; }
+
+        public RoutingInputPort InputPort { get; private set; }
+
+        public IRoutingOutputs Source { get; private set; }
+        public eRoutingSignalType SignalType { get; private set; }
+        public List<RouteSwitchDescriptor> Routes { get; private set; }


-		public RouteDescriptor(IRoutingOutputs source, IRoutingInputs destination, eRoutingSignalType signalType)
-		{
-			Destination = destination;
-			Source = source;
-			SignalType = signalType;
-			Routes = new List<RouteSwitchDescriptor>();
-		}
+        public RouteDescriptor(IRoutingOutputs source, IRoutingInputs destination, eRoutingSignalType signalType) : this(source, destination, null, signalType)
+        {
+        }

-		/// <summary>
-		/// Executes all routes described in this collection.  Typically called via
-		/// extension method IRoutingInputs.ReleaseAndMakeRoute()
-		/// </summary>
-		public void ExecuteRoutes()
-		{
-			foreach (var route in Routes)
-			{
-				Debug.LogMessage(LogEventLevel.Verbose, "ExecuteRoutes: {0}",null, route.ToString());
+        public RouteDescriptor(IRoutingOutputs source, IRoutingInputs destination, RoutingInputPort inputPort, eRoutingSignalType signalType)
+        {
+            Destination = destination;
+            Source = source;
+            SignalType = signalType;
+            InputPort = inputPort;
+            Routes = new List<RouteSwitchDescriptor>();
+        }
+
+        /// <summary>
+        /// Executes all routes described in this collection.  Typically called via
+        /// extension method IRoutingInputs.ReleaseAndMakeRoute()
+        /// </summary>
+        public void ExecuteRoutes()
+        {
+            foreach (var route in Routes)
+            {
+                Debug.LogMessage(LogEventLevel.Verbose, "ExecuteRoutes: {0}", null, route.ToString());

                if (route.SwitchingDevice is IRoutingSinkWithSwitching sink)
-                {                   
+                {
                    sink.ExecuteSwitch(route.InputPort.Selector);
-                    continue; 
+                    continue;
                }

                if (route.SwitchingDevice is IRouting switchingDevice)
@@ -51,33 +59,43 @@ namespace PepperDash.Essentials.Core

                    Debug.LogMessage(LogEventLevel.Verbose, "Output port {0} routing. Count={1}", null, route.OutputPort.Key, route.OutputPort.InUseTracker.InUseCountFeedback.UShortValue);
                }
-			}
-		}
+            }
+        }

-		/// <summary>
-		/// Releases all routes in this collection. Typically called via
-		/// extension method IRoutingInputs.ReleaseAndMakeRoute()
-		/// </summary>
-		public void ReleaseRoutes()
-		{
-			foreach (var route in Routes)
-			{
-				if (route.SwitchingDevice is IRouting)
-				{
-					// Pull the route from the port.  Whatever is watching the output's in use tracker is
-					// responsible for responding appropriately.
-					route.OutputPort.InUseTracker.RemoveUser(Destination, "destination-" + SignalType);
-					Debug.LogMessage(LogEventLevel.Verbose, "Port {0} releasing. Count={1}",null, route.OutputPort.Key, route.OutputPort.InUseTracker.InUseCountFeedback.UShortValue);
-				}
-			}
-		}
+        /// <summary>
+        /// Releases all routes in this collection. Typically called via
+        /// extension method IRoutingInputs.ReleaseAndMakeRoute()
+        /// </summary>
+        public void ReleaseRoutes()
+        {
+            foreach (var route in Routes.Where(r => r.SwitchingDevice is IRouting))
+            {
+                if (route.SwitchingDevice is IRouting switchingDevice)
+                {
+                    if (route.OutputPort == null)
+                    {
+                        continue;
+                    }

-		public override string ToString()
-		{
-			var routesText = Routes.Select(r => r.ToString()).ToArray();
-			return string.Format("Route table from {0} to {1}:\r{2}", Source.Key, Destination.Key, string.Join("\r", routesText));
-		}
-	}
+                    if (route.OutputPort.InUseTracker != null)
+                    {
+                        route.OutputPort.InUseTracker.RemoveUser(Destination, "destination-" + SignalType);
+                        Debug.LogMessage(LogEventLevel.Verbose, "Port {0} releasing. Count={1}", null, route.OutputPort.Key, route.OutputPort.InUseTracker.InUseCountFeedback.UShortValue);
+                    }
+                    else
+                    {
+                        Debug.LogMessage(LogEventLevel.Error, "InUseTracker is null for OutputPort {0}", null, route.OutputPort.Key);
+                    }
+                }
+            }
+        }
+
+        public override string ToString()
+        {
+            var routesText = Routes.Select(r => r.ToString()).ToArray();
+            return string.Format("Route table from {0} to {1}:\r{2}", Source.Key, Destination.Key, string.Join("\r", routesText));
+        }
+    }

    /*/// <summary>
    /// Represents an collection of individual route steps between Source and Destination
--- a/src/PepperDash.Essentials.Core/Routing/RouteDescriptorCollection.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RouteDescriptorCollection.cs
@@ -1,8 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-
-using PepperDash.Core;
+using PepperDash.Core;
 using Serilog.Events;
+using System.Collections.Generic;
+using System.Linq;


 namespace PepperDash.Essentials.Core
@@ -33,10 +32,16 @@ namespace PepperDash.Essentials.Core
        /// <param name="descriptor"></param>
        public void AddRouteDescriptor(RouteDescriptor descriptor)
        {
-            if (RouteDescriptors.Any(t => t.Destination == descriptor.Destination))
+            if (descriptor == null)
+            {
+                return;
+            }
+
+            if (RouteDescriptors.Any(t => t.Destination == descriptor.Destination)
+                && RouteDescriptors.Any(t => t.Destination == descriptor.Destination && t.InputPort != null && descriptor.InputPort != null && t.InputPort.Key == descriptor.InputPort.Key))
            {
                Debug.LogMessage(LogEventLevel.Debug, descriptor.Destination,
-                    "Route to [{0}] already exists in global routes table", descriptor.Source.Key);
+                    "Route to [{0}] already exists in global routes table", descriptor?.Source?.Key);
                return;
            }
            RouteDescriptors.Add(descriptor);
@@ -48,18 +53,33 @@ namespace PepperDash.Essentials.Core
        /// <returns>null if no RouteDescriptor for a destination exists</returns>
        public RouteDescriptor GetRouteDescriptorForDestination(IRoutingInputs destination)
        {
+            Debug.LogMessage(LogEventLevel.Information, "Getting route descriptor for '{destination}'", destination?.Key ?? null);
+
            return RouteDescriptors.FirstOrDefault(rd => rd.Destination == destination);
        }

+        public RouteDescriptor GetRouteDescriptorForDestinationAndInputPort(IRoutingInputs destination, string inputPortKey)
+        {
+            Debug.LogMessage(LogEventLevel.Information, "Getting route descriptor for '{destination}':'{inputPortKey}'", destination?.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
+            return RouteDescriptors.FirstOrDefault(rd => rd.Destination == destination && rd.InputPort != null && rd.InputPort.Key == inputPortKey);
+        }
+
        /// <summary>
        /// Returns the RouteDescriptor for a given destination AND removes it from collection.
        /// Returns null if no route with the provided destination exists.
        /// </summary>
-        public RouteDescriptor RemoveRouteDescriptor(IRoutingInputs destination)
+        public RouteDescriptor RemoveRouteDescriptor(IRoutingInputs destination, string inputPortKey = "")
        {
-            var descr = GetRouteDescriptorForDestination(destination);
+            Debug.LogMessage(LogEventLevel.Information, "Removing route descriptor for '{destination}':'{inputPortKey}'", destination.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
+
+            var descr = string.IsNullOrEmpty(inputPortKey) 
+                ? GetRouteDescriptorForDestination(destination)
+                : GetRouteDescriptorForDestinationAndInputPort(destination, inputPortKey);
            if (descr != null)
                RouteDescriptors.Remove(descr);
+
+            Debug.LogMessage(LogEventLevel.Information, "Found route descriptor {routeDescriptor}", destination, descr);
+
            return descr;
        }
    }
--- a/src/PepperDash.Essentials.Core/Routing/RouteRequest.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RouteRequest.cs
@@ -1,5 +1,6 @@
 using PepperDash.Core;
 using Serilog.Events;
+using System;

 namespace PepperDash.Essentials.Core
 {
@@ -14,40 +15,33 @@ namespace PepperDash.Essentials.Core

        public void HandleCooldown(object sender, FeedbackEventArgs args)
        {
-            Debug.LogMessage(LogEventLevel.Information, "Handling cooldown route request: {destination}:{destinationPort} -> {source}:{sourcePort} {type}", null, Destination.Key, DestinationPort.Key, Source.Key, SourcePort.Key, SignalType.ToString());
-
-            var coolingDevice = sender as IWarmingCooling;
-
-            if (args.BoolValue == false)
+            try
            {
-                Debug.LogMessage(LogEventLevel.Information, "Cooldown complete. Making route from {destination} to {source}", Destination.Key, Source.Key);
-                Destination.ReleaseAndMakeRoute(Source, SignalType);
+                Debug.LogMessage(LogEventLevel.Information, "Handling cooldown route request: {destination}:{destinationPort} -> {source}:{sourcePort} {type}", null, Destination?.Key ?? "empty destination", DestinationPort?.Key ?? "no destination port", Source?.Key ?? "empty source", SourcePort?.Key ?? "empty source port", SignalType.ToString());

-                if (sender == null) return;
+                if (args.BoolValue == true)
+                {
+                    return;
+                }

-                coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
+                Debug.LogMessage(LogEventLevel.Information, "Cooldown complete. Making route from {destination} to {source}", Destination?.Key, Source?.Key);
+
+                Destination.ReleaseAndMakeRoute(Source, SignalType, DestinationPort?.Key ?? string.Empty, SourcePort?.Key ?? string.Empty);
+
+                if (sender is IWarmingCooling coolingDevice)
+                {
+                    Debug.LogMessage(LogEventLevel.Debug, "Unsubscribing from cooling feedback for {destination}", null, Destination.Key);
+                    coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
+                }
+            } catch(Exception ex)
+            {
+                Debug.LogMessage(ex, "Exception handling cooldown", Destination);
            }
        }
+
+        public override string ToString()
+        {
+            return $"Route {Source?.Key ?? "No Source Device"}:{SourcePort?.Key ?? "auto"} to {Destination?.Key ?? "No Destination Device"}:{DestinationPort?.Key ?? "auto"}";
+        }
    }
-
-    /*public class RouteRequest<TInputSelector, TOutputSelector>
-    {
-        public IRoutingSink<TInputSelector> Destination { get; set; }
-        public IRoutingOutputs<TOutputSelector> Source { get; set; }
-        public eRoutingSignalType SignalType { get; set; }
-
-        public void HandleCooldown(object sender, FeedbackEventArgs args)
-        {
-            var coolingDevice = sender as IWarmingCooling;
-
-            if (args.BoolValue == false)
-            {
-                Destination.ReleaseAndMakeRoute(Source, SignalType);
-
-                if (sender == null) return;
-
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
-            }
-        }
-    }*/
 }
--- a/src/PepperDash.Essentials.Core/Routing/RouteRequestQueueItem.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RouteRequestQueueItem.cs
@@ -0,0 +1,45 @@
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Queues;
+using System;
+using Serilog.Events;
+
+namespace PepperDash.Essentials.Core.Routing
+{
+    public class RouteRequestQueueItem : IQueueMessage
+    {
+        private readonly Action<RouteRequest> action;
+        private readonly RouteRequest routeRequest;
+
+        public RouteRequestQueueItem(Action<RouteRequest> routeAction, RouteRequest request)
+        {
+            action = routeAction;
+            routeRequest = request;
+        }
+
+        public void Dispatch()
+        {
+            Debug.LogMessage(LogEventLevel.Information, "Dispatching route request {routeRequest}", null, routeRequest);
+            action(routeRequest);
+        }
+    }
+
+    public class ReleaseRouteQueueItem : IQueueMessage
+    {
+        private readonly Action<IRoutingInputs, string> action;
+        private readonly IRoutingInputs destination;
+        private readonly string inputPortKey;
+
+        public ReleaseRouteQueueItem(Action<IRoutingInputs, string> action, IRoutingInputs destination, string inputPortKey)
+        {
+            this.action = action;
+            this.destination = destination;
+            this.inputPortKey = inputPortKey;
+        }
+
+        public void Dispatch()
+        {
+            Debug.LogMessage(LogEventLevel.Information, "Dispatching release route request for {destination}:{inputPortKey}", null, destination?.Key ?? "no destination", string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
+            action(destination, inputPortKey);
+        }
+    }
+}
--- a/src/PepperDash.Essentials.Core/Routing/RouteSwitchDescriptor.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RouteSwitchDescriptor.cs
@@ -5,7 +5,7 @@
    /// </summary>
    public class RouteSwitchDescriptor
 	{
-		public IRoutingInputs SwitchingDevice { get { return InputPort.ParentDevice; } }
+		public IRoutingInputs SwitchingDevice { get { return InputPort?.ParentDevice; } }
 		public RoutingOutputPort OutputPort { get; set; }
 		public RoutingInputPort InputPort { get; set; }

@@ -23,9 +23,9 @@
 		public override string ToString()
 		{
            if (SwitchingDevice is IRouting)
-                return $"{SwitchingDevice?.Key} switches output {OutputPort.Key} to input {InputPort.Key}";
+                return $"{(SwitchingDevice != null ? SwitchingDevice.Key : "No Device")} switches output {(OutputPort != null ? OutputPort.Key : "No output port")} to input {(InputPort != null ? InputPort.Key : "No input port")}";
            else
-                return $"{SwitchingDevice.Key} switches to input {InputPort.Key}";
+                return $"{(SwitchingDevice != null ? SwitchingDevice.Key : "No Device")} switches to input {(InputPort != null ? InputPort.Key : "No input port")}";
 		}
 	}

--- a/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs
@@ -65,7 +65,7 @@ namespace PepperDash.Essentials.Core.Routing

        private void UpdateDestination(IRoutingSinkWithSwitching destination, RoutingInputPort inputPort)
        {            
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Updating destination {destination} with inputPort {inputPort}", this,destination?.Key, inputPort?.Key);
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Updating destination {destination} with inputPort {inputPort}", this,destination?.Key, inputPort?.Key);

            if(inputPort == null)
            {
@@ -101,7 +101,7 @@ namespace PepperDash.Essentials.Core.Routing
                return;
            }

-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Getting source for first TieLine {tieLine}", this, firstTieLine);
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Getting source for first TieLine {tieLine}", this, firstTieLine);

            TieLine sourceTieLine;
            try
@@ -128,7 +128,7 @@ namespace PepperDash.Essentials.Core.Routing
                return;
            }

-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root TieLine {tieLine}", this, sourceTieLine);           
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root TieLine {tieLine}", this, sourceTieLine);           

            // Does not handle combinable scenarios or other scenarios where a display might be part of multiple rooms yet.
            var room = DeviceManager.AllDevices.OfType<IEssentialsRoom>().FirstOrDefault((r) => {
@@ -151,7 +151,7 @@ namespace PepperDash.Essentials.Core.Routing
                return;
            }

-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found room {room} for destination {destination}", this, room.Key, destination.Key);
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found room {room} for destination {destination}", this, room.Key, destination.Key);

            var sourceList = ConfigReader.ConfigObject.GetSourceListForKey(room.SourceListKey);

@@ -161,20 +161,21 @@ namespace PepperDash.Essentials.Core.Routing
                return;
            }

-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found sourceList for room {room}", this, room.Key);
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found sourceList for room {room}", this, room.Key);

            var sourceListItem = sourceList.FirstOrDefault(sli => {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose,
-                    "SourceListItem {sourceListItem}:{sourceKey} tieLine sourceport device key {sourcePortDeviceKey}",
-                    this,
-                    sli.Key,
-                    sli.Value.SourceKey,
-                    sourceTieLine.SourcePort.ParentDevice.Key);
+                 //// Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose,
+                 //   "SourceListItem {sourceListItem}:{sourceKey} tieLine sourceport device key {sourcePortDeviceKey}",
+                 //   this,
+                 //   sli.Key,
+                 //   sli.Value.SourceKey,
+                 //   sourceTieLine.SourcePort.ParentDevice.Key);

                return sli.Value.SourceKey.Equals(sourceTieLine.SourcePort.ParentDevice.Key,StringComparison.InvariantCultureIgnoreCase);
            });            

            var source = sourceListItem.Value;
+            var sourceKey = sourceListItem.Key;

            if (source == null)
            {
@@ -186,15 +187,16 @@ namespace PepperDash.Essentials.Core.Routing
                    Name = sourceTieLine.SourcePort.Key,
                };

-                destination.CurrentSourceInfo = tempSourceListItem; ;
                destination.CurrentSourceInfoKey = "$transient";
+                destination.CurrentSourceInfo = tempSourceListItem;                
                return;
            }

-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Got Source {source}", this, source);
+            //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Got Source {@source} with key {sourceKey}", this, source, sourceKey);

+            destination.CurrentSourceInfoKey = sourceKey;
            destination.CurrentSourceInfo = source;
-            destination.CurrentSourceInfoKey = source.SourceKey;
+            
        }

        private TieLine GetRootTieLine(TieLine tieLine)
@@ -202,11 +204,11 @@ namespace PepperDash.Essentials.Core.Routing
            TieLine nextTieLine = null;
            try
            {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "**Following tieLine {tieLine}**", this, tieLine);
+                //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "**Following tieLine {tieLine}**", this, tieLine);

                if (tieLine.SourcePort.ParentDevice is IRoutingWithFeedback midpoint)
                {
-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source device {sourceDevice} is midpoint", this, midpoint);
+                    // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source device {sourceDevice} is midpoint", this, midpoint);

                    if(midpoint.CurrentRoutes == null || midpoint.CurrentRoutes.Count == 0)
                    {
@@ -215,9 +217,9 @@ namespace PepperDash.Essentials.Core.Routing
                    }

                    var currentRoute = midpoint.CurrentRoutes.FirstOrDefault(route => {
-                        Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", this, route, tieLine);
+                        //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", this, route, tieLine);

-                        return route.OutputPort.Key == tieLine.SourcePort.Key && route.OutputPort.ParentDevice.Key == tieLine.SourcePort.ParentDevice.Key;
+                        return route.OutputPort != null && route.InputPort != null && route.OutputPort?.Key == tieLine.SourcePort.Key && route.OutputPort?.ParentDevice.Key == tieLine.SourcePort.ParentDevice.Key;
                    });

                    if (currentRoute == null)
@@ -226,28 +228,28 @@ namespace PepperDash.Essentials.Core.Routing
                        return null;
                    }

-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found currentRoute {currentRoute} through {midpoint}", this, currentRoute, midpoint);
+                    //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found currentRoute {currentRoute} through {midpoint}", this, currentRoute, midpoint);

                    nextTieLine = TieLineCollection.Default.FirstOrDefault(tl => { 
-                        Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", tl.DestinationPort.Key, currentRoute.InputPort.Key);
+                        //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", tl.DestinationPort.Key, currentRoute.InputPort.Key);
                        return tl.DestinationPort.Key == currentRoute.InputPort.Key && tl.DestinationPort.ParentDevice.Key == currentRoute.InputPort.ParentDevice.Key; });

                    if (nextTieLine != null)
                    {
-                        Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found next tieLine {tieLine}. Walking the chain", this, nextTieLine);
+                        //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found next tieLine {tieLine}. Walking the chain", this, nextTieLine);
                        return GetRootTieLine(nextTieLine);
                    }

-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root tieLine {tieLine}", this,nextTieLine);
+                    //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root tieLine {tieLine}", this,nextTieLine);
                    return nextTieLine;
                }

-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLIne Source Device {sourceDeviceKey} is IRoutingSource: {isIRoutingSource}", this, tieLine.SourcePort.ParentDevice.Key, tieLine.SourcePort.ParentDevice is IRoutingSource);
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source Device interfaces: {typeFullName}:{interfaces}", this, tieLine.SourcePort.ParentDevice.GetType().FullName, tieLine.SourcePort.ParentDevice.GetType().GetInterfaces().Select(i => i.Name));
+                //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLIne Source Device {sourceDeviceKey} is IRoutingSource: {isIRoutingSource}", this, tieLine.SourcePort.ParentDevice.Key, tieLine.SourcePort.ParentDevice is IRoutingSource);
+                //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source Device interfaces: {typeFullName}:{interfaces}", this, tieLine.SourcePort.ParentDevice.GetType().FullName, tieLine.SourcePort.ParentDevice.GetType().GetInterfaces().Select(i => i.Name));

                if (tieLine.SourcePort.ParentDevice is IRoutingSource || tieLine.SourcePort.ParentDevice is IRoutingOutputs) //end of the chain
                {
-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root: {tieLine}", this, tieLine);
+                    // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root: {tieLine}", this, tieLine);
                    return tieLine;
                }

--- a/src/PepperDash.Essentials.Core/Touchpanels/Mpc3Touchpanel.cs
+++ b/src/PepperDash.Essentials.Core/Touchpanels/Mpc3Touchpanel.cs
@@ -56,6 +56,8 @@ namespace PepperDash.Essentials.Core.Touchpanels
 					InitializeButton(buttonKey, buttonConfig);
 					InitializeButtonFeedback(buttonKey, buttonConfig);
 				}
+
+				ListButtons();
 			});
 		}

@@ -319,6 +321,23 @@ namespace PepperDash.Essentials.Core.Touchpanels

 			foreach (var eventType in button.EventTypes[type]) DeviceJsonApi.DoDeviceAction(eventType);
 		}
+
+
+		public void ListButtons()
+		{
+			var line = new string('-', 35);
+
+			Debug.Console(0, this, line);
+
+			Debug.Console(0, this, "MPC3 Controller {0} - Available Butons", Key);
+
+			foreach (var button in _buttons)
+			{
+				Debug.Console(0, this, "Key: {0}", button.Key);
+			}
+
+			Debug.Console(0, this, line);
+		}
 	}

 	/// <summary>
--- a/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs
+++ b/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs
@@ -4,9 +4,6 @@ using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace PepperDash.Essentials.Devices.Common.Generic
 {
@@ -16,10 +13,9 @@ namespace PepperDash.Essentials.Devices.Common.Generic
        {
            InputPorts = new RoutingPortCollection<RoutingInputPort>();

-            var inputPort = new RoutingInputPort($"{Key}-{RoutingPortNames.AnyVideoIn}", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);
+            var inputPort = new RoutingInputPort(RoutingPortNames.AnyVideoIn, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);            

            InputPorts.Add(inputPort);
-
        }

        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
@@ -57,8 +53,8 @@ namespace PepperDash.Essentials.Devices.Common.Generic

        public override EssentialsDevice BuildDevice(DeviceConfig dc)
        {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Source Device");
-            return new GenericSource(dc.Key, dc.Name);
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Sink Device");
+            return new GenericSink(dc.Key, dc.Name);
        }
    }
 }
--- a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
+++ b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
@@ -4,7 +4,7 @@
    <Configurations>Debug;Release;Debug 4.7.2</Configurations>
  </PropertyGroup>
  <PropertyGroup>
-    <TargetFrameworks>net472;net6</TargetFrameworks>
+    <TargetFramework>net472</TargetFramework>
    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
    <OutputPath>bin\$(Configuration)\</OutputPath>
    <AssemblyName>Essentials Devices Common</AssemblyName>
@@ -29,7 +29,7 @@
    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.66" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-424" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="PepperDashCore" Version="2.0.1" />
  </ItemGroup>
 </Project>
--- a/src/PepperDash.Essentials.Devices.Common/SoftCodec/GenericSoftCodec.cs
+++ b/src/PepperDash.Essentials.Devices.Common/SoftCodec/GenericSoftCodec.cs
@@ -28,14 +28,14 @@ namespace PepperDash.Essentials.Devices.Common.SoftCodec

            for(var i = 1; i <= props.OutputCount; i++)
            {
-                var outputPort = new RoutingOutputPort($"{Key}-output{i}", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);
+                var outputPort = new RoutingOutputPort($"output{i}", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);

                OutputPorts.Add(outputPort);
            }

            for(var i = 1; i<= props.ContentInputCount; i++)
            {
-                var inputPort = new RoutingInputPort($"{Key}-contentInput{i}", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, $"contentInput{i}", this);
+                var inputPort = new RoutingInputPort($"contentInput{i}", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, $"contentInput{i}", this);

                InputPorts.Add(inputPort);
            }
@@ -47,7 +47,7 @@ namespace PepperDash.Essentials.Devices.Common.SoftCodec

            for(var i = 1; i <=props.CameraInputCount; i++)
            {
-                var cameraPort = new RoutingInputPort($"{Key}-cameraInput{i}", eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, $"cameraInput{i}", this);
+                var cameraPort = new RoutingInputPort($"cameraInput{i}", eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, $"cameraInput{i}", this);

                InputPorts.Add(cameraPort);
            }
--- a/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs
+++ b/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs
@@ -42,7 +42,7 @@ namespace PepperDash.Essentials.Devices.Common

        public void PrintExpectedIrCommands()
        {
-            var cmds = typeof (AppleTvIrCommands).GetType().GetFields(BindingFlags.Public | BindingFlags.Static);
+            var cmds = typeof (AppleTvIrCommands).GetFields(BindingFlags.Public | BindingFlags.Static);

            foreach (var value in cmds.Select(cmd => cmd.GetValue(null)).OfType<string>())
            {
--- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs
+++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs
@@ -1,7 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro.DeviceSupport;
@@ -21,6 +20,7 @@ using PepperDash.Essentials.Core.Bridges.JoinMaps;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 using Serilog.Events;
 using PepperDash.Essentials.Core.Routing;
+using System.Text;

 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {
@@ -1214,7 +1214,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				var entryIndex = counterIndex;

 				Debug.LogMessage(LogEventLevel.Verbose, this, "Entry{2:0000} Name: {0}, Folder ID: {1}, Type: {3}, ParentFolderId: {4}",
-					entry.Name, entry.FolderId, entryIndex, entry.GetType().GetType().FullName, entry.ParentFolderId);
+					entry.Name, entry.FolderId, entryIndex, entry.GetType().FullName, entry.ParentFolderId);

 				if (entry is DirectoryFolder)
 				{
--- a/src/PepperDash.Essentials.MobileControl.Messengers/ContentTypes.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/ContentTypes.cs
@@ -0,0 +1,31 @@
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.AppServer
+{
+    public class SourceSelectMessageContent
+    {
+        
+        [JsonProperty("sourceListItemKey")]
+        public string SourceListItemKey { get; set; }
+        [JsonProperty("sourceListKey")]
+        public string SourceListKey { get; set; }
+    }
+
+    public class DirectRoute
+    {
+
+        [JsonProperty("sourceKey")]
+        public string SourceKey { get; set; }
+        [JsonProperty("destinationKey")]
+        public string DestinationKey { get; set; }
+        [JsonProperty("signalType")]
+        public eRoutingSignalType SignalType { get; set; }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="b"></param>
+    public delegate void PressAndHoldAction(bool b);
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/CoreDisplayBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/CoreDisplayBaseMessenger.cs
@@ -0,0 +1,61 @@
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+using System.Linq;
+using DisplayBase = PepperDash.Essentials.Core.DisplayBase;
+
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class CoreDisplayBaseMessenger: MessengerBase
+    {
+        private readonly DisplayBase display;
+
+        public CoreDisplayBaseMessenger(string key, string messagePath, DisplayBase device) : base(key, messagePath, device)
+        {
+            display = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();            
+
+           /* AddAction("/powerOn", (id, content) => display.PowerOn());
+            AddAction("/powerOff", (id, content) => display.PowerOff());
+            AddAction("/powerToggle", (id, content) => display.PowerToggle());*/
+
+            AddAction("/inputSelect", (id, content) =>
+            {
+                var s = content.ToObject<MobileControlSimpleContent<string>>();
+
+                var inputPort = display.InputPorts.FirstOrDefault(i => i.Key == s.Value);
+
+                if (inputPort == null)
+                {
+                    Debug.Console(1, "No input named {0} found for device {1}", s, display.Key);
+                    return;
+                }
+
+                display.ExecuteSwitch(inputPort.Selector);
+            });
+
+            AddAction("/inputs", (id, content) =>
+            {
+                var inputsList = display.InputPorts.Select(p => p.Key).ToList();
+
+                var messageObject = new MobileControlMessage
+                {
+                    Type = MessagePath + "/inputs",
+                    Content = JToken.FromObject(new
+                    {
+                        inputKeys = inputsList,
+                    })
+                };
+
+                AppServerController.SendMessageObject(messageObject);
+            });
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/DisplayBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/DisplayBaseMessenger.cs
@@ -0,0 +1,61 @@
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+using System.Linq;
+using DisplayBase = PepperDash.Essentials.Devices.Common.Displays.DisplayBase;
+
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class DisplayBaseMessenger: MessengerBase
+    {
+        private readonly DisplayBase display;
+
+        public DisplayBaseMessenger(string key, string messagePath, DisplayBase device) : base(key, messagePath, device)
+        {
+            display = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();            
+
+            /*AddAction("/powerOn", (id, content) => display.PowerOn());
+            AddAction("/powerOff", (id, content) => display.PowerOff());
+            AddAction("/powerToggle", (id, content) => display.PowerToggle());*/
+
+            AddAction("/inputSelect", (id, content) =>
+            {
+                var s = content.ToObject<MobileControlSimpleContent<string>>();
+
+                var inputPort = display.InputPorts.FirstOrDefault(i => i.Key == s.Value);
+
+                if (inputPort == null)
+                {
+                    Debug.Console(1, "No input named {0} found for device {1}", s, display.Key);
+                    return;
+                }
+
+                display.ExecuteSwitch(inputPort.Selector);
+            });
+
+            AddAction("/inputs", (id, content) =>
+            {
+                var inputsList = display.InputPorts.Select(p => p.Key).ToList();
+
+                var messageObject = new MobileControlMessage
+                {
+                    Type = MessagePath + "/inputs",
+                    Content = JToken.FromObject(new
+                    {
+                        inputKeys = inputsList,
+                    })
+                };
+
+                AppServerController.SendMessageObject(messageObject);
+            });
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IChannelMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IChannelMessenger.cs
@@ -0,0 +1,31 @@
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+#if SERIES4
+#endif
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class IChannelMessenger:MessengerBase
+    {
+        private readonly IChannel channelDevice;
+
+        public IChannelMessenger(string key, string messagePath, Device device) : base(key, messagePath, device)
+        {
+            channelDevice = device as IChannel;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();      
+
+            AddAction("/chanUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.ChannelUp(b)));
+
+            AddAction("/chanDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.ChannelDown(b)));
+            AddAction("/lastChan", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.LastChannel(b)));
+            AddAction("/guide", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.Guide(b)));
+            AddAction("/info", (id, content) => PressAndHoldHandler.HandlePressAndHold  (DeviceKey, content, (b) => channelDevice?.Info(b)));
+            AddAction("/exit", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.Exit(b)));
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IColorMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IColorMessenger.cs
@@ -0,0 +1,26 @@
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class IColorMessenger:MessengerBase
+    {
+        private readonly IColor colorDevice;
+        public IColorMessenger(string key, string messagePath, Device device) : base(key, messagePath, device)
+        {
+            colorDevice = device as IColor;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();                    
+
+            AddAction("/red", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Red(b)));
+            AddAction("/green", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Green(b)));
+            AddAction("/yellow", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Yellow(b)));
+            AddAction("/blue", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Blue(b))); 
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IDPadMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IDPadMessenger.cs
@@ -0,0 +1,31 @@
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+#if SERIES4
+#endif
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class IDPadMessenger:MessengerBase
+    {
+        private readonly IDPad dpadDevice;
+        public IDPadMessenger(string key, string messagePath, Device device) : base(key, messagePath, device)
+        {
+            dpadDevice = device as IDPad;
+        }
+
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();               
+
+            AddAction("/up", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Up(b)));
+            AddAction("/down", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Down(b)));
+            AddAction("/left", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Left(b)));
+            AddAction("/right", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Right(b)));
+            AddAction("/select", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Select(b)));
+            AddAction("/menu", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Menu(b)));
+            AddAction("/exit", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Exit(b)));
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IDvrMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IDvrMessenger.cs
@@ -0,0 +1,26 @@
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+#if SERIES4
+#endif
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class IDvrMessenger: MessengerBase
+    {
+        private readonly IDvr dvrDevice;
+        public IDvrMessenger(string key, string messagePath, Device device) : base(key, messagePath, device)
+        {
+            dvrDevice = device as IDvr;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();       
+
+            AddAction("/dvrlist", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dvrDevice?.DvrList(b)));
+            AddAction("/record", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dvrDevice?.Record(b)));
+        }
+
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IHasPowerMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/IHasPowerMessenger.cs
@@ -0,0 +1,25 @@
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class IHasPowerMessenger:MessengerBase
+    {
+        private readonly IHasPowerControl powerDevice;
+        public IHasPowerMessenger(string key, string messagePath, Device device) : base(key, messagePath, device)
+        {
+            powerDevice = device as IHasPowerControl;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/powerOn", (id, content) => powerDevice?.PowerOn());
+            AddAction("/powerOff", (id, content) => powerDevice?.PowerOff());
+            AddAction("/powerToggle", (id, content) => powerDevice?.PowerToggle());
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/INumericMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/INumericMessenger.cs
@@ -0,0 +1,36 @@
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+#if SERIES4
+#endif
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class INumericKeypadMessenger:MessengerBase
+    {
+        private readonly INumericKeypad keypadDevice;
+        public INumericKeypadMessenger(string key, string messagePath, Device device) : base(key, messagePath, device)
+        {
+            keypadDevice = device as INumericKeypad;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();            
+
+            AddAction("/num0", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit0(b)));
+            AddAction("/num1", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit1(b)));
+            AddAction("/num2", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit2(b)));
+            AddAction("/num3", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit3(b)));
+            AddAction("/num4", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit4(b)));
+            AddAction("/num5", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit5(b)));
+            AddAction("/num6", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit6(b)));
+            AddAction("/num7", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit7(b)));
+            AddAction("/num8", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit8(b)));
+            AddAction("/num9", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit9(b)));
+            AddAction("/numDash", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.KeypadAccessoryButton1(b)));
+            AddAction("/numEnter", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.KeypadAccessoryButton2(b)));
+            // Deal with the Accessory functions on the numpad later
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/ISetTopBoxControlsMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/ISetTopBoxControlsMessenger.cs
@@ -0,0 +1,41 @@
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+#if SERIES4
+#endif
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class ISetTopBoxControlsMessenger:MessengerBase
+    {
+        private readonly ISetTopBoxControls stbDevice;
+        public ISetTopBoxControlsMessenger(string key, string messagePath, IKeyName device) : base(key, messagePath, device)
+        {
+            stbDevice = device as ISetTopBoxControls;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+            AddAction("/fullStatus", (id, content) => SendISetTopBoxControlsFullMessageObject());
+            AddAction("/dvrList", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => stbDevice?.DvrList(b)));
+            AddAction("/replay", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => stbDevice?.Replay(b)));
+        }        
+                /// <summary>
+        /// Helper method to build call status for vtc
+        /// </summary>
+        /// <returns></returns>
+        private void SendISetTopBoxControlsFullMessageObject()
+        {
+
+            PostStatusMessage( new SetTopBoxControlsState());
+
+
+        }
+    }
+
+    public class SetTopBoxControlsState : DeviceStateMessageBase
+    {
+
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/ITransportMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtenstions/ITransportMessenger.cs
@@ -0,0 +1,32 @@
+using PepperDash.Core;
+using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+#if SERIES4
+#endif
+namespace PepperDash.Essentials.Room.MobileControl
+{
+    public class ITransportMessenger:MessengerBase
+    {
+        private readonly ITransport transportDevice;
+        public ITransportMessenger(string key, string messagePath, Device device) : base(key, messagePath, device)
+        {
+            transportDevice = device as ITransport;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+           AddAction("/play", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Play(b)));
+           AddAction("/pause", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Pause(b)));
+           AddAction("/stop", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Stop(b)));
+           AddAction("/prevTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.ChapPlus(b)));
+           AddAction("/nextTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.ChapMinus(b)));
+           AddAction("/rewind", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Rewind(b)));
+           AddAction("/ffwd", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.FFwd(b)));
+           AddAction("/record", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Record(b)));
+        }
+
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/AudioCodecBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/AudioCodecBaseMessenger.cs
@@ -0,0 +1,120 @@
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Devices.Common.AudioCodec;
+using PepperDash.Essentials.Devices.Common.Codec;
+using System;
+using System.Linq;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    /// <summary>
+    /// Provides a messaging bridge for an AudioCodecBase device
+    /// </summary>
+    public class AudioCodecBaseMessenger : MessengerBase
+    {
+        /// <summary>
+        /// Device being bridged
+        /// </summary>
+        public AudioCodecBase Codec { get; private set; }
+
+        /// <summary>
+        /// Constuctor
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="codec"></param>
+        /// <param name="messagePath"></param>
+        public AudioCodecBaseMessenger(string key, AudioCodecBase codec, string messagePath)
+            : base(key, messagePath, codec)
+        {
+            Codec = codec ?? throw new ArgumentNullException("codec");
+            codec.CallStatusChange += Codec_CallStatusChange;
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendAtcFullMessageObject());
+            AddAction("/dial", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+
+                Codec.Dial(msg.Value);
+            });
+
+            AddAction("/endCallById", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+
+                var call = GetCallWithId(msg.Value);
+                if (call != null)
+                    Codec.EndCall(call);
+            });
+
+            AddAction("/endAllCalls", (id, content) => Codec.EndAllCalls());
+            AddAction("/dtmf", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+
+                Codec.SendDtmf(msg.Value);
+            });
+
+            AddAction("/rejectById", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+
+                var call = GetCallWithId(msg.Value);
+
+                if (call != null)
+                    Codec.RejectCall(call);
+            });
+
+            AddAction("/acceptById", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+                var call = GetCallWithId(msg.Value);
+                if (call != null)
+                    Codec.AcceptCall(call);
+            });
+        }
+
+        /// <summary>
+        /// Helper to grab a call with string ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        private CodecActiveCallItem GetCallWithId(string id)
+        {
+            return Codec.ActiveCalls.FirstOrDefault(c => c.Id == id);
+        }
+
+        private void Codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
+        {
+            SendAtcFullMessageObject();
+        }
+
+        /// <summary>
+        /// Helper method to build call status for vtc
+        /// </summary>
+        /// <returns></returns>
+        private void SendAtcFullMessageObject()
+        {
+            var info = Codec.CodecInfo;
+
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    isInCall = Codec.IsInCall,
+                    calls = Codec.ActiveCalls,
+                    info = new
+                    {
+                        phoneNumber = info.PhoneNumber
+                    }
+                })
+            );
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraBaseMessenger.cs
@@ -0,0 +1,209 @@
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Devices.Common.Cameras;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class CameraBaseMessenger : MessengerBase
+    {
+        /// <summary>
+        /// Device being bridged
+        /// </summary>
+        public CameraBase Camera { get; set; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="camera"></param>
+        /// <param name="messagePath"></param>
+        public CameraBaseMessenger(string key, CameraBase camera, string messagePath)
+            : base(key, messagePath, camera)
+        {
+            Camera = camera ?? throw new ArgumentNullException("camera");
+
+
+            if (Camera is IHasCameraPresets presetsCamera)
+            {
+                presetsCamera.PresetsListHasChanged += PresetsCamera_PresetsListHasChanged;
+            }
+        }
+
+        private void PresetsCamera_PresetsListHasChanged(object sender, EventArgs e)
+        {
+            var presetList = new List<CameraPreset>();
+
+            if (Camera is IHasCameraPresets presetsCamera)
+                presetList = presetsCamera.Presets;
+
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    presets = presetList
+                })
+            );
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendCameraFullMessageObject());
+
+
+            if (Camera is IHasCameraPtzControl ptzCamera)
+            {
+                //  Need to evaluate how to pass through these P&H actions.  Need a method that takes a bool maybe?
+                AddAction("/cameraUp", (id, content) => HandleCameraPressAndHold(content, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.TiltUp();
+                        return;
+                    }
+
+                    ptzCamera.TiltStop();
+                }));
+                AddAction("/cameraDown", (id, content) => HandleCameraPressAndHold(content, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.TiltDown();
+                        return;
+                    }
+
+                    ptzCamera.TiltStop();
+                }));
+                AddAction("/cameraLeft", (id, content) => HandleCameraPressAndHold(content, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.PanLeft();
+                        return;
+                    }
+
+                    ptzCamera.PanStop();
+                }));
+                AddAction("/cameraRight", (id, content) => HandleCameraPressAndHold(content, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.PanRight();
+                        return;
+                    }
+
+                    ptzCamera.PanStop();
+                }));
+                AddAction("/cameraZoomIn", (id, content) => HandleCameraPressAndHold(content, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.ZoomIn();
+                        return;
+                    }
+
+                    ptzCamera.ZoomStop();
+                }));
+                AddAction("/cameraZoomOut", (id, content) => HandleCameraPressAndHold(content, (b) =>
+                {
+                    if (b)
+                    {
+                        ptzCamera.ZoomOut();
+                        return;
+                    }
+
+                    ptzCamera.ZoomStop();
+                }));
+            }
+
+            if (Camera is IHasCameraAutoMode)
+            {
+                AddAction("/cameraModeAuto", (id, content) => (Camera as IHasCameraAutoMode).CameraAutoModeOn());
+
+                AddAction("/cameraModeManual", (id, content) => (Camera as IHasCameraAutoMode).CameraAutoModeOff());
+
+            }
+
+            if (Camera is IHasPowerControl)
+            {
+                AddAction("/cameraModeOff", (id, content) => (Camera as IHasPowerControl).PowerOff());
+                AddAction("/cameraModeManual", (id, content) => (Camera as IHasPowerControl).PowerOn());
+            }
+
+
+            if (Camera is IHasCameraPresets presetsCamera)
+            {
+                for (int i = 1; i <= 6; i++)
+                {
+                    var preset = i;
+                    AddAction("/cameraPreset" + i, (id, content) =>
+                    {
+                        var msg = content.ToObject<MobileControlSimpleContent<int>>();
+
+                        presetsCamera.PresetSelect(msg.Value);
+                    });
+
+                }
+            }
+        }
+
+        private void HandleCameraPressAndHold(JToken content, Action<bool> cameraAction)
+        {
+            var state = content.ToObject<MobileControlSimpleContent<string>>();
+
+            var timerHandler = PressAndHoldHandler.GetPressAndHoldHandler(state.Value);
+            if (timerHandler == null)
+            {
+                return;
+            }
+
+            timerHandler(state.Value, cameraAction);
+
+            cameraAction(state.Value.Equals("true", StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        /// <summary>
+        /// Helper method to update the full status of the camera
+        /// </summary>
+        private void SendCameraFullMessageObject()
+        {
+            var presetList = new List<CameraPreset>();
+
+            if (Camera is IHasCameraPresets presetsCamera)
+                presetList = presetsCamera.Presets;
+
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    cameraManualSupported = Camera is IHasCameraControls,
+                    cameraAutoSupported = Camera is IHasCameraAutoMode,
+                    cameraOffSupported = Camera is IHasCameraOff,
+                    cameraMode = GetCameraMode(),
+                    hasPresets = Camera is IHasCameraPresets,
+                    presets = presetList
+                })
+            );
+        }
+
+        /// <summary>
+        /// Computes the current camera mode
+        /// </summary>
+        /// <returns></returns>
+        private string GetCameraMode()
+        {
+            string m;
+            if (Camera is IHasCameraAutoMode && (Camera as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.BoolValue)
+                m = eCameraControlMode.Auto.ToString().ToLower();
+            else if (Camera is IHasPowerControlWithFeedback && !(Camera as IHasPowerControlWithFeedback).PowerIsOnFeedback.BoolValue)
+                m = eCameraControlMode.Off.ToString().ToLower();
+            else
+                m = eCameraControlMode.Manual.ToString().ToLower();
+            return m;
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CoreTwoWayDisplayBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CoreTwoWayDisplayBaseMessenger.cs
@@ -0,0 +1,91 @@
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class CoreTwoWayDisplayBaseMessenger : MessengerBase
+    {
+        private readonly TwoWayDisplayBase _display;
+
+        public CoreTwoWayDisplayBaseMessenger(string key, string messagePath, Device display)
+            : base(key, messagePath, display)
+        {
+            _display = display as TwoWayDisplayBase;
+        }
+
+        #region Overrides of MessengerBase
+
+        public void SendFullStatus()
+        {
+            var messageObj = new TwoWayDisplayBaseStateMessage
+            {
+                //PowerState = _display.PowerIsOnFeedback.BoolValue,
+                CurrentInput = _display.CurrentInputFeedback.StringValue
+            };
+
+            PostStatusMessage(messageObj);
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            base.RegisterActions();
+            if (_display == null)
+            {
+                Debug.Console(0, this, $"Unable to register TwoWayDisplayBase messenger {Key}");
+                return;
+            }
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+        
+            _display.PowerIsOnFeedback.OutputChange += PowerIsOnFeedbackOnOutputChange;
+            _display.CurrentInputFeedback.OutputChange += CurrentInputFeedbackOnOutputChange;
+            _display.IsCoolingDownFeedback.OutputChange += IsCoolingFeedbackOnOutputChange;
+            _display.IsWarmingUpFeedback.OutputChange += IsWarmingFeedbackOnOutputChange;
+        }
+
+        private void CurrentInputFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    currentInput = feedbackEventArgs.StringValue
+                }));
+        }
+
+
+        private void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    powerState = feedbackEventArgs.BoolValue
+                })
+            );
+        }
+
+        private void IsWarmingFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    isWarming = feedbackEventArgs.BoolValue
+                })
+            );
+
+        }
+
+        private void IsCoolingFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    isCooling = feedbackEventArgs.BoolValue
+                })
+            );            
+        }
+
+        #endregion
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceInfoMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceInfoMessenger.cs
@@ -0,0 +1,47 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceInfo;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class DeviceInfoMessenger : MessengerBase
+    {
+        private readonly IDeviceInfoProvider _deviceInfoProvider;
+        public DeviceInfoMessenger(string key, string messagePath, IDeviceInfoProvider device) : base(key, messagePath, device as Device)
+        {
+            _deviceInfoProvider = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            _deviceInfoProvider.DeviceInfoChanged += (o, a) =>
+            {
+                PostStatusMessage(JToken.FromObject(new
+                {
+                    deviceInfo = a.DeviceInfo
+                }));
+            };
+
+            AddAction("/fullStatus", (id, context) => PostStatusMessage(new DeviceInfoStateMessage
+            {
+                DeviceInfo = _deviceInfoProvider.DeviceInfo
+            }));
+
+            AddAction("/update", (id, context) => _deviceInfoProvider.UpdateDeviceInfo());
+        }
+    }
+
+    public class DeviceInfoStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("deviceInfo")]
+        public DeviceInfo DeviceInfo { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs
@@ -0,0 +1,101 @@
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Core.Logging;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.Presets;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class DevicePresetsModelMessenger : MessengerBase
+    {
+        private readonly ITvPresetsProvider _presetsDevice;
+
+        public DevicePresetsModelMessenger(string key, string messagePath, ITvPresetsProvider presetsDevice)
+            : base(key, messagePath, presetsDevice as Device)
+        {
+            _presetsDevice = presetsDevice;
+        }
+
+        private void SendPresets()
+        {
+            PostStatusMessage(new PresetStateMessage
+            {
+                Favorites = _presetsDevice.TvPresets.PresetsList
+            });
+        }
+
+        private void RecallPreset(ISetTopBoxNumericKeypad device, string channel)
+        {
+            _presetsDevice.TvPresets.Dial(channel, device);
+        }
+
+        private void SavePresets(List<PresetChannel> presets)
+        {
+            _presetsDevice.TvPresets.UpdatePresets(presets);
+        }
+
+
+        #region Overrides of MessengerBase
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            AddAction("/presets/fullStatus", (id, content) => {
+                this.LogInformation("getting full status for client {id}", id);
+                try
+                {
+                    SendPresets();
+                } catch(Exception ex)
+                {
+                    Debug.LogMessage(ex, "Exception sending preset full status", this);
+                }
+            });
+
+            AddAction("/presets/recall", (id, content) =>
+            {
+                var p = content.ToObject<PresetChannelMessage>();
+
+
+                if (!(DeviceManager.GetDeviceForKey(p.DeviceKey) is ISetTopBoxNumericKeypad dev))
+                {
+                    this.LogDebug("Unable to find device with key {0}", p.DeviceKey);
+                    return;
+                }
+
+                RecallPreset(dev, p.Preset.Channel);
+            });
+
+            AddAction("/presets/save", (id, content) =>
+            {
+                var presets = content.ToObject<List<PresetChannel>>();
+
+                SavePresets(presets);
+            });
+
+            _presetsDevice.TvPresets.PresetsSaved += (p) => SendPresets();
+        }
+
+        #endregion
+    }
+
+    public class PresetChannelMessage
+    {
+        [JsonProperty("preset")]
+        public PresetChannel Preset;
+
+        [JsonProperty("deviceKey")]
+        public string DeviceKey;
+    }
+
+    public class PresetStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("favorites", NullValueHandling = NullValueHandling.Ignore)]
+        public List<PresetChannel> Favorites { get; set; } = new List<PresetChannel>();
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs
@@ -0,0 +1,174 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Core.Logging;
+using PepperDash.Essentials.Core;
+using System;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class DeviceVolumeMessenger : MessengerBase
+    {
+        private readonly IBasicVolumeWithFeedback _localDevice;
+
+        public DeviceVolumeMessenger(string key, string messagePath, IBasicVolumeWithFeedback device)
+            : base(key, messagePath, device as IKeyName)
+        {
+            _localDevice = device;
+        }
+
+        private void SendStatus()
+        {
+            try
+            {
+                var messageObj = new VolumeStateMessage
+                {
+                    Volume = new Volume
+                    {
+                        Level = _localDevice?.VolumeLevelFeedback.IntValue ?? -1,
+                        Muted = _localDevice?.MuteFeedback.BoolValue ?? false,
+                        HasMute = true,  // assume all devices have mute for now
+                    }
+                };
+
+                if (_localDevice is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
+                {
+                    messageObj.Volume.RawValue = volumeAdvanced.RawVolumeLevel.ToString();
+                    messageObj.Volume.Units = volumeAdvanced.Units;
+                }
+
+                PostStatusMessage(messageObj);
+            } catch(Exception ex)
+            {
+                Debug.LogMessage(ex, "Exception sending full status", this);
+            }
+        }
+
+        #region Overrides of MessengerBase
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            AddAction("/fullStatus", (id, content) => SendStatus());
+
+            AddAction("/level", (id, content) =>
+            {
+                var volume = content.ToObject<MobileControlSimpleContent<ushort>>();
+
+                _localDevice.SetVolume(volume.Value);
+            });
+
+            AddAction("/muteToggle", (id, content) =>
+            {                
+                _localDevice.MuteToggle();
+            });
+
+            AddAction("/muteOn", (id, content) =>
+            {
+                _localDevice.MuteOn();
+            });
+
+            AddAction("/muteOff", (id, content) =>
+            {
+                _localDevice.MuteOff();
+            });
+
+            AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => 
+            {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume up with {value}", DeviceKey, b);
+                try
+                {
+                    _localDevice.VolumeUp(b);
+                } catch (Exception ex)
+                {
+                    Debug.LogMessage(ex, "Got exception during volume up: {Exception}", null, ex);
+                }
+             }));
+
+
+
+            AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => 
+            {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume down with {value}", DeviceKey, b);
+
+                try
+                {
+                    _localDevice.VolumeDown(b);
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogMessage(ex, "Got exception during volume down: {Exception}", null, ex);
+                }
+            }));
+
+            _localDevice.MuteFeedback.OutputChange += (sender, args) =>
+            {
+                PostStatusMessage(JToken.FromObject(
+                        new
+                        {
+                            volume = new
+                            {
+                                muted = args.BoolValue
+                            }
+                        })
+                );
+            };
+
+            _localDevice.VolumeLevelFeedback.OutputChange += (sender, args) =>
+            {
+                var rawValue = "";
+                if (_localDevice is IBasicVolumeWithFeedbackAdvanced volumeAdvanced)
+                {
+                    rawValue = volumeAdvanced.RawVolumeLevel.ToString();
+                }
+
+                var message = new
+                {
+                    volume = new
+                    {
+                        level = args.IntValue,
+                        rawValue
+                    }
+                };
+
+                PostStatusMessage(JToken.FromObject(message));                
+            };
+
+
+        }
+
+        #endregion
+    }
+
+    public class VolumeStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("volume", NullValueHandling = NullValueHandling.Ignore)]
+        public Volume Volume { get; set; }
+    }
+
+    public class Volume
+    {
+        [JsonProperty("level", NullValueHandling = NullValueHandling.Ignore)]
+        public int? Level { get; set; }
+
+        [JsonProperty("hasMute", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? HasMute { get; set; }
+
+        [JsonProperty("muted", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? Muted { get; set; }
+
+        [JsonProperty("label", NullValueHandling = NullValueHandling.Ignore)]
+        public string Label { get; set; }
+
+        [JsonProperty("rawValue", NullValueHandling = NullValueHandling.Ignore)]
+        public string RawValue { get; set; }
+
+        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonProperty("units", NullValueHandling = NullValueHandling.Ignore)]
+        public eVolumeLevelUnits? Units { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/GenericMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/GenericMessenger.cs
@@ -0,0 +1,31 @@
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class GenericMessenger : MessengerBase
+    {
+        public GenericMessenger(string key, EssentialsDevice device, string messagePath) : base(key, messagePath, device)
+        {
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+        }
+
+        private void SendFullStatus()
+        {
+            var state = new DeviceStateMessageBase();
+
+            PostStatusMessage(state);
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ICommunicationMonitorMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ICommunicationMonitorMessenger.cs
@@ -0,0 +1,79 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class ICommunicationMonitorMessenger : MessengerBase
+    {
+        private readonly ICommunicationMonitor _communicationMonitor;
+
+        public ICommunicationMonitorMessenger(string key, string messagePath, ICommunicationMonitor device) : base(key, messagePath, device as IKeyName)
+        {
+            _communicationMonitor = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => 
+            {
+                PostStatusMessage(new CommunicationMonitorState
+                {
+                    CommunicationMonitor = new CommunicationMonitorProps
+                    {
+                        IsOnline = _communicationMonitor.CommunicationMonitor.IsOnline,
+                        Status = _communicationMonitor.CommunicationMonitor.Status
+                    }
+                }); 
+            });
+
+            _communicationMonitor.CommunicationMonitor.StatusChange += (sender, args) =>
+            {
+                PostStatusMessage(JToken.FromObject(new
+                {
+                    commMonitor = new CommunicationMonitorProps
+                    {
+                        IsOnline = _communicationMonitor.CommunicationMonitor.IsOnline,
+                        Status = _communicationMonitor.CommunicationMonitor.Status
+                    }
+                }));
+            };
+        }
+    }
+
+    /// <summary>
+    /// Represents the state of the communication monitor
+    /// </summary>
+    public class CommunicationMonitorState : DeviceStateMessageBase
+    {
+        [JsonProperty("commMonitor", NullValueHandling = NullValueHandling.Ignore)]
+        public CommunicationMonitorProps CommunicationMonitor { get; set; }
+
+    }
+
+    public class CommunicationMonitorProps
+    {        /// <summary>
+             /// For devices that implement ICommunicationMonitor, reports the online status of the device
+             /// </summary>
+        [JsonProperty("isOnline", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsOnline { get; set; }
+
+        /// <summary>
+        /// For devices that implement ICommunicationMonitor, reports the online status of the device
+        /// </summary>
+        [JsonProperty("status", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(StringEnumConverter))]
+        public MonitorStatus Status { get; set; }
+
+    }
+
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IDspPresetsMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IDspPresetsMessenger.cs
@@ -0,0 +1,50 @@
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class IDspPresetsMessenger : MessengerBase
+    {
+        private IDspPresets _device;
+
+        public IDspPresetsMessenger(string key, string messagePath, IDspPresets device)
+            : base(key, messagePath, device as Device)
+        {
+            _device = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) =>
+            {
+                var message = new IHasDspPresetsStateMessage
+                {
+                    Presets = _device.Presets
+                };
+
+                PostStatusMessage(message);
+            });
+
+            AddAction("/recallPreset", (id, content) =>
+            {
+                var presetKey = content.ToObject<string>();
+
+
+                if (!string.IsNullOrEmpty(presetKey))
+                {
+                    _device.RecallPreset(presetKey);
+                }
+            });
+        }
+    }
+
+    public class IHasDspPresetsStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("presets")]
+        public Dictionary<string, IKeyName> Presets { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IEssentialsRoomCombinerMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IEssentialsRoomCombinerMessenger.cs
@@ -0,0 +1,153 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class IEssentialsRoomCombinerMessenger : MessengerBase
+    {
+        private readonly IEssentialsRoomCombiner _roomCombiner;
+
+        public IEssentialsRoomCombinerMessenger(string key, string messagePath, IEssentialsRoomCombiner roomCombiner)
+            : base(key, messagePath, roomCombiner as Device)
+        {
+            _roomCombiner = roomCombiner;
+        }
+
+        protected override void RegisterActions()
+        {
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+
+            AddAction("/setAutoMode", (id, content) =>
+            {
+                _roomCombiner.SetAutoMode();
+            });
+
+            AddAction("/setManualMode", (id, content) =>
+            {
+                _roomCombiner.SetManualMode();
+            });
+
+            AddAction("/toggleMode", (id, content) =>
+            {
+                _roomCombiner.ToggleMode();
+            });
+
+            AddAction("/togglePartitionState", (id, content) =>
+            {
+                try
+                {
+                    var partitionKey = content.ToObject<string>();
+
+                    _roomCombiner.TogglePartitionState(partitionKey);
+                }
+                catch (Exception e)
+                {
+                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, $"Error toggling partition state: {e}", this);
+                }
+            });
+
+            AddAction("/setRoomCombinationScenario", (id, content) =>
+            {
+                try
+                {
+                    var scenarioKey = content.ToObject<string>();
+
+                    _roomCombiner.SetRoomCombinationScenario(scenarioKey);
+                }
+                catch (Exception e)
+                {
+                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, $"Error toggling partition state: {e}", this);
+                }
+            });
+
+            _roomCombiner.RoomCombinationScenarioChanged += (sender, args) =>
+            {
+                SendFullStatus();
+            };
+
+            _roomCombiner.IsInAutoModeFeedback.OutputChange += (sender, args) =>
+            {
+                var message = new
+                {
+                    isInAutoMode = _roomCombiner.IsInAutoModeFeedback.BoolValue
+                };
+
+                PostStatusMessage(JToken.FromObject(message));
+            };
+
+            foreach(var partition in _roomCombiner.Partitions)
+            {
+                partition.PartitionPresentFeedback.OutputChange += (sender, args) =>
+                {
+                    var message = new
+                    {
+                        partitions = _roomCombiner.Partitions
+                    };
+
+                    PostStatusMessage(JToken.FromObject(message));
+                };
+            }
+        }
+
+        private void SendFullStatus()
+        {
+            try
+            {
+                var rooms = new List<IKeyName>();
+
+                foreach (var room in _roomCombiner.Rooms)
+                {
+                    rooms.Add(new RoomCombinerRoom{ Key = room.Key, Name = room.Name });
+                }
+
+                var message = new IEssentialsRoomCombinerStateMessage
+                {
+                    IsInAutoMode = _roomCombiner.IsInAutoMode,
+                    CurrentScenario = _roomCombiner.CurrentScenario,
+                    Rooms = rooms,
+                    RoomCombinationScenarios = _roomCombiner.RoomCombinationScenarios,
+                    Partitions = _roomCombiner.Partitions
+                };
+
+                PostStatusMessage(message);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, "Error sending full status: {0}", e);
+            }
+        }
+
+        private class RoomCombinerRoom : IKeyName
+        {
+            [JsonProperty("key")]
+            public string Key { get; set; }
+
+            [JsonProperty("name")]
+            public string Name { get; set; }
+        }
+    }
+
+    public class IEssentialsRoomCombinerStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("isInAutoMode", NullValueHandling = NullValueHandling.Ignore)]
+        public bool IsInAutoMode { get; set; }
+
+        [JsonProperty("currentScenario", NullValueHandling = NullValueHandling.Ignore)]
+        public IRoomCombinationScenario CurrentScenario { get; set; }
+
+        [JsonProperty("rooms", NullValueHandling = NullValueHandling.Ignore)]
+        public List<IKeyName> Rooms { get; set; }
+
+        [JsonProperty("roomCombinationScenarios", NullValueHandling = NullValueHandling.Ignore)]
+        public List<IRoomCombinationScenario> RoomCombinationScenarios { get; set; }
+
+        [JsonProperty("partitions", NullValueHandling = NullValueHandling.Ignore)]
+        public List<IPartitionController> Partitions { get; set; }
+    }
+
+
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCurrentSourceInfoMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCurrentSourceInfoMessenger.cs
@@ -0,0 +1,57 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Routing;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class IHasCurrentSourceInfoMessenger : MessengerBase
+    {
+        private readonly IHasCurrentSourceInfoChange sourceDevice;
+        public IHasCurrentSourceInfoMessenger(string key, string messagePath, IHasCurrentSourceInfoChange device) : base(key, messagePath, device as IKeyName)
+        {
+            sourceDevice = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) =>
+            {
+                var message = new CurrentSourceStateMessage
+                {
+                    CurrentSourceKey = sourceDevice.CurrentSourceInfoKey,
+                    CurrentSource = sourceDevice.CurrentSourceInfo
+                };
+
+                PostStatusMessage(message);
+            });
+
+            sourceDevice.CurrentSourceChange += (sender, e) => {
+                switch (e)
+                {
+                    case ChangeType.DidChange:
+                        {
+                            PostStatusMessage(JToken.FromObject(new
+                            {
+                                currentSourceKey = string.IsNullOrEmpty(sourceDevice.CurrentSourceInfoKey) ? string.Empty : sourceDevice.CurrentSourceInfoKey,
+                                currentSource = sourceDevice.CurrentSourceInfo
+                            }));
+                            break;
+                        }
+                }
+            };            
+        }
+    }
+
+    public class CurrentSourceStateMessage: DeviceStateMessageBase
+    {
+        [JsonProperty("currentSourceKey", NullValueHandling = NullValueHandling.Ignore)]
+        public string CurrentSourceKey { get; set; }
+
+        [JsonProperty("currentSource")]
+        public SourceListItem CurrentSource { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasPowerControlWithFeedbackMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasPowerControlWithFeedbackMessenger.cs
@@ -0,0 +1,57 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class IHasPowerControlWithFeedbackMessenger: MessengerBase
+    {
+        private readonly IHasPowerControlWithFeedback _powerControl;
+
+        public IHasPowerControlWithFeedbackMessenger(string key, string messagePath, IHasPowerControlWithFeedback powerControl) 
+            : base(key, messagePath, powerControl as Device)
+        {
+            _powerControl = powerControl;
+        }
+
+        public void SendFullStatus()
+        {
+            var messageObj = new PowerControlWithFeedbackStateMessage
+            {
+                PowerState = _powerControl.PowerIsOnFeedback.BoolValue
+            };
+
+            PostStatusMessage(messageObj);
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+
+            _powerControl.PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange; ;
+        }
+
+        private void PowerIsOnFeedback_OutputChange(object sender, FeedbackEventArgs args)
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    powerState = args.BoolValue
+                })
+            );
+        }
+    }
+
+    public class PowerControlWithFeedbackStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("powerState", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? PowerState { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasScheduleAwarenessMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasScheduleAwarenessMessenger.cs
@@ -0,0 +1,86 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Devices.Common.Codec;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class IHasScheduleAwarenessMessenger : MessengerBase
+    {
+        public IHasScheduleAwareness ScheduleSource { get; private set; }
+
+        public IHasScheduleAwarenessMessenger(string key, IHasScheduleAwareness scheduleSource, string messagePath)
+            : base(key, messagePath, scheduleSource as Device)
+        {
+            ScheduleSource = scheduleSource ?? throw new ArgumentNullException("scheduleSource");
+            ScheduleSource.CodecSchedule.MeetingsListHasChanged += new EventHandler<EventArgs>(CodecSchedule_MeetingsListHasChanged);
+            ScheduleSource.CodecSchedule.MeetingEventChange += new EventHandler<MeetingEventArgs>(CodecSchedule_MeetingEventChange);
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            AddAction("/schedule/fullStatus", (id, content) => SendFullScheduleObject());
+        }
+
+        private void CodecSchedule_MeetingEventChange(object sender, MeetingEventArgs e)
+        {
+            PostStatusMessage(JToken.FromObject(new MeetingChangeMessage
+                {
+                    MeetingChange = new MeetingChange
+                    {
+                        ChangeType = e.ChangeType.ToString(),
+                        Meeting = e.Meeting
+                    }
+                })
+            );
+        }
+
+        private void CodecSchedule_MeetingsListHasChanged(object sender, EventArgs e)
+        {
+            SendFullScheduleObject();
+        }
+
+        /// <summary>
+        /// Helper method to send the full schedule data
+        /// </summary>
+        private void SendFullScheduleObject()
+        {
+            PostStatusMessage(new FullScheduleMessage
+            {
+                Meetings = ScheduleSource.CodecSchedule.Meetings,
+                MeetingWarningMinutes = ScheduleSource.CodecSchedule.MeetingWarningMinutes
+            });
+        }
+    }
+
+    public class FullScheduleMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("meetings", NullValueHandling = NullValueHandling.Ignore)]
+        public List<Meeting> Meetings { get; set; }
+
+        [JsonProperty("meetingWarningMinutes", NullValueHandling = NullValueHandling.Ignore)]
+        public int MeetingWarningMinutes { get; set; }
+    }
+
+    public class MeetingChangeMessage
+    {
+        [JsonProperty("meetingChange", NullValueHandling = NullValueHandling.Ignore)]
+        public MeetingChange MeetingChange { get; set; }
+    }
+
+    public class MeetingChange
+    {
+        [JsonProperty("changeType", NullValueHandling = NullValueHandling.Ignore)]
+        public string ChangeType { get; set; }
+
+        [JsonProperty("meeting", NullValueHandling = NullValueHandling.Ignore)]
+        public Meeting Meeting { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHumiditySensor.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHumiditySensor.cs
@@ -0,0 +1,43 @@
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class IHumiditySensorMessenger : MessengerBase
+    {
+        private readonly IHumiditySensor device;
+
+        public IHumiditySensorMessenger(string key, IHumiditySensor device, string messagePath)
+            : base(key, messagePath, device as Device)
+        {
+            this.device = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+
+            device.HumidityFeedback.OutputChange += new EventHandler<Core.FeedbackEventArgs>((o, a) => SendFullStatus());
+        }
+
+        private void SendFullStatus()
+        {
+            var state = new IHumiditySensorStateMessage
+            {
+                Humidity = string.Format("{0}%", device.HumidityFeedback.UShortValue)
+            };
+
+            PostStatusMessage(state);
+        }
+    }
+
+    public class IHumiditySensorStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("humidity")]
+        public string Humidity { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ILevelControlsMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ILevelControlsMessenger.cs
@@ -0,0 +1,95 @@
+using Independentsoft.Exchange;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class ILevelControlsMessenger : MessengerBase
+    {
+        private ILevelControls levelControlsDevice;
+        public ILevelControlsMessenger(string key, string messagePath, ILevelControls device) : base(key, messagePath, device as Device)
+        {
+            levelControlsDevice = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, context) =>
+            {
+                var message = new LevelControlStateMessage
+                {
+                    Levels = levelControlsDevice.LevelControlPoints.ToDictionary(kv => kv.Key, kv => new Volume { Level = kv.Value.VolumeLevelFeedback.IntValue, Muted = kv.Value.MuteFeedback.BoolValue })
+                };
+
+                PostStatusMessage(message);
+            });
+
+            foreach(var levelControl in levelControlsDevice.LevelControlPoints)
+            {
+                // reassigning here just in case of lambda closure issues
+                var key = levelControl.Key;
+                var control = levelControl.Value;
+
+                AddAction($"/{key}/level", (id, content) =>
+                {
+                    var request = content.ToObject<MobileControlSimpleContent<ushort>>();
+
+                    control.SetVolume(request.Value);
+                });
+
+                AddAction($"/{key}/muteToggle", (id, content) =>
+                {
+                    control.MuteToggle();
+                });
+
+                AddAction($"/{key}/muteOn", (id, content) => control.MuteOn());
+
+                AddAction($"/{key}/muteOff", (id, content) => control.MuteOff());
+
+                AddAction($"/{key}/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => control.VolumeUp(b)));
+
+                AddAction($"/{key}/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => control.VolumeDown(b)));
+
+                control.VolumeLevelFeedback.OutputChange += (o, a) => PostStatusMessage(JToken.FromObject(new
+                {
+                    levelControls = new Dictionary<string, Volume>
+                    {
+                        {key, new Volume{Level = a.IntValue} }
+                    }
+                }));
+
+                control.MuteFeedback.OutputChange += (o, a) => PostStatusMessage(JToken.FromObject(new
+                {
+                    levelControls = new Dictionary<string, Volume>
+                    {
+                        {key, new Volume{Muted = a.BoolValue} }
+                    }
+                }));
+            }
+        }
+    }
+
+    public class LevelControlStateMessage:DeviceStateMessageBase
+    {
+        [JsonProperty("levelControls")]
+        public Dictionary<string, Volume> Levels { get; set; }
+    }
+
+    public class LevelControlRequestMessage
+    {
+        [JsonProperty("key")]
+        public string Key { get; set; }
+
+        [JsonProperty("level", NullValueHandling = NullValueHandling.Ignore)]
+        public ushort? Level { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IMatrixRoutingMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IMatrixRoutingMessenger.cs
@@ -0,0 +1,168 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Routing;
+using System.Collections.Generic;
+using System.Linq;
+using Serilog.Events;
+using System;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    /// <summary>
+    /// Messenger for devices that implment IMatrixRouting
+    /// </summary>
+    public class IMatrixRoutingMessenger : MessengerBase
+    {
+        private readonly IMatrixRouting matrixDevice;
+        public IMatrixRoutingMessenger(string key, string messagePath, IMatrixRouting device) : base(key, messagePath, device as Device)
+        {
+            matrixDevice = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) =>
+            {
+                try
+                {
+                    Debug.LogMessage(LogEventLevel.Verbose, "InputCount: {inputCount}, OutputCount: {outputCount}", this, matrixDevice.InputSlots.Count, matrixDevice.OutputSlots.Count);
+                    var message = new MatrixStateMessage
+                    {
+                        Outputs = matrixDevice.OutputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingOutput(kvp.Value)),
+                        Inputs = matrixDevice.InputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingInput(kvp.Value)),
+                    };
+
+                    
+                    PostStatusMessage(message);
+                }
+                catch (Exception e)
+                {
+                    Debug.LogMessage(e, "Exception Getting full status: {@exception}", this, e);
+                }
+            });
+
+            AddAction("/route", (id, content) =>
+            {
+                var request = content.ToObject<MatrixRouteRequest>();
+
+                matrixDevice.Route(request.InputKey, request.OutputKey, request.RouteType);
+            });
+
+            foreach(var output in matrixDevice.OutputSlots)
+            {
+                var key = output.Key;
+                var outputSlot = output.Value;
+
+                outputSlot.OutputSlotChanged += (sender, args) =>
+                {
+                    PostStatusMessage(JToken.FromObject(new
+                    {
+                        outputs = matrixDevice.OutputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingOutput(kvp.Value))
+                    }));
+                };
+            }
+
+            foreach(var input in matrixDevice.InputSlots)
+            {
+                var key = input.Key;
+                var inputSlot = input.Value;
+
+                inputSlot.VideoSyncChanged += (sender, args) =>
+                {
+                    PostStatusMessage(JToken.FromObject(new
+                    {
+                        inputs = matrixDevice.InputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingInput(kvp.Value))
+                    }));
+                };
+            }
+        }
+    }
+
+    public class  MatrixStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("outputs")]
+        public Dictionary<string, RoutingOutput> Outputs;
+
+        [JsonProperty("inputs")]
+        public Dictionary<string, RoutingInput> Inputs;
+    }
+
+    public class RoutingInput
+    {
+        private IRoutingInputSlot _input;
+
+        [JsonProperty("txDeviceKey", NullValueHandling = NullValueHandling.Ignore)]
+        public string TxDeviceKey => _input?.TxDeviceKey;
+
+        [JsonProperty("slotNumber", NullValueHandling = NullValueHandling.Ignore)]
+        public int? SlotNumber => _input?.SlotNumber;
+
+        [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
+        [JsonProperty("supportedSignalTypes", NullValueHandling = NullValueHandling.Ignore)]
+        public eRoutingSignalType? SupportedSignalTypes => _input?.SupportedSignalTypes;
+
+        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
+        public string Name => _input?.Name;
+
+        [JsonProperty("isOnline", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsOnline => _input?.IsOnline.BoolValue;
+
+        [JsonProperty("videoSyncDetected", NullValueHandling = NullValueHandling.Ignore)]
+
+        public bool? VideoSyncDetected  => _input?.VideoSyncDetected;
+
+        [JsonProperty("key", NullValueHandling = NullValueHandling.Ignore)]
+        public string Key => _input?.Key;
+
+        public RoutingInput(IRoutingInputSlot input)
+        {            
+            _input = input;
+        }
+    }
+
+    public class RoutingOutput
+    {
+        private IRoutingOutputSlot _output;
+
+
+        public RoutingOutput(IRoutingOutputSlot output)
+        {
+            _output = output;
+        }
+
+        [JsonProperty("rxDeviceKey")]
+        public string RxDeviceKey => _output.RxDeviceKey;
+
+        [JsonProperty("currentRoutes")]
+        public Dictionary<string, RoutingInput> CurrentRoutes => _output.CurrentRoutes.ToDictionary(kvp => kvp.Key.ToString(), kvp => new RoutingInput(kvp.Value));
+
+        [JsonProperty("slotNumber")]
+        public int SlotNumber => _output.SlotNumber;
+
+        [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
+        [JsonProperty("supportedSignalTypes")]
+        public eRoutingSignalType SupportedSignalTypes => _output.SupportedSignalTypes;
+
+        [JsonProperty("name")]
+        public string Name => _output.Name;
+
+        [JsonProperty("key")]
+        public string Key => _output.Key;
+    }
+
+    public class MatrixRouteRequest
+    {
+        [JsonProperty("outputKey")]
+        public string OutputKey { get; set; }
+
+        [JsonProperty("inputKey")]
+        public string InputKey { get; set; }
+
+        [JsonProperty("routeType")]
+        public eRoutingSignalType RouteType { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IProjectorScreenLiftControlMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IProjectorScreenLiftControlMessenger.cs
@@ -0,0 +1,78 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class IProjectorScreenLiftControlMessenger: MessengerBase
+    {
+        private readonly IProjectorScreenLiftControl device;
+
+        public IProjectorScreenLiftControlMessenger(string key, string messagePath, IProjectorScreenLiftControl screenLiftDevice)
+            : base(key, messagePath, screenLiftDevice as Device)
+        {
+            device = screenLiftDevice;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+
+            AddAction("/raise", (id, content) =>
+            {
+
+                device.Raise();
+
+            });
+
+            AddAction("/lower", (id, content) =>
+            {
+
+                device.Lower();
+
+            });
+
+            device.PositionChanged += Device_PositionChanged;
+
+        }
+
+        private void Device_PositionChanged(object sender, EventArgs e)
+        {
+            var state = new
+            {
+                inUpPosition = device.InUpPosition
+            };
+            PostStatusMessage(JToken.FromObject(state));
+        }
+
+        private void SendFullStatus()
+        {
+            var state = new ScreenLiftStateMessage
+            {
+                InUpPosition = device.InUpPosition,
+                Type = device.Type,
+                DisplayDeviceKey = device.DisplayDeviceKey
+            };
+
+            PostStatusMessage(state);
+        }
+    }
+
+    public class ScreenLiftStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("inUpPosition", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? InUpPosition { get; set; }
+
+        [JsonProperty("displayDeviceKey", NullValueHandling = NullValueHandling.Ignore)]
+        public string DisplayDeviceKey { get; set; }
+
+        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+        public eScreenLiftControlType Type { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRunRouteActionMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRunRouteActionMessenger.cs
@@ -0,0 +1,89 @@
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class RunRouteActionMessenger : MessengerBase
+    {
+        /// <summary>
+        /// Device being bridged
+        /// </summary>
+        public IRunRouteAction RoutingDevice { get; private set; }
+
+        public RunRouteActionMessenger(string key, IRunRouteAction routingDevice, string messagePath)
+            : base(key, messagePath, routingDevice as Device)
+        {
+            RoutingDevice = routingDevice ?? throw new ArgumentNullException("routingDevice");
+
+
+            if (RoutingDevice is IRoutingSink routingSink)
+            {
+                routingSink.CurrentSourceChange += RoutingSink_CurrentSourceChange;
+            }
+        }
+
+        private void RoutingSink_CurrentSourceChange(SourceListItem info, ChangeType type)
+        {
+            SendRoutingFullMessageObject();
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            AddAction("/fullStatus", (id, content) => SendRoutingFullMessageObject());
+
+            AddAction("/source", (id, content) =>
+                {
+                    var c = content.ToObject<SourceSelectMessageContent>();
+                    // assume no sourceListKey
+                    var sourceListKey = string.Empty;
+
+                    if (!string.IsNullOrEmpty(c.SourceListKey))
+                    {
+                        // Check for source list in content of message
+                        Debug.Console(1, this, "sourceListKey found in message");
+                        sourceListKey = c.SourceListKey;
+                    }
+
+                    RoutingDevice.RunRouteAction(c.SourceListItemKey, sourceListKey);
+                });
+
+            if (RoutingDevice is IRoutingSink sinkDevice)
+            {
+                sinkDevice.CurrentSourceChange += (o, a) => SendRoutingFullMessageObject();
+            }
+        }
+
+        /// <summary>
+        /// Helper method to update full status of the routing device
+        /// </summary>
+        private void SendRoutingFullMessageObject()
+        {
+            if (RoutingDevice is IRoutingSink sinkDevice)
+            {
+                var sourceKey = sinkDevice.CurrentSourceInfoKey;
+
+                if (string.IsNullOrEmpty(sourceKey))
+                    sourceKey = "none";
+
+                PostStatusMessage(new RoutingStateMessage
+                {
+                    SelectedSourceKey = sourceKey
+                });
+            }
+        }
+    }
+
+    public class RoutingStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("selectedSourceKey")]
+        public string SelectedSourceKey { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs
@@ -0,0 +1,70 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Converters;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class ISelectableItemsMessenger<TKey> : MessengerBase
+    {
+        private static readonly JsonSerializer serializer = new JsonSerializer { Converters = { new StringEnumConverter() } };
+        private ISelectableItems<TKey> itemDevice;
+
+        private readonly string _propName;
+        public ISelectableItemsMessenger(string key, string messagePath, ISelectableItems<TKey> device, string propName) : base(key, messagePath, device as Device)
+        {
+            itemDevice = device;
+            _propName = propName;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, context) =>
+            {
+                SendFullStatus();
+            });
+
+            itemDevice.ItemsUpdated += (sender, args) =>
+            {
+                SendFullStatus();
+            };
+
+            itemDevice.CurrentItemChanged += (sender, args) =>
+            {
+                SendFullStatus();
+            };
+
+            foreach (var input in itemDevice.Items)
+            {
+                var key = input.Key;
+                var localItem = input.Value;                
+
+                AddAction($"/{key}", (id, content) =>
+                {
+                    localItem.Select();
+                });
+
+                localItem.ItemUpdated += (sender, args) =>
+                {
+                    SendFullStatus();
+                };
+            }
+        }
+
+        private void SendFullStatus()
+        {
+            var stateObject = new JObject();
+            stateObject[_propName] = JToken.FromObject(itemDevice, serializer);
+            PostStatusMessage(stateObject);
+        }
+    }
+
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IShutdownPromptTimerMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IShutdownPromptTimerMessenger.cs
@@ -0,0 +1,93 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class IShutdownPromptTimerMessenger : MessengerBase
+    {
+        private readonly IShutdownPromptTimer _room;
+
+        public IShutdownPromptTimerMessenger(string key, string messagePath, IShutdownPromptTimer room)
+            : base(key, messagePath, room as Device)
+        {
+            _room = room;
+        }
+
+        protected override void RegisterActions()
+        {
+            AddAction("/status", (id, content) =>
+            {
+                SendFullStatus();
+            });
+
+            AddAction("/setShutdownPromptSeconds", (id, content) =>
+            {
+                var response = content.ToObject<int>();
+
+                _room.SetShutdownPromptSeconds(response);
+
+                SendFullStatus();
+            });
+
+            AddAction("/shutdownStart", (id, content) => _room.StartShutdown(eShutdownType.Manual));
+
+            AddAction("/shutdownEnd", (id, content) => _room.ShutdownPromptTimer.Finish());
+
+            AddAction("/shutdownCancel", (id, content) => _room.ShutdownPromptTimer.Cancel());
+
+
+            _room.ShutdownPromptTimer.HasStarted += (sender, args) =>
+            {
+                PostEventMessage("timerStarted");
+            };
+
+            _room.ShutdownPromptTimer.HasFinished += (sender, args) =>
+            {
+                PostEventMessage("timerFinished");
+            };
+
+            _room.ShutdownPromptTimer.WasCancelled += (sender, args) =>
+            {
+                PostEventMessage("timerCancelled");
+            };
+
+            _room.ShutdownPromptTimer.SecondsRemainingFeedback.OutputChange += (sender, args) =>
+            {
+                var status = new
+                {
+                    secondsRemaining = _room.ShutdownPromptTimer.SecondsRemainingFeedback.IntValue,
+                    percentageRemaining = _room.ShutdownPromptTimer.PercentFeedback.UShortValue
+                };
+
+                PostStatusMessage(JToken.FromObject(status));
+            };
+        }
+
+        private void SendFullStatus()
+        {
+            var status = new IShutdownPromptTimerStateMessage
+            {
+                ShutdownPromptSeconds = _room.ShutdownPromptTimer.SecondsToCount,
+                SecondsRemaining = _room.ShutdownPromptTimer.SecondsRemainingFeedback.IntValue,
+                PercentageRemaining = _room.ShutdownPromptTimer.PercentFeedback.UShortValue
+            };
+
+            PostStatusMessage(status);
+        }
+    }
+
+
+    public class IShutdownPromptTimerStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("secondsRemaining")]
+        public int SecondsRemaining { get; set; }
+
+        [JsonProperty("percentageRemaining")]
+        public int PercentageRemaining { get; set; }
+
+        [JsonProperty("shutdownPromptSeconds")]
+        public int ShutdownPromptSeconds { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISwitchedOutputMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISwitchedOutputMessenger.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Shades;
+using Newtonsoft.Json;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class ISwitchedOutputMessenger : MessengerBase
+    {
+
+        private readonly ISwitchedOutput device;
+
+        public ISwitchedOutputMessenger(string key, ISwitchedOutput device, string messagePath)
+            : base(key, messagePath, device as Device)
+        {
+            this.device = device;
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+
+            AddAction("/on", (id, content) =>
+            {
+
+                device.On();
+
+            });
+
+            AddAction("/off", (id, content) =>
+            {
+
+                device.Off();
+
+            });
+
+            device.OutputIsOnFeedback.OutputChange += new EventHandler<Core.FeedbackEventArgs>((o, a) => SendFullStatus());       
+        }
+
+        private void SendFullStatus()
+        {
+            var state = new ISwitchedOutputStateMessage
+            {
+                IsOn = device.OutputIsOnFeedback.BoolValue
+            };
+
+            PostStatusMessage(state);
+        }
+    }
+
+    public class ISwitchedOutputStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("isOn")]
+        public bool IsOn { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Independentsoft.Json.Parser;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class ITechPasswordMessenger : MessengerBase
+    {
+        private readonly ITechPassword _room;
+
+        public ITechPasswordMessenger(string key, string messagePath, ITechPassword room)
+            : base(key, messagePath, room as Device)
+        {
+            _room = room;
+        }
+
+        protected override void RegisterActions()
+        {
+
+            AddAction("/status", (id, content) =>
+            {
+                SendFullStatus();
+            });
+
+            AddAction("/validateTechPassword", (id, content) =>
+            {
+                var password = content.Value<string>("password");
+
+                _room.ValidateTechPassword(password);
+            });
+
+            AddAction("/setTechPassword", (id, content) =>
+            {
+                var response = content.ToObject<SetTechPasswordContent>();
+
+                _room.SetTechPassword(response.OldPassword, response.NewPassword);
+            });
+
+            _room.TechPasswordChanged += (sender, args) =>
+            {
+                PostEventMessage("passwordChangedSuccessfully");
+            };
+
+            _room.TechPasswordValidateResult += (sender, args) =>
+            {
+                var evt = new ITechPasswordEventMessage
+                {
+                    IsValid = args.IsValid
+                };
+
+                PostEventMessage(evt, "passwordValidationResult");
+            };
+        }
+
+        private void SendFullStatus()
+        {
+            var status = new ITechPasswordStateMessage
+            {
+                TechPasswordLength = _room.TechPasswordLength
+            };
+
+            PostStatusMessage(status);
+        }
+
+    }
+
+    public class ITechPasswordStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("techPasswordLength", NullValueHandling = NullValueHandling.Ignore)]
+        public int? TechPasswordLength { get; set; }
+    }
+
+    public class ITechPasswordEventMessage : DeviceEventMessageBase
+    {
+        [JsonProperty("isValid", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsValid { get; set; }
+    }
+    
+    class SetTechPasswordContent
+    {
+        [JsonProperty("oldPassword")]
+        public string OldPassword { get; set; }
+
+        [JsonProperty("newPassword")]
+        public string NewPassword { get; set; }
+    }
+
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITemperatureSensorMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITemperatureSensorMessenger.cs
@@ -0,0 +1,61 @@
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class ITemperatureSensorMessenger : MessengerBase
+    {
+        private readonly ITemperatureSensor device;
+
+        public ITemperatureSensorMessenger(string key, ITemperatureSensor device, string messagePath)
+            : base(key, messagePath, device as Device)
+        {
+            this.device = device;
+        }
+
+        protected override void RegisterActions()
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+
+            AddAction("/setTemperatureUnitsToCelcius", (id, content) =>
+            {
+                device.SetTemperatureFormat(true);
+            });
+
+            AddAction("/setTemperatureUnitsToFahrenheit", (id, content) =>
+            {
+                device.SetTemperatureFormat(false);
+            });
+
+            device.TemperatureFeedback.OutputChange += new EventHandler<Core.FeedbackEventArgs>((o, a) => SendFullStatus());
+            device.TemperatureInCFeedback.OutputChange += new EventHandler<Core.FeedbackEventArgs>((o, a) => SendFullStatus());
+        }
+
+        private void SendFullStatus()
+        {
+            // format the temperature to a string with one decimal place
+            var tempString = string.Format("{0}.{1}", device.TemperatureFeedback.UShortValue / 10, device.TemperatureFeedback.UShortValue % 10);
+
+            var state = new ITemperatureSensorStateMessage
+            {
+                Temperature = tempString,
+                TemperatureInCelsius = device.TemperatureInCFeedback.BoolValue
+            };
+
+            PostStatusMessage(state);
+        }
+    }
+
+    public class ITemperatureSensorStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("temperature")]
+        public string Temperature { get; set; }
+
+        [JsonProperty("temperatureInCelsius")]
+        public bool TemperatureInCelsius { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs
@@ -0,0 +1,73 @@
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.Lighting;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class ILightingScenesMessenger : MessengerBase
+    {
+        protected ILightingScenes Device { get; private set; }
+
+        public ILightingScenesMessenger(string key, ILightingScenes device, string messagePath)
+            : base(key, messagePath, device as Device)
+        {
+            Device = device ?? throw new ArgumentNullException("device");
+            Device.LightingSceneChange += new EventHandler<LightingSceneChangeEventArgs>(LightingDevice_LightingSceneChange);
+
+
+        }
+
+        private void LightingDevice_LightingSceneChange(object sender, LightingSceneChangeEventArgs e)
+        {
+            var state = new LightingBaseStateMessage
+            {
+                CurrentLightingScene = e.CurrentLightingScene
+            };
+
+            PostStatusMessage(state);
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+
+            AddAction("/selectScene", (id, content) =>
+            {
+                var s = content.ToObject<LightingScene>();
+                Device.SelectScene(s);
+            });
+        }
+
+
+        private void SendFullStatus()
+        {
+            Debug.Console(2, "LightingBaseMessenger GetFullStatus");
+
+            var state = new LightingBaseStateMessage
+            {
+                Scenes = Device.LightingScenes,
+                CurrentLightingScene = Device.CurrentLightingScene
+            };
+
+            PostStatusMessage(state);
+        }
+    }
+
+    public class LightingBaseStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("scenes", NullValueHandling = NullValueHandling.Ignore)]
+        public List<LightingScene> Scenes { get; set; }
+
+        [JsonProperty("currentLightingScene", NullValueHandling = NullValueHandling.Ignore)]
+        public LightingScene CurrentLightingScene { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
@@ -0,0 +1,303 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    /// <summary>
+    /// Provides a messaging bridge
+    /// </summary>
+#if SERIES4
+    public abstract class MessengerBase : EssentialsDevice, IMobileControlMessenger
+#else
+    public abstract class MessengerBase: EssentialsDevice
+#endif
+    {
+        protected IKeyName _device;
+
+        private readonly List<string> _deviceInterfaces;
+
+        private readonly Dictionary<string, Action<string, JToken>> _actions = new Dictionary<string, Action<string, JToken>>();
+
+        public string DeviceKey => _device?.Key ?? "";
+
+        /// <summary>
+        /// 
+        /// </summary>
+#if SERIES4
+        public IMobileControl AppServerController { get; private set; }
+#else
+        public MobileControlSystemController AppServerController { get; private set; }
+#endif
+
+        public string MessagePath { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="messagePath"></param>
+        protected MessengerBase(string key, string messagePath)
+            : base(key)
+        {
+            Key = key;
+
+            if (string.IsNullOrEmpty(messagePath))
+                throw new ArgumentException("messagePath must not be empty or null");
+
+            MessagePath = messagePath;
+        }
+
+        protected MessengerBase(string key, string messagePath, IKeyName device)
+            : this(key, messagePath)
+        {
+            _device = device;
+
+            _deviceInterfaces = GetInterfaces(_device as Device);
+        }
+
+        /// <summary>
+        /// Gets the interfaces implmented on the device
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        private List<string> GetInterfaces(Device device)
+        {
+            return device?.GetType().GetInterfaces().Select((i) => i.Name).ToList() ?? new List<string>();
+        }
+
+        /// <summary>
+        /// Registers this messenger with appserver controller
+        /// </summary>
+        /// <param name="appServerController"></param>
+#if SERIES4
+        public void RegisterWithAppServer(IMobileControl appServerController)
+#else
+        public void RegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            AppServerController = appServerController ?? throw new ArgumentNullException("appServerController");
+
+            AppServerController.AddAction(this, HandleMessage);
+
+            RegisterActions();
+        }
+
+        private void HandleMessage(string path, string id, JToken content)
+        {
+            // replace base path with empty string. Should leave something like /fullStatus
+            var route = path.Replace(MessagePath, string.Empty); 
+
+            if(!_actions.TryGetValue(route, out var action)) {                
+                return;
+            }
+
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Executing action for path {path}", this, path);
+
+            action(id, content);
+        }
+
+        protected void AddAction(string path, Action<string, JToken> action)
+        {
+            if (_actions.ContainsKey(path))
+            {
+                //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, $"Messenger {Key} already has action registered at {path}", this);
+                return;
+            }
+
+            _actions.Add(path, action);
+        }
+
+        public List<string> GetActionPaths()
+        {
+            return _actions.Keys.ToList();
+        }
+
+        protected void RemoveAction(string path)
+        {
+            if (!_actions.ContainsKey(path))
+            {
+                return;
+            }
+
+            _actions.Remove(path);
+        }
+
+        /// <summary>
+        /// Implemented in extending classes. Wire up API calls and feedback here
+        /// </summary>
+        /// <param name="appServerController"></param>
+#if SERIES4
+        protected virtual void RegisterActions()
+#else
+        protected virtual void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+
+        }
+
+        /// <summary>
+        /// Helper for posting status message
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="message"></param>
+        protected void PostStatusMessage(DeviceStateMessageBase message, string clientId = null)
+        {
+            try
+            {
+                if(message == null)
+                {
+                    throw new ArgumentNullException("message");
+                }
+
+                if(_device == null)
+                {
+                    throw new ArgumentNullException("device");
+                }
+
+                message.SetInterfaces(_deviceInterfaces);
+
+                message.Key = _device.Key;
+
+                message.Name = _device.Name;
+
+                PostStatusMessage(JToken.FromObject(message), MessagePath, clientId);
+            }
+            catch (Exception ex) {
+                Debug.LogMessage(ex, "Exception posting status message", this);
+            }
+        }
+
+#if SERIES4 
+        protected void PostStatusMessage(string type, DeviceStateMessageBase deviceState, string clientId = null)
+        {
+            try
+            {
+                //Debug.Console(2, this, "*********************Setting DeviceStateMessageProperties on MobileControlResponseMessage");
+                deviceState.SetInterfaces(_deviceInterfaces);
+
+                deviceState.Key = _device.Key;
+
+                deviceState.Name = _device.Name;
+
+                deviceState.MessageBasePath = MessagePath;
+
+                PostStatusMessage(JToken.FromObject(deviceState), type, clientId);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogMessage(ex, "Exception posting status message", this);
+            }
+        }
+#endif
+        protected void PostStatusMessage(JToken content, string type = "", string clientId = null)
+        {
+            try
+            {
+                AppServerController?.SendMessageObject(new MobileControlMessage { Type = !string.IsNullOrEmpty(type) ? type : MessagePath, ClientId = clientId, Content = content });
+            }
+            catch (Exception ex)
+            {
+                Debug.LogMessage(ex, "Exception posting status message", this);
+            }
+        }
+
+        protected void PostEventMessage(DeviceEventMessageBase message)
+        {
+            message.Key = _device.Key;
+
+            message.Name = _device.Name;
+
+            AppServerController?.SendMessageObject(new MobileControlMessage
+            {
+                Type = $"/event{MessagePath}/{message.EventType}",
+                Content = JToken.FromObject(message),
+            });   
+        }
+
+        protected void PostEventMessage(DeviceEventMessageBase message, string eventType)
+        {             
+            message.Key = _device.Key;
+        
+            message.Name = _device.Name;
+
+            message.EventType = eventType;
+        
+            AppServerController?.SendMessageObject(new MobileControlMessage
+            {
+                Type = $"/event{MessagePath}/{eventType}",
+                Content = JToken.FromObject(message),
+            });
+        }
+
+        protected void PostEventMessage(string eventType)
+        {
+            AppServerController?.SendMessageObject(new MobileControlMessage
+            {
+                Type = $"/event{MessagePath}/{eventType}",
+                Content = JToken.FromObject(new { }),
+            });
+        }
+
+    }
+
+    public abstract class DeviceMessageBase
+    {
+        /// <summary>
+        /// The device key
+        /// </summary>
+        [JsonProperty("key")]
+        public string Key { get; set; }
+
+        /// <summary>
+        /// The device name
+        /// </summary>
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The type of the message class
+        /// </summary>
+        [JsonProperty("messageType")]
+        public string MessageType => GetType().Name;
+
+        [JsonProperty("messageBasePath")]
+        public string MessageBasePath { get; set; }
+    }
+
+    /// <summary>
+    /// Base class for state messages that includes the type of message and the implmented interfaces
+    /// </summary>
+    public class DeviceStateMessageBase : DeviceMessageBase
+    {
+        /// <summary>
+        /// The interfaces implmented by the device sending the messsage
+        /// </summary>
+        [JsonProperty("interfaces")]
+        public List<string> Interfaces { get; private set; }
+
+        public void SetInterfaces(List<string> interfaces)
+        {
+            Interfaces = interfaces;
+        }
+    }
+
+    /// <summary>
+    /// Base class for event messages that include the type of message and an event type
+    /// </summary>
+    public abstract class DeviceEventMessageBase : DeviceMessageBase
+    {
+        /// <summary>
+        /// The event type
+        /// </summary>
+        [JsonProperty("eventType")]
+        public string EventType { get; set; }
+    }
+
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/PressAndHoldHandler.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/PressAndHoldHandler.cs
@@ -0,0 +1,116 @@
+using Crestron.SimplSharp;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public static class PressAndHoldHandler
+    {       
+        private const long ButtonHeartbeatInterval = 1000;
+
+        private static readonly Dictionary<string, CTimer> _pushedActions = new Dictionary<string, CTimer>();
+
+        private static readonly Dictionary<string, Action<string, Action<bool>>> _pushedActionHandlers;
+
+        static PressAndHoldHandler()
+        {
+            _pushedActionHandlers = new Dictionary<string, Action<string, Action<bool>>>
+            {
+                {"pressed", AddTimer },
+                {"held", ResetTimer },
+                {"released", StopTimer }
+            };
+        }
+
+        private static void AddTimer(string deviceKey, Action<bool> action)
+        {
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Attempting to add timer for {deviceKey}", deviceKey);
+
+            if (_pushedActions.TryGetValue(deviceKey, out CTimer cancelTimer))
+            {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer for {deviceKey} already exists", deviceKey);
+                return;
+            }
+
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Adding timer for {deviceKey} with due time {dueTime}", deviceKey, ButtonHeartbeatInterval);
+
+            action(true);
+
+            cancelTimer = new CTimer(o =>
+            {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer expired for {deviceKey}", deviceKey);
+
+                action(false);
+
+                _pushedActions.Remove(deviceKey);
+            }, ButtonHeartbeatInterval);
+
+            _pushedActions.Add(deviceKey, cancelTimer);
+        }
+
+        private static void ResetTimer(string deviceKey, Action<bool> action)
+        {
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Attempting to reset timer for {deviceKey}", deviceKey);
+            
+            if (!_pushedActions.TryGetValue(deviceKey, out CTimer cancelTimer))
+            {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer for {deviceKey} not found", deviceKey);
+                return;
+            }
+
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Resetting timer for {deviceKey} with due time {dueTime}", deviceKey, ButtonHeartbeatInterval);
+
+            cancelTimer.Reset(ButtonHeartbeatInterval);
+        }
+
+        private static void StopTimer(string deviceKey, Action<bool> action)
+        {
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Attempting to stop timer for {deviceKey}", deviceKey);
+
+            if (!_pushedActions.TryGetValue(deviceKey, out CTimer cancelTimer)) {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer for {deviceKey} not found", deviceKey);
+                return;
+            }
+
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Stopping timer for {deviceKey} with due time {dueTime}", deviceKey, ButtonHeartbeatInterval);
+
+            action(false);
+            cancelTimer.Stop();
+            _pushedActions.Remove(deviceKey);
+        }
+
+        public static Action<string, Action<bool>> GetPressAndHoldHandler(string value)
+        {
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Getting press and hold handler for {value}", value);
+
+            if (!_pushedActionHandlers.TryGetValue(value, out Action<string, Action<bool>> handler))
+            {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Press and hold handler for {value} not found", value);
+                return null;
+            }
+
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Got handler for {value}", value);
+
+            return handler;
+        }
+
+        public static void HandlePressAndHold(string deviceKey, JToken content, Action<bool> action)
+        {
+            var msg = content.ToObject<MobileControlSimpleContent<string>>();
+
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Handling press and hold message of {type} for {deviceKey}", msg.Value, deviceKey);
+
+            var timerHandler = GetPressAndHoldHandler(msg.Value);
+
+            if (timerHandler == null)
+            {
+                return;
+            }
+
+            timerHandler(deviceKey, action);            
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/RoomEventScheduleMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/RoomEventScheduleMessenger.cs
@@ -0,0 +1,80 @@
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Room.Config;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class RoomEventScheduleMessenger : MessengerBase
+    {
+        private readonly IRoomEventSchedule _room;
+
+
+        public RoomEventScheduleMessenger(string key, string messagePath, IRoomEventSchedule room)
+            : base(key, messagePath, room as Device)
+        {
+            _room = room;
+        }
+
+        #region Overrides of MessengerBase
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            AddAction("/saveScheduledEvents", (id, content) => SaveScheduledEvents(content.ToObject<List<ScheduledEventConfig>>()));
+            AddAction("/status", (id, content) =>
+            {
+                var events = _room.GetScheduledEvents();
+
+                SendFullStatus(events);
+            });
+
+            _room.ScheduledEventsChanged += (sender, args) => SendFullStatus(args.ScheduledEvents);
+        }
+
+        #endregion
+
+        private void SaveScheduledEvents(List<ScheduledEventConfig> events)
+        {
+            foreach (var evt in events)
+            {
+                SaveScheduledEvent(evt);
+            }
+        }
+
+        private void SaveScheduledEvent(ScheduledEventConfig eventConfig)
+        {
+            try
+            {
+                _room.AddOrUpdateScheduledEvent(eventConfig);
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, "Exception saving event: {0}\r\n{1}", ex.Message, ex.StackTrace);
+            }
+        }
+
+        private void SendFullStatus(List<ScheduledEventConfig> events)
+        {
+
+            var message = new RoomEventScheduleStateMessage
+            {
+                ScheduleEvents = events,
+            };
+
+            PostStatusMessage(message);
+        }
+    }
+
+    public class RoomEventScheduleStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("scheduleEvents")]
+        public List<ScheduledEventConfig> ScheduleEvents { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLAtcMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLAtcMessenger.cs
@@ -0,0 +1,163 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Devices.Common.Codec;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    // ReSharper disable once InconsistentNaming
+    public class SIMPLAtcMessenger : MessengerBase
+    {
+        private readonly BasicTriList _eisc;
+
+        public SIMPLAtcJoinMap JoinMap { get; private set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private readonly CodecActiveCallItem _currentCallItem;
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="eisc"></param>
+        /// <param name="messagePath"></param>
+        public SIMPLAtcMessenger(string key, BasicTriList eisc, string messagePath)
+            : base(key, messagePath)
+        {
+            _eisc = eisc;
+
+            JoinMap = new SIMPLAtcJoinMap(201);
+
+            _currentCallItem = new CodecActiveCallItem { Type = eCodecCallType.Audio, Id = "-audio-" };
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void SendFullStatus()
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    calls = GetCurrentCallList(),
+                    currentCallString = _eisc.GetString(JoinMap.CurrentCallName.JoinNumber),
+                    currentDialString = _eisc.GetString(JoinMap.CurrentDialString.JoinNumber),
+                    isInCall = _eisc.GetString(JoinMap.HookState.JoinNumber) == "Connected"
+                })
+            );
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="appServerController"></param>
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            //EISC.SetStringSigAction(SCurrentDialString, s => PostStatusMessage(new { currentDialString = s }));
+
+            _eisc.SetStringSigAction(JoinMap.HookState.JoinNumber, s =>
+            {
+                _currentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
+                //GetCurrentCallList();
+                SendFullStatus();
+            });
+
+            _eisc.SetStringSigAction(JoinMap.CurrentCallNumber.JoinNumber, s =>
+            {
+                _currentCallItem.Number = s;
+                SendCallsList();
+            });
+
+            _eisc.SetStringSigAction(JoinMap.CurrentCallName.JoinNumber, s =>
+            {
+                _currentCallItem.Name = s;
+                SendCallsList();
+            });
+
+            _eisc.SetStringSigAction(JoinMap.CallDirection.JoinNumber, s =>
+            {
+                _currentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
+                SendCallsList();
+            });
+
+            // Add press and holds using helper
+            //Action<string, uint> addPhAction = (s, u) => 
+            //    AppServerController.AddAction(MessagePath + s, new PressAndHoldAction(b => _eisc.SetBool(u, b)));
+
+            // Add straight pulse calls
+            void addAction(string s, uint u) =>
+                AddAction(s, (id, content) => _eisc.PulseBool(u, 100));
+            addAction("/endCallById", JoinMap.EndCall.JoinNumber);
+            addAction("/endAllCalls", JoinMap.EndCall.JoinNumber);
+            addAction("/acceptById", JoinMap.IncomingAnswer.JoinNumber);
+            addAction("/rejectById", JoinMap.IncomingReject.JoinNumber);
+
+            var speeddialStart = JoinMap.SpeedDialStart.JoinNumber;
+            var speeddialEnd = JoinMap.SpeedDialStart.JoinNumber + JoinMap.SpeedDialStart.JoinSpan;
+
+            var speedDialIndex = 1;
+            for (uint i = speeddialStart; i < speeddialEnd; i++)
+            {
+                addAction(string.Format("/speedDial{0}", speedDialIndex), i);
+                speedDialIndex++;
+            }
+
+            // Get status
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+            // Dial on string
+            AddAction("/dial",
+                (id, content) =>
+                {
+                    var msg = content.ToObject<MobileControlSimpleContent<string>>();
+                    _eisc.SetString(JoinMap.CurrentDialString.JoinNumber, msg.Value);
+                });
+            // Pulse DTMF
+            AddAction("/dtmf", (id, content) =>
+            {
+                var s = content.ToObject<MobileControlSimpleContent<string>>();
+
+                var join = JoinMap.Joins[s.Value];
+                if (join != null)
+                {
+                    if (join.JoinNumber > 0)
+                    {
+                        _eisc.PulseBool(join.JoinNumber, 100);
+                    }
+                }
+            });
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void SendCallsList()
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    calls = GetCurrentCallList(),
+                })
+            );
+        }
+
+        /// <summary>
+        /// Turns the 
+        /// </summary>
+        /// <returns></returns>
+        private List<CodecActiveCallItem> GetCurrentCallList()
+        {
+            return _currentCallItem.Status == eCodecCallStatus.Disconnected
+                ? new List<CodecActiveCallItem>()
+                : new List<CodecActiveCallItem> { _currentCallItem };
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLCameraMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLCameraMessenger.cs
@@ -0,0 +1,169 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Devices.Common.Cameras;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    // ReSharper disable once InconsistentNaming
+    public class SIMPLCameraMessenger : MessengerBase
+    {
+        private readonly BasicTriList _eisc;
+
+        private readonly CameraControllerJoinMap _joinMap;
+
+
+        public SIMPLCameraMessenger(string key, BasicTriList eisc, string messagePath, uint joinStart)
+            : base(key, messagePath)
+        {
+            _eisc = eisc;
+
+            _joinMap = new CameraControllerJoinMap(joinStart);
+
+            _eisc.SetUShortSigAction(_joinMap.NumberOfPresets.JoinNumber, u => SendCameraFullMessageObject());
+
+            _eisc.SetBoolSigAction(_joinMap.CameraModeAuto.JoinNumber, b => PostCameraMode());
+            _eisc.SetBoolSigAction(_joinMap.CameraModeManual.JoinNumber, b => PostCameraMode());
+            _eisc.SetBoolSigAction(_joinMap.CameraModeOff.JoinNumber, b => PostCameraMode());
+        }
+
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            AddAction("/fullStatus", (id, content) => SendCameraFullMessageObject());
+
+            // Add press and holds using helper action
+            void addPhAction(string s, uint u) =>
+                AddAction(s, (id, content) => HandleCameraPressAndHold(content, b => _eisc.SetBool(u, b)));
+            addPhAction("/cameraUp", _joinMap.TiltUp.JoinNumber);
+            addPhAction("/cameraDown", _joinMap.TiltDown.JoinNumber);
+            addPhAction("/cameraLeft", _joinMap.PanLeft.JoinNumber);
+            addPhAction("/cameraRight", _joinMap.PanRight.JoinNumber);
+            addPhAction("/cameraZoomIn", _joinMap.ZoomIn.JoinNumber);
+            addPhAction("/cameraZoomOut", _joinMap.ZoomOut.JoinNumber);
+
+            void addAction(string s, uint u) =>
+                AddAction(s, (id, content) => _eisc.PulseBool(u, 100));
+
+            addAction("/cameraModeAuto", _joinMap.CameraModeAuto.JoinNumber);
+            addAction("/cameraModeManual", _joinMap.CameraModeManual.JoinNumber);
+            addAction("/cameraModeOff", _joinMap.CameraModeOff.JoinNumber);
+
+            var presetStart = _joinMap.PresetRecallStart.JoinNumber;
+            var presetEnd = _joinMap.PresetRecallStart.JoinNumber + _joinMap.PresetRecallStart.JoinSpan;
+
+            int presetId = 1;
+            // camera presets
+            for (uint i = presetStart; i <= presetEnd; i++)
+            {
+                addAction("/cameraPreset" + (presetId), i);
+                presetId++;
+            }
+        }
+
+        private void HandleCameraPressAndHold(JToken content, Action<bool> cameraAction)
+        {
+            var state = content.ToObject<MobileControlSimpleContent<string>>();
+
+            var timerHandler = PressAndHoldHandler.GetPressAndHoldHandler(state.Value);
+            if (timerHandler == null)
+            {
+                return;
+            }
+
+            timerHandler(state.Value, cameraAction);
+
+            cameraAction(state.Value.Equals("true", StringComparison.InvariantCultureIgnoreCase));
+        }
+
+#if SERIES4
+        public void CustomUnregsiterWithAppServer(IMobileControl appServerController)
+#else   
+        public void CustomUnregsiterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            appServerController.RemoveAction(MessagePath + "/fullStatus");
+
+            appServerController.RemoveAction(MessagePath + "/cameraUp");
+            appServerController.RemoveAction(MessagePath + "/cameraDown");
+            appServerController.RemoveAction(MessagePath + "/cameraLeft");
+            appServerController.RemoveAction(MessagePath + "/cameraRight");
+            appServerController.RemoveAction(MessagePath + "/cameraZoomIn");
+            appServerController.RemoveAction(MessagePath + "/cameraZoomOut");
+            appServerController.RemoveAction(MessagePath + "/cameraModeAuto");
+            appServerController.RemoveAction(MessagePath + "/cameraModeManual");
+            appServerController.RemoveAction(MessagePath + "/cameraModeOff");
+
+            _eisc.SetUShortSigAction(_joinMap.NumberOfPresets.JoinNumber, null);
+
+            _eisc.SetBoolSigAction(_joinMap.CameraModeAuto.JoinNumber, null);
+            _eisc.SetBoolSigAction(_joinMap.CameraModeManual.JoinNumber, null);
+            _eisc.SetBoolSigAction(_joinMap.CameraModeOff.JoinNumber, null);
+        }
+
+        /// <summary>
+        /// Helper method to update the full status of the camera
+        /// </summary>
+        private void SendCameraFullMessageObject()
+        {
+            var presetList = new List<CameraPreset>();
+
+            // Build a list of camera presets based on the names and count 
+            if (_eisc.GetBool(_joinMap.SupportsPresets.JoinNumber))
+            {
+                var presetStart = _joinMap.PresetLabelStart.JoinNumber;
+                var presetEnd = _joinMap.PresetLabelStart.JoinNumber + _joinMap.NumberOfPresets.JoinNumber;
+
+                var presetId = 1;
+                for (uint i = presetStart; i < presetEnd; i++)
+                {
+                    var presetName = _eisc.GetString(i);
+                    var preset = new CameraPreset(presetId, presetName, string.IsNullOrEmpty(presetName), true);
+                    presetList.Add(preset);
+                    presetId++;
+                }
+            }
+
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    cameraMode = GetCameraMode(),
+                    hasPresets = _eisc.GetBool(_joinMap.SupportsPresets.JoinNumber),
+                    presets = presetList
+                })
+            );
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void PostCameraMode()
+        {
+            PostStatusMessage(JToken.FromObject(new
+            {
+                cameraMode = GetCameraMode()
+            }));
+        }
+
+        /// <summary>
+        /// Computes the current camera mode
+        /// </summary>
+        /// <returns></returns>
+        private string GetCameraMode()
+        {
+            string m;
+            if (_eisc.GetBool(_joinMap.CameraModeAuto.JoinNumber)) m = eCameraControlMode.Auto.ToString().ToLower();
+            else if (_eisc.GetBool(_joinMap.CameraModeManual.JoinNumber))
+                m = eCameraControlMode.Manual.ToString().ToLower();
+            else m = eCameraControlMode.Off.ToString().ToLower();
+            return m;
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLDirectRouteMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLDirectRouteMessenger.cs
@@ -0,0 +1,132 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class SimplDirectRouteMessenger : MessengerBase
+    {
+        private readonly BasicTriList _eisc;
+
+        public MobileControlSIMPLRunDirectRouteActionJoinMap JoinMap { get; private set; }
+
+        public Dictionary<string, DestinationListItem> DestinationList { get; set; }
+
+        public SimplDirectRouteMessenger(string key, BasicTriList eisc, string messagePath) : base(key, messagePath)
+        {
+            _eisc = eisc;
+
+            JoinMap = new MobileControlSIMPLRunDirectRouteActionJoinMap(851);
+
+            DestinationList = new Dictionary<string, DestinationListItem>();
+        }
+
+        #region Overrides of MessengerBase
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController controller)
+#endif
+        {
+            Debug.Console(2, "********** Direct Route Messenger CustomRegisterWithAppServer **********");
+
+
+            //Audio source
+            _eisc.SetStringSigAction(JoinMap.SourceForDestinationAudio.JoinNumber,
+                s => PostStatusMessage(JToken.FromObject(new
+                {
+                    selectedSourceKey = s,
+                })
+                ));
+
+            AddAction("/programAudio/selectSource", (id, content) =>
+            {
+                var msg = content.ToObject<MobileControlSimpleContent<string>>();
+
+                _eisc.StringInput[JoinMap.SourceForDestinationAudio.JoinNumber].StringValue = msg.Value;
+            });
+
+            AddAction("/fullStatus", (id, content) =>
+            {
+                foreach (var dest in DestinationList)
+                {
+                    var key = dest.Key;
+                    var item = dest.Value;
+
+                    var source =
+                        _eisc.StringOutput[(uint)(JoinMap.SourceForDestinationJoinStart.JoinNumber + item.Order)].StringValue;
+
+                    UpdateSourceForDestination(source, key);
+                }
+
+                PostStatusMessage(JToken.FromObject(new
+                {
+                    selectedSourceKey = _eisc.StringOutput[JoinMap.SourceForDestinationAudio.JoinNumber].StringValue
+                })
+                );
+
+                PostStatusMessage(JToken.FromObject(new
+                {
+                    advancedSharingActive = _eisc.BooleanOutput[JoinMap.AdvancedSharingModeFb.JoinNumber].BoolValue
+                })
+                );
+            });
+
+            AddAction("/advancedSharingMode", (id, content) =>
+            {
+                var b = content.ToObject<MobileControlSimpleContent<bool>>();
+
+                Debug.Console(1, "Current Sharing Mode: {2}\r\nadvanced sharing mode: {0} join number: {1}", b.Value,
+                    JoinMap.AdvancedSharingModeOn.JoinNumber,
+                    _eisc.BooleanOutput[JoinMap.AdvancedSharingModeOn.JoinNumber].BoolValue);
+
+                _eisc.SetBool(JoinMap.AdvancedSharingModeOn.JoinNumber, b.Value);
+                _eisc.SetBool(JoinMap.AdvancedSharingModeOff.JoinNumber, !b.Value);
+                _eisc.PulseBool(JoinMap.AdvancedSharingModeToggle.JoinNumber);
+            });
+
+            _eisc.SetBoolSigAction(JoinMap.AdvancedSharingModeFb.JoinNumber,
+                (b) => PostStatusMessage(JToken.FromObject(new
+                {
+                    advancedSharingActive = b
+                })
+                ));
+        }
+
+        public void RegisterForDestinationPaths()
+        {
+            //handle routing feedback from SIMPL
+            foreach (var destination in DestinationList)
+            {
+                var key = destination.Key;
+                var dest = destination.Value;
+
+                _eisc.SetStringSigAction((uint)(JoinMap.SourceForDestinationJoinStart.JoinNumber + dest.Order),
+                    s => UpdateSourceForDestination(s, key));
+
+                AddAction($"/{key}/selectSource", (id, content) =>
+                {
+                    var s = content.ToObject<MobileControlSimpleContent<string>>();
+
+                    _eisc.StringInput[(uint)(JoinMap.SourceForDestinationJoinStart.JoinNumber + dest.Order)].StringValue = s.Value;
+                });
+            }
+        }
+
+        #endregion
+
+        private void UpdateSourceForDestination(string sourceKey, string destKey)
+        {
+            PostStatusMessage(JToken.FromObject(new
+            {
+                selectedSourceKey = sourceKey
+            }), $"{MessagePath}/{destKey}/currentSource");
+        }
+    }
+
+
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLRouteMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLRouteMessenger.cs
@@ -0,0 +1,77 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+
+    public class SIMPLRouteMessenger : MessengerBase
+    {
+        private readonly BasicTriList _eisc;
+
+        private readonly uint _joinStart;
+
+        public class StringJoin
+        {
+            /// <summary>
+            /// 1
+            /// </summary>
+            public const uint CurrentSource = 1;
+        }
+
+        public SIMPLRouteMessenger(string key, BasicTriList eisc, string messagePath, uint joinStart)
+            : base(key, messagePath)
+        {
+            _eisc = eisc;
+            _joinStart = joinStart - 1;
+
+            _eisc.SetStringSigAction(_joinStart + StringJoin.CurrentSource, SendRoutingFullMessageObject);
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            AddAction("/fullStatus",
+                (id, content) => SendRoutingFullMessageObject(_eisc.GetString(_joinStart + StringJoin.CurrentSource)));
+
+            AddAction("/source", (id, content) =>
+            {
+                var c = content.ToObject<SourceSelectMessageContent>();
+
+                _eisc.SetString(_joinStart + StringJoin.CurrentSource, c.SourceListItemKey);
+            });
+        }
+
+#if SERIES4
+        public void CustomUnregsiterWithAppServer(IMobileControl appServerController)
+#else
+        public void CustomUnregsiterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            appServerController.RemoveAction(MessagePath + "/fullStatus");
+            appServerController.RemoveAction(MessagePath + "/source");
+
+            _eisc.SetStringSigAction(_joinStart + StringJoin.CurrentSource, null);
+        }
+
+        /// <summary>
+        /// Helper method to update full status of the routing device
+        /// </summary>
+        private void SendRoutingFullMessageObject(string sourceKey)
+        {
+            if (string.IsNullOrEmpty(sourceKey))
+                sourceKey = "none";
+
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    selectedSourceKey = sourceKey
+                })
+            );
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLVtcMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLVtcMessenger.cs
@@ -0,0 +1,480 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Devices.Common.Cameras;
+using PepperDash.Essentials.Devices.Common.Codec;
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    // ReSharper disable once InconsistentNaming
+    public class SIMPLVtcMessenger : MessengerBase
+    {
+        private readonly BasicTriList _eisc;
+
+        public SIMPLVtcJoinMap JoinMap { get; private set; }
+
+        private readonly CodecActiveCallItem _currentCallItem;
+
+        private CodecActiveCallItem _incomingCallItem;
+
+        private ushort _previousDirectoryLength = 701;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="eisc"></param>
+        /// <param name="messagePath"></param>
+        public SIMPLVtcMessenger(string key, BasicTriList eisc, string messagePath)
+            : base(key, messagePath)
+        {
+            _eisc = eisc;
+
+            JoinMap = new SIMPLVtcJoinMap(1001);
+
+            _currentCallItem = new CodecActiveCallItem { Type = eCodecCallType.Video, Id = "-video-" };
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="appServerController"></param>
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {            
+            _eisc.SetStringSigAction(JoinMap.HookState.JoinNumber, s =>
+            {
+                _currentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
+                PostFullStatus(); // SendCallsList();
+            });
+
+            _eisc.SetStringSigAction(JoinMap.CurrentCallNumber.JoinNumber, s =>
+            {
+                _currentCallItem.Number = s;
+                PostCallsList();
+            });
+
+            _eisc.SetStringSigAction(JoinMap.CurrentCallName.JoinNumber, s =>
+            {
+                _currentCallItem.Name = s;
+                PostCallsList();
+            });
+
+            _eisc.SetStringSigAction(JoinMap.CallDirection.JoinNumber, s =>
+            {
+                _currentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
+                PostCallsList();
+            });
+
+            _eisc.SetBoolSigAction(JoinMap.IncomingCall.JoinNumber, b =>
+            {
+                if (b)
+                {
+                    var ica = new CodecActiveCallItem
+                    {
+                        Direction = eCodecCallDirection.Incoming,
+                        Id = "-video-incoming",
+                        Name = _eisc.GetString(JoinMap.IncomingCallName.JoinNumber),
+                        Number = _eisc.GetString(JoinMap.IncomingCallNumber.JoinNumber),
+                        Status = eCodecCallStatus.Ringing,
+                        Type = eCodecCallType.Video
+                    };
+                    _incomingCallItem = ica;
+                }
+                else
+                {
+                    _incomingCallItem = null;
+                }
+                PostCallsList();
+            });
+
+            _eisc.SetStringSigAction(JoinMap.IncomingCallName.JoinNumber, s =>
+                {
+                    if (_incomingCallItem != null)
+                    {
+                        _incomingCallItem.Name = s;
+                        PostCallsList();
+                    }
+                });
+
+            _eisc.SetStringSigAction(JoinMap.IncomingCallNumber.JoinNumber, s =>
+            {
+                if (_incomingCallItem != null)
+                {
+                    _incomingCallItem.Number = s;
+                    PostCallsList();
+                }
+            });
+
+            _eisc.SetBoolSigAction(JoinMap.CameraSupportsAutoMode.JoinNumber, b => PostStatusMessage(JToken.FromObject(new
+            {
+                cameraSupportsAutoMode = b
+            })));
+            _eisc.SetBoolSigAction(JoinMap.CameraSupportsOffMode.JoinNumber, b => PostStatusMessage(JToken.FromObject(new
+            {
+                cameraSupportsOffMode = b
+            })));
+
+            // Directory insanity
+            _eisc.SetUShortSigAction(JoinMap.DirectoryRowCount.JoinNumber, u =>
+            {
+                // The length of the list comes in before the list does.
+                // Splice the sig change operation onto the last string sig that will be changing
+                // when the directory entries make it through.
+                if (_previousDirectoryLength > 0)
+                {
+                    _eisc.ClearStringSigAction(JoinMap.DirectoryEntriesStart.JoinNumber + _previousDirectoryLength - 1);
+                }
+                _eisc.SetStringSigAction(JoinMap.DirectoryEntriesStart.JoinNumber + u - 1, s => PostDirectory());
+                _previousDirectoryLength = u;
+            });
+
+            _eisc.SetStringSigAction(JoinMap.DirectoryEntrySelectedName.JoinNumber, s => PostStatusMessage(JToken.FromObject(new
+            {
+                directoryContactSelected = new
+                {
+                    name = _eisc.GetString(JoinMap.DirectoryEntrySelectedName.JoinNumber),
+                }
+            })));
+
+            _eisc.SetStringSigAction(JoinMap.DirectoryEntrySelectedNumber.JoinNumber, s => PostStatusMessage(JToken.FromObject(new
+            {
+                directoryContactSelected = new
+                {
+                    number = _eisc.GetString(JoinMap.DirectoryEntrySelectedNumber.JoinNumber),
+                }
+            })));
+
+            _eisc.SetStringSigAction(JoinMap.DirectorySelectedFolderName.JoinNumber, s => PostStatusMessage(JToken.FromObject(new
+            {
+                directorySelectedFolderName = _eisc.GetString(JoinMap.DirectorySelectedFolderName.JoinNumber)
+            })));
+
+            _eisc.SetSigTrueAction(JoinMap.CameraModeAuto.JoinNumber, PostCameraMode);
+            _eisc.SetSigTrueAction(JoinMap.CameraModeManual.JoinNumber, PostCameraMode);
+            _eisc.SetSigTrueAction(JoinMap.CameraModeOff.JoinNumber, PostCameraMode);
+
+            _eisc.SetBoolSigAction(JoinMap.CameraSelfView.JoinNumber, b => PostStatusMessage(JToken.FromObject(new
+            {
+                cameraSelfView = b
+            })));
+
+            _eisc.SetUShortSigAction(JoinMap.CameraNumberSelect.JoinNumber, u => PostSelectedCamera());
+
+
+            // Add press and holds using helper action
+            void addPhAction(string s, uint u) =>
+                AddAction(s, (id, content) => HandleCameraPressAndHold(content, b => _eisc.SetBool(u, b)));
+            addPhAction("/cameraUp", JoinMap.CameraTiltUp.JoinNumber);
+            addPhAction("/cameraDown", JoinMap.CameraTiltDown.JoinNumber);
+            addPhAction("/cameraLeft", JoinMap.CameraPanLeft.JoinNumber);
+            addPhAction("/cameraRight", JoinMap.CameraPanRight.JoinNumber);
+            addPhAction("/cameraZoomIn", JoinMap.CameraZoomIn.JoinNumber);
+            addPhAction("/cameraZoomOut", JoinMap.CameraZoomOut.JoinNumber);
+
+            // Add straight pulse calls using helper action
+            void addAction(string s, uint u) =>
+                AddAction(s, (id, content) => _eisc.PulseBool(u, 100));
+            addAction("/endCallById", JoinMap.EndCall.JoinNumber);
+            addAction("/endAllCalls", JoinMap.EndCall.JoinNumber);
+            addAction("/acceptById", JoinMap.IncomingAnswer.JoinNumber);
+            addAction("/rejectById", JoinMap.IncomingReject.JoinNumber);
+
+            var speeddialStart = JoinMap.SpeedDialStart.JoinNumber;
+            var speeddialEnd = JoinMap.SpeedDialStart.JoinNumber + JoinMap.SpeedDialStart.JoinSpan;
+
+            var speedDialIndex = 1;
+            for (uint i = speeddialStart; i < speeddialEnd; i++)
+            {
+                addAction(string.Format("/speedDial{0}", speedDialIndex), i);
+                speedDialIndex++;
+            }
+
+            addAction("/cameraModeAuto", JoinMap.CameraModeAuto.JoinNumber);
+            addAction("/cameraModeManual", JoinMap.CameraModeManual.JoinNumber);
+            addAction("/cameraModeOff", JoinMap.CameraModeOff.JoinNumber);
+            addAction("/cameraSelfView", JoinMap.CameraSelfView.JoinNumber);
+            addAction("/cameraLayout", JoinMap.CameraLayout.JoinNumber);
+
+            AddAction("/cameraSelect", (id, content) =>
+            {
+                var s = content.ToObject<MobileControlSimpleContent<string>>();
+                SelectCamera(s.Value);
+            });
+
+            // camera presets
+            for (uint i = 0; i < 6; i++)
+            {
+                addAction("/cameraPreset" + (i + 1), JoinMap.CameraPresetStart.JoinNumber + i);
+            }
+
+            AddAction("/isReady", (id, content) => PostIsReady());
+            // Get status
+            AddAction("/fullStatus", (id, content) => PostFullStatus());
+            // Dial on string
+            AddAction("/dial", (id, content) =>
+            {
+                var s = content.ToObject<MobileControlSimpleContent<string>>();
+
+                _eisc.SetString(JoinMap.CurrentDialString.JoinNumber, s.Value);
+            });
+            // Pulse DTMF
+            AddAction("/dtmf", (id, content) =>
+            {
+                var s = content.ToObject<MobileControlSimpleContent<string>>();
+                var join = JoinMap.Joins[s.Value];
+                if (join != null)
+                {
+                    if (join.JoinNumber > 0)
+                    {
+                        _eisc.PulseBool(join.JoinNumber, 100);
+                    }
+                }
+            });
+
+            // Directory madness
+            AddAction("/directoryRoot",
+                (id, content) => _eisc.PulseBool(JoinMap.DirectoryRoot.JoinNumber));
+            AddAction("/directoryBack",
+                (id, content) => _eisc.PulseBool(JoinMap.DirectoryFolderBack.JoinNumber));
+            AddAction("/directoryById", (id, content) =>
+            {
+                var s = content.ToObject<MobileControlSimpleContent<string>>();
+                // the id should contain the line number to forward to simpl
+                try
+                {
+                    var u = ushort.Parse(s.Value);
+                    _eisc.SetUshort(JoinMap.DirectorySelectRow.JoinNumber, u);
+                    _eisc.PulseBool(JoinMap.DirectoryLineSelected.JoinNumber);
+                }
+                catch (Exception)
+                {
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Warning,
+                        "/directoryById request contains non-numeric ID incompatible with SIMPL bridge");
+                }
+            });
+            AddAction("/directorySelectContact", (id, content) =>
+            {
+                var s = content.ToObject<MobileControlSimpleContent<string>>();
+                try
+                {
+                    var u = ushort.Parse(s.Value);
+                    _eisc.SetUshort(JoinMap.DirectorySelectRow.JoinNumber, u);
+                    _eisc.PulseBool(JoinMap.DirectoryLineSelected.JoinNumber);
+                }
+                catch
+                {
+                    Debug.Console(2, this, "Error parsing contact from {0} for path /directorySelectContact", s);
+                }
+            });
+            AddAction("/directoryDialContact",
+                (id, content) => _eisc.PulseBool(JoinMap.DirectoryDialSelectedLine.JoinNumber));
+            AddAction("/getDirectory", (id, content) =>
+            {
+                if (_eisc.GetUshort(JoinMap.DirectoryRowCount.JoinNumber) > 0)
+                {
+                    PostDirectory();
+                }
+                else
+                {
+                    _eisc.PulseBool(JoinMap.DirectoryRoot.JoinNumber);
+                }
+            });
+        }
+
+        private void HandleCameraPressAndHold(JToken content, Action<bool> cameraAction)
+        {
+            var state = content.ToObject<MobileControlSimpleContent<string>>();
+
+            var timerHandler = PressAndHoldHandler.GetPressAndHoldHandler(state.Value);
+            if (timerHandler == null)
+            {
+                return;
+            }
+
+            timerHandler(state.Value, cameraAction);
+
+            cameraAction(state.Value.Equals("true", StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// 
+        private void PostFullStatus()
+        {
+            PostStatusMessage(JToken.FromObject(new
+            {
+                calls = GetCurrentCallList(),
+                cameraMode = GetCameraMode(),
+                cameraSelfView = _eisc.GetBool(JoinMap.CameraSelfView.JoinNumber),
+                cameraSupportsAutoMode = _eisc.GetBool(JoinMap.CameraSupportsAutoMode.JoinNumber),
+                cameraSupportsOffMode = _eisc.GetBool(JoinMap.CameraSupportsOffMode.JoinNumber),
+                currentCallString = _eisc.GetString(JoinMap.CurrentCallNumber.JoinNumber),
+                currentDialString = _eisc.GetString(JoinMap.CurrentDialString.JoinNumber),
+                directoryContactSelected = new
+                {
+                    name = _eisc.GetString(JoinMap.DirectoryEntrySelectedName.JoinNumber),
+                    number = _eisc.GetString(JoinMap.DirectoryEntrySelectedNumber.JoinNumber)
+                },
+                directorySelectedFolderName = _eisc.GetString(JoinMap.DirectorySelectedFolderName.JoinNumber),
+                isInCall = _eisc.GetString(JoinMap.HookState.JoinNumber) == "Connected",
+                hasDirectory = true,
+                hasDirectorySearch = false,
+                hasRecents = !_eisc.BooleanOutput[502].BoolValue,
+                hasCameras = true,
+                showCamerasWhenNotInCall = _eisc.BooleanOutput[503].BoolValue,
+                selectedCamera = GetSelectedCamera(),
+            }));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void PostDirectory()
+        {
+            var u = _eisc.GetUshort(JoinMap.DirectoryRowCount.JoinNumber);
+            var items = new List<object>();
+            for (uint i = 0; i < u; i++)
+            {
+                var name = _eisc.GetString(JoinMap.DirectoryEntriesStart.JoinNumber + i);
+                var id = (i + 1).ToString();
+                // is folder or contact?
+                if (name.StartsWith("[+]"))
+                {
+                    items.Add(new
+                    {
+                        folderId = id,
+                        name
+                    });
+                }
+                else
+                {
+                    items.Add(new
+                    {
+                        contactId = id,
+                        name
+                    });
+                }
+            }
+
+            var directoryMessage = new
+            {
+                currentDirectory = new
+                {
+                    isRootDirectory = _eisc.GetBool(JoinMap.DirectoryIsRoot.JoinNumber),
+                    directoryResults = items
+                }
+            };
+            PostStatusMessage(JToken.FromObject(directoryMessage));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void PostCameraMode()
+        {
+            PostStatusMessage(JToken.FromObject(new
+            {
+                cameraMode = GetCameraMode()
+            }));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private string GetCameraMode()
+        {
+            string m;
+            if (_eisc.GetBool(JoinMap.CameraModeAuto.JoinNumber)) m = eCameraControlMode.Auto.ToString().ToLower();
+            else if (_eisc.GetBool(JoinMap.CameraModeManual.JoinNumber))
+                m = eCameraControlMode.Manual.ToString().ToLower();
+            else m = eCameraControlMode.Off.ToString().ToLower();
+            return m;
+        }
+
+        private void PostSelectedCamera()
+        {
+            PostStatusMessage(JToken.FromObject(new
+            {
+                selectedCamera = GetSelectedCamera()
+            }));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private string GetSelectedCamera()
+        {
+            var num = _eisc.GetUshort(JoinMap.CameraNumberSelect.JoinNumber);
+            string m;
+            if (num == 100)
+            {
+                m = "cameraFar";
+            }
+            else
+            {
+                m = "camera" + num;
+            }
+            return m;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void PostIsReady()
+        {
+            PostStatusMessage(JToken.FromObject(new
+            {
+                isReady = true
+            }));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void PostCallsList()
+        {
+            PostStatusMessage(JToken.FromObject(new
+            {
+                calls = GetCurrentCallList(),
+            }));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="s"></param>
+        private void SelectCamera(string s)
+        {
+            var cam = s.Substring(6);
+            _eisc.SetUshort(JoinMap.CameraNumberSelect.JoinNumber,
+                (ushort)(cam.ToLower() == "far" ? 100 : ushort.Parse(cam)));
+        }
+
+        /// <summary>
+        /// Turns the 
+        /// </summary>
+        /// <returns></returns>
+        private List<CodecActiveCallItem> GetCurrentCallList()
+        {
+            var list = new List<CodecActiveCallItem>();
+            if (_currentCallItem.Status != eCodecCallStatus.Disconnected)
+            {
+                list.Add(_currentCallItem);
+            }
+            if (_eisc.GetBool(JoinMap.IncomingCall.JoinNumber))
+            {
+                list.Add(_incomingCallItem);
+            }
+            return list;
+        }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ShadeBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ShadeBaseMessenger.cs
@@ -0,0 +1,105 @@
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.Shades;
+using System;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class IShadesOpenCloseStopMessenger : MessengerBase
+    {
+        private readonly IShadesOpenCloseStop device;
+
+        public IShadesOpenCloseStopMessenger(string key, IShadesOpenCloseStop shades, string messagePath)
+            : base(key, messagePath, shades as Device)
+        {
+            device = shades;
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+
+            AddAction("/shadeUp", (id, content) =>
+                {
+
+                    device.Open();
+
+                });
+
+            AddAction("/shadeDown", (id, content) =>
+                {
+
+                    device.Close();
+
+                });
+
+            var stopDevice = device;
+            if (stopDevice != null)
+            {
+                AddAction("/stopOrPreset", (id, content) =>
+                {
+                    stopDevice.Stop();
+                });
+            }
+
+            if (device is IShadesOpenClosedFeedback feedbackDevice)
+            {
+                feedbackDevice.ShadeIsOpenFeedback.OutputChange += new EventHandler<Core.FeedbackEventArgs>(ShadeIsOpenFeedback_OutputChange);
+                feedbackDevice.ShadeIsClosedFeedback.OutputChange += new EventHandler<Core.FeedbackEventArgs>(ShadeIsClosedFeedback_OutputChange);
+            }
+        }
+
+        private void ShadeIsOpenFeedback_OutputChange(object sender, Core.FeedbackEventArgs e)
+        {
+            var state = new ShadeBaseStateMessage
+            {
+                IsOpen = e.BoolValue
+            };
+
+            PostStatusMessage(state);
+        }
+
+        private void ShadeIsClosedFeedback_OutputChange(object sender, Core.FeedbackEventArgs e)
+        {
+            var state = new ShadeBaseStateMessage
+            {
+                IsClosed = e.BoolValue
+            };
+
+            PostStatusMessage(state);
+        }
+
+
+        private void SendFullStatus()
+        {
+            var state = new ShadeBaseStateMessage();
+
+            if (device is IShadesOpenClosedFeedback feedbackDevice)
+            {
+                state.IsOpen = feedbackDevice.ShadeIsOpenFeedback.BoolValue;
+                state.IsClosed = feedbackDevice.ShadeIsClosedFeedback.BoolValue;
+            }
+
+            PostStatusMessage(state);
+        }
+    }
+
+    public class ShadeBaseStateMessage : DeviceStateMessageBase
+    {
+        [JsonProperty("middleButtonLabel", NullValueHandling = NullValueHandling.Ignore)]
+        public string MiddleButtonLabel { get; set; }
+
+        [JsonProperty("isOpen", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsOpen { get; set; }
+
+        [JsonProperty("isClosed", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsClosed { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SimplMessengerPropertiesConfig.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SimplMessengerPropertiesConfig.cs
@@ -0,0 +1,11 @@
+using PepperDash.Essentials.Core.Bridges;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    /// <summary>
+    /// Properties to configure a SIMPL Messenger
+    /// </summary>
+    public class SimplMessengerPropertiesConfig : EiscApiPropertiesConfig.ApiDevicePropertiesConfig
+    {
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SystemMonitorMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SystemMonitorMessenger.cs
@@ -0,0 +1,116 @@
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.Monitoring;
+using System;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class SystemMonitorMessenger : MessengerBase
+    {
+        private readonly SystemMonitorController systemMonitor;
+
+        public SystemMonitorMessenger(string key, SystemMonitorController sysMon, string messagePath)
+            : base(key, messagePath, sysMon)
+        {
+            systemMonitor = sysMon ?? throw new ArgumentNullException("sysMon");
+
+            systemMonitor.SystemMonitorPropertiesChanged += SysMon_SystemMonitorPropertiesChanged;
+
+            foreach (var p in systemMonitor.ProgramStatusFeedbackCollection)
+            {
+                p.Value.ProgramInfoChanged += ProgramInfoChanged;
+            }
+
+            CrestronConsole.AddNewConsoleCommand(s => SendFullStatusMessage(), "SendFullSysMonStatus",
+                "Sends the full System Monitor Status", ConsoleAccessLevelEnum.AccessOperator);
+        }
+
+        /// <summary>
+        /// Posts the program information message
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ProgramInfoChanged(object sender, ProgramInfoEventArgs e)
+        {
+            if (e.ProgramInfo != null)
+            {
+                //Debug.Console(1, "Posting Status Message: {0}", e.ProgramInfo.ToString());
+                PostStatusMessage(JToken.FromObject(e.ProgramInfo)
+                );
+            }
+        }
+
+        /// <summary>
+        /// Posts the system monitor properties
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SysMon_SystemMonitorPropertiesChanged(object sender, EventArgs e)
+        {
+            SendSystemMonitorStatusMessage();
+        }
+
+        private void SendFullStatusMessage()
+        {
+            SendSystemMonitorStatusMessage();
+
+            foreach (var p in systemMonitor.ProgramStatusFeedbackCollection)
+            {
+                PostStatusMessage(JToken.FromObject(p.Value.ProgramInfo)
+                );
+            }
+        }
+
+        private void SendSystemMonitorStatusMessage()
+        {
+            Debug.Console(1, "Posting System Monitor Status Message.");
+
+            // This takes a while, launch a new thread
+            Task.Run(() => PostStatusMessage(JToken.FromObject(new SystemMonitorStateMessage
+                {
+
+                    TimeZone = systemMonitor.TimeZoneFeedback.IntValue,
+                    TimeZoneName = systemMonitor.TimeZoneTextFeedback.StringValue,
+                    IoControllerVersion = systemMonitor.IoControllerVersionFeedback.StringValue,
+                    SnmpVersion = systemMonitor.SnmpVersionFeedback.StringValue,
+                    BacnetVersion = systemMonitor.BaCnetAppVersionFeedback.StringValue,
+                    ControllerVersion = systemMonitor.ControllerVersionFeedback.StringValue
+                })
+            ));
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            AddAction("/fullStatus", (id, content) => SendFullStatusMessage());
+        }
+    }
+
+    public class SystemMonitorStateMessage
+    {
+        [JsonProperty("timeZone", NullValueHandling = NullValueHandling.Ignore)]
+        public int TimeZone { get; set; }
+
+        [JsonProperty("timeZone", NullValueHandling = NullValueHandling.Ignore)]
+        public string TimeZoneName { get; set; }
+
+        [JsonProperty("timeZone", NullValueHandling = NullValueHandling.Ignore)]
+        public string IoControllerVersion { get; set; }
+
+        [JsonProperty("timeZone", NullValueHandling = NullValueHandling.Ignore)]
+        public string SnmpVersion { get; set; }
+
+        [JsonProperty("timeZone", NullValueHandling = NullValueHandling.Ignore)]
+        public string BacnetVersion { get; set; }
+
+        [JsonProperty("timeZone", NullValueHandling = NullValueHandling.Ignore)]
+        public string ControllerVersion { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/TwoWayDisplayBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/TwoWayDisplayBaseMessenger.cs
@@ -0,0 +1,102 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using TwoWayDisplayBase = PepperDash.Essentials.Devices.Common.Displays.TwoWayDisplayBase;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public class TwoWayDisplayBaseMessenger : MessengerBase
+    {
+        private readonly TwoWayDisplayBase _display;
+
+        public TwoWayDisplayBaseMessenger(string key, string messagePath) : base(key, messagePath)
+        {
+        }
+
+        public TwoWayDisplayBaseMessenger(string key, string messagePath, TwoWayDisplayBase display)
+            : this(key, messagePath)
+        {
+            _display = display;
+        }
+
+        #region Overrides of MessengerBase
+
+        public void SendFullStatus()
+        {
+            var messageObj = new TwoWayDisplayBaseStateMessage
+            {
+                //PowerState = _display.PowerIsOnFeedback.BoolValue,
+                CurrentInput = _display.CurrentInputFeedback.StringValue
+            };
+
+            PostStatusMessage(messageObj);
+        }
+
+#if SERIES4
+        protected override void RegisterActions()
+#else
+        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
+        {
+            base.RegisterActions();
+
+            AddAction("/fullStatus", (id, content) => SendFullStatus());
+
+            //_display.PowerIsOnFeedback.OutputChange += PowerIsOnFeedbackOnOutputChange;
+            _display.CurrentInputFeedback.OutputChange += CurrentInputFeedbackOnOutputChange;
+            _display.IsCoolingDownFeedback.OutputChange += IsCoolingFeedbackOnOutputChange;
+            _display.IsWarmingUpFeedback.OutputChange += IsWarmingFeedbackOnOutputChange;
+        }
+
+        private void CurrentInputFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    currentInput = feedbackEventArgs.StringValue
+                })
+            );            
+        }
+
+
+        //private void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
+        //{
+        //    PostStatusMessage(JToken.FromObject(new
+        //        {
+        //            powerState = feedbackEventArgs.BoolValue
+        //        })
+        //    );
+        //}
+
+        private void IsWarmingFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    isWarming = feedbackEventArgs.BoolValue
+                })
+            );            
+        }
+
+        private void IsCoolingFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
+        {
+            PostStatusMessage(JToken.FromObject(new
+                {
+                    isCooling = feedbackEventArgs.BoolValue
+                })
+            );
+
+            
+        }
+
+        #endregion
+    }
+
+    public class TwoWayDisplayBaseStateMessage : DeviceStateMessageBase
+    {
+        //[JsonProperty("powerState", NullValueHandling = NullValueHandling.Ignore)]
+        //public bool? PowerState { get; set; }
+
+        [JsonProperty("currentInput", NullValueHandling = NullValueHandling.Ignore)]
+        public string CurrentInput { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/VideoCodecBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/VideoCodecBaseMessenger.cs
--- a/src/PepperDash.Essentials.MobileControl.Messengers/MobileControlMessage.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/MobileControlMessage.cs
@@ -0,0 +1,23 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+
+#if SERIES4
+    public class MobileControlMessage : IMobileControlMessage
+#else
+    public class MobileControlMessage
+#endif
+    {
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        [JsonProperty("clientId")]
+        public string ClientId { get; set; }
+
+        [JsonProperty("content")]
+        public JToken Content { get; set; }
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl.Messengers/MobileControlSimpleContent.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/MobileControlSimpleContent.cs
@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.AppServer
+{
+    public class MobileControlSimpleContent<T>
+    {
+        [JsonProperty("value", NullValueHandling = NullValueHandling.Ignore)]
+        public T Value { get; set; }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew Welker	7318dbb04e	ci(force-patch): add skip package check prop	2025-03-24 22:39:52 -05:00
Andrew Welker	f6fdc14059	feat: move MC into Essentials In order to solve some dependency issues that keep cropping up, MC should be moved back into the Essentials repo and loaded automatically on startup. This will allow for all plugins that use the MC Messengers library to use the same version without fear of overwriting a dll due to loading of plugin libraries.	2025-03-24 22:28:27 -05:00
Neil Dorin	3d91723ab0	Merge pull request #1221 from PepperDash/test-ci Cleanup leftover files	2025-03-12 12:55:42 -06:00
Andrew Welker	4dcb3946c5	chore: remove unnecessary files	2025-03-12 13:54:13 -05:00
Andrew Welker	a288fc5890	fix: increment minor version	2025-03-12 13:41:21 -05:00
Andrew Welker	9ef8698387	feat: increment minor version	2025-03-12 13:38:52 -05:00
Andrew Welker	daccf9eb77	chore(force-patch): increment patch version	2025-03-12 13:37:13 -05:00
Neil Dorin	6333443ecb	Merge pull request #1220 from PepperDash/get-beta-build	2025-03-12 12:27:31 -06:00
Andrew Welker	51414e7d26	chore(force-patch): increment patch version	2025-03-12 13:23:40 -05:00
Andrew Welker	3222c73282	Merge pull request #1218 from PepperDash/update-dev Update dev	2025-03-07 11:43:16 -06:00
Andrew Welker	5df7b57c43	Merge pull request #1217 from PepperDash/release Essentials 2.0.0	2025-03-07 11:25:39 -06:00
Andrew Welker	7631c7a8a1	build(force-patch): update PD Core to 2.0.1	2025-03-06 13:53:41 -06:00
Andrew Welker	16e2529378	feat: update to PD Core 2.0.0	2025-03-06 10:04:19 -06:00
Andrew Welker	8f485071c6	chore(force-patch): increment patch version	2025-03-05 18:51:59 -06:00
Andrew Welker	4eabd82878	build(force-update): fix build targets to handle files correctly	2025-03-05 18:50:40 -06:00
Andrew Welker	edfe77cd02	build(force-patch): update PD Core & Crestron libraries	2025-03-05 17:37:48 -06:00
Andrew Welker	fd593d7117	Merge pull request #1216 from PepperDash/release-2.0.0 Merge 2.0.0 stuff into development	2025-03-05 13:51:28 -06:00
Andrew Welker	a141b365ab	fix: add missing using for System.Text	2025-03-05 13:40:38 -06:00
Andrew Welker	68ddd76ba5	chore!: update version to 2.0.0 BREAKING CHANGE: remove support for .NET 6 for Essentials 2.0.0	2025-03-05 13:33:49 -06:00
Andrew Welker	9330ebeae2	chore: remove references to Essentials Template UI	2025-03-05 13:32:21 -06:00
Andrew Welker	b398e73024	chore!: remove .NET 6 support for v2.0.0 BREAKING_CHANGE: remove .NET 6 support for v2.0.0	2025-03-05 13:26:50 -06:00
Andrew Welker	7a2b2eece6	ci(force-patch): use same workflow as PD Core for building	2025-03-05 13:24:28 -06:00
Andrew Welker	543176bb08	Merge branch 'development' into release-2.0.0	2025-03-05 13:07:51 -06:00
Jason T Alborough	237fff5398	Merge pull request #1214 from PepperDash/feature-2.0.0/concurrent-routing-issues Fix issues with concurrent routing actions	2025-02-20 13:19:56 -05:00
Andrew Welker	b2eab21fbd	Merge pull request #1211 from PepperDash/hotfix-2.0.0/room-combiner-syncronous-events fix: improve error handling and await device actions in RoomCombinati…	2025-02-19 17:20:59 -06:00
Andrew Welker	f2545fb1cf	Merge pull request #1212 from PepperDash/feature-2.0.0/versiport-room-combiner Enable using Versiports with Room Combiner	2025-02-19 17:20:40 -06:00
Andrew Welker	27072e3475	fix: #1213 remove key from GenericSoftCodec routing port keys	2025-02-19 17:10:18 -06:00
Andrew Welker	e4755ed9df	Merge branch 'feature-2.0.0/concurrent-routing-issues' of https://github.com/PepperDash/Essentials into feature-2.0.0/concurrent-routing-issues	2025-02-19 17:00:45 -06:00
Andrew Welker	316867caf8	chore: update to PD Core 2.0.0-alpha-451 Catch the `SshOperationTimeoutException` and handle it differently.	2025-02-19 16:49:22 -06:00
jtalborough	d8fd774324	Merge branch 'hotfix-2.0.0/room-combiner-syncronous-events' into feature-2.0.0/concurrent-routing-issues	2025-02-19 15:11:46 -05:00
Andrew Welker	e0058d8cfe	chore: update PD Core to 2.0.0-alpha-450 Updated to Renci for SSH	2025-02-19 13:24:52 -06:00
Andrew Welker	a055d06bc6	chore: add some logging for route queue processing	2025-02-19 11:18:00 -06:00
Andrew Welker	66cb592c70	chore: add missing curly brace	2025-02-19 11:10:35 -06:00
Andrew Welker	d53a5607e2	chore: reorg methos in routing Extensions class	2025-02-19 11:07:41 -06:00
Andrew Welker	34f59f1410	fix: move ReleaseRoute & RunRouteRequests to use a queue	2025-02-19 11:06:56 -06:00
Andrew Welker	261779d4c4	fix: actually log exception correctly	2025-02-18 14:04:30 -06:00
Andrew Welker	30d5e2b081	fix: add more exception handling Also add null check for `AddRouteDescriptor` method	2025-02-18 14:00:53 -06:00
Andrew Welker	5516ed16c3	fix: use null instead of empty string to make it clearer what's happening	2025-02-18 12:02:52 -06:00
Andrew Welker	8108b9dfdb	fix: attempt to get better logging for exception Fixed some issues with log messages that were not formatted correctly for Serilog.	2025-02-18 11:59:26 -06:00
Nick Genovese	fb4f1482c7	fix: small null check in the release and make route method	2025-01-31 19:33:31 -05:00
Nick Genovese	54dcb5de08	feat: implement IPartitionStateProvider to Generic VersaPortInput	2025-01-30 15:21:12 -05:00
jtalborough	4ef481375c	fix: improve error handling and await device actions in RoomCombinationScenario	2025-01-28 09:00:21 -05:00
Nick Genovese	d8a88b2a07	Merge branch 'development-2.0.0' into feature-2.0.0/emergencyOSD	2025-01-10 07:31:35 -05:00
Andrew Welker	cc724ddf19	Merge pull request #1210 from PepperDash/hotfix-2.0.0/release-routes-clears-the-routes Hotfix 2.0.0/release routes clears the routes	2024-12-30 13:33:54 -06:00
Nick Genovese	e29e800d9d	fix: now pushes the tag whenever not rc	2024-12-10 07:52:43 -05:00
Nick Genovese	134e8ba02e	fix: remove null route when releasing route	2024-12-10 07:44:10 -05:00
Neil Dorin	a83ba444d3	Merge pull request #1209 from PepperDash/feature-2.0.0/more-cooldown-fixes	2024-11-22 08:34:13 -07:00
Andrew Welker	f4c5e6fbeb	fix: remove event sub for route request When route requests made during a destination's cooldown cycle were handled, the event subscription was NOT being removed, resulting in the request being run on EVERY subsequent cooldown complete event.	2024-11-22 09:14:07 -06:00
Andrew Welker	35d7994cc8	Merge pull request #1208 from PepperDash/feature-2.0.0/cooldown-exception fix: add try/catch for routing cooldown handler	2024-11-20 15:52:24 -06:00
Andrew Welker	c3e9d654c9	fix: add try/catch for routing cooldown handler Fixed log statement to handle when a value is null	2024-11-20 15:47:33 -06:00
Andrew Knous	f68b1e9e49	feat: cleans up code, adds versiport comment, changes ShowEmergencyMessage arg name to "url"	2024-11-19 09:19:48 -08:00
Andrew Knous	cd81b8af73	feat: adds roomKey to ShowEmergencyMessage	2024-11-14 17:00:21 -05:00
Andrew Knous	cd52c245a6	feat: adds emergency OSD support	2024-11-14 16:23:31 -05:00
Neil Dorin	0b60f53d0e	feat: Adds IEssentialsRoomEmergency interface and implements on contact closure device to provide state	2024-11-13 12:15:25 -07:00
Andrew Welker	ffed2dea8a	Merge pull request #1206 from PepperDash/feature-2.0.0/catv-presets docs: adds debug statement to print preset count	2024-10-31 09:54:47 -05:00
Andrew Welker	936dce2046	Merge pull request #1204 from PepperDash/feature-2.0.0/fix-version-info feat: adds sdi in/out port names	2024-10-31 09:53:46 -05:00
Andrew Welker	b33704eabe	Merge pull request #1203 from PepperDash/feature-2.0.0/bridge-issues fix: joins in join maps get added correctly to a bridge	2024-10-30 13:27:25 -05:00
Andrew Welker	aca6fe9af5	chore: remove extraneous call	2024-10-30 13:20:43 -05:00
Andrew Welker	332faaa9cc	fix: joins in join maps get added correctly to a bridge When Essentials moved to using `System.Reflection` instead of the Crestron classes, there were some leftover `GetType` calls that were no longer necessary. These extra calls were preventing things from getting the correct type. Join Map printing was also fixed to print out in an actual readable fashion.	2024-10-30 13:18:36 -05:00
Nick Genovese	4449077a39	Merge pull request #1202 from PepperDash/feature-2.0.0/display-feedback-fix Set CurrentSourceKey correctly & in the correct order	2024-10-30 11:32:29 -04:00
Andrew Welker	86ba9e0f16	fix: set currentSourceKey & currentSource in order	2024-10-30 10:19:55 -05:00
Andrew Welker	db2d8a213d	fix: get order of source & source key correct	2024-10-29 10:59:26 -05:00
Andrew Welker	590e16298c	fix: use correct key for destination `CurrentSourceInfoKey`	2024-10-28 16:41:30 -05:00
Andrew Welker	1a11e9019c	Merge pull request #1201 from PepperDash/feature-2.0.0/routing-feedback-manager-nullref Feature 2.0.0/routing feedback manager nullref	2024-10-25 08:33:46 -05:00
Nick Genovese	0e16dff90c	fix: checks the routing output port for null	2024-10-24 20:52:24 -04:00
Andrew Welker	d11827bc7b	fix: remove verbose logging for feedback manager	2024-10-18 15:04:08 -05:00
Andrew Welker	631dd2b00d	fix: check for nulls in SwitchingDevice property	2024-10-18 11:09:15 -05:00
Andrew Welker	639cd2abfb	Merge pull request #1197 from PepperDash/feature-2.0.0/add-cpz-to-builds Feature 2.0.0/add cpz to builds	2024-10-18 10:46:05 -05:00
Andrew Welker	f04f70495f	fix: check for nulls in route switch descriptors	2024-10-18 10:43:53 -05:00
Neil Dorin	fa38e8a9a8	feat: Adds mechanism to track initialization status of EssentialsDevice as well as an event on DeviceManager to notify when all devices initialized. Room combiner now waits for all initialize before setting current scenario.	2024-10-04 10:33:09 -06:00
Neil Dorin	f351c036ed	Merge branch 'feature-2.0.0/temp-humidity-interfaces' into feature-2.0.0/generic-sink-fix	2024-09-26 15:04:34 -06:00
Neil Dorin	0a7da79356	fix: Allows both BytesReceived and TextReceived to both fire on the ComPortController	2024-09-26 15:03:31 -06:00
Andrew Welker	82ebf45921	fix: use correct class for generic sink factory	2024-09-26 08:44:27 -05:00
Neil Dorin	d0dbe986f3	feat: Adds ITemperatureSensor and IHumiditySensor interfaces	2024-09-13 13:17:51 -06:00
Neil Dorin	aa503f3b29	feat: Allows for the ItemKey to be left undefined or empty and the ParentDeviceKey to be used on it's own instead.	2024-08-28 13:16:27 -06:00
Neil Dorin	90251d92df	fix: adds condition to handle legacy and current portal URL structures and adds null check for getting list types in basic config helper methods	2024-08-26 12:47:31 -06:00
jtalborough	778af651d0	feature: adds pack for release builds	2024-08-05 10:40:33 -04:00
jtalborough	2e31719a84	fix: artifact path	2024-08-05 10:39:04 -04:00
jtalborough	a96fb21898	feature: add dotnet pack	2024-08-05 09:52:57 -04:00
jtalborough	3f45372e1e	feature: add cpz test	2024-08-02 15:55:38 -04:00
jtalborough	60dbaf547d	fix: artifact path	2024-08-02 11:00:07 -04:00
Andrew Welker	941e537d53	Merge pull request #1196 from PepperDash/feature-2.0.0/routing-cooldown-fixes Feature 2.0.0/routing cooldown fixes	2024-08-01 15:36:36 -04:00
Andrew Welker	f7c5e18af8	fix: add input port matching to route descriptors	2024-07-26 11:19:43 -05:00
Andrew Welker	ab73bbf979	fix: remove call to remove routerequest The routerequest is being removed if the route is successfully made after the display has cooled down. This was an extraneous removal	2024-07-26 06:53:18 -05:00
Andrew Welker	1fb1947158	fix: ReleaseRoute callse `ExecuteSwitch` with null for input selector Most devices that implement IRouting will now need to handle the possiblity of a null as the input selector, with the idea being that a null input selector should clear the route to whatever device is selected as the input selector. This may change to a typed value in the future.	2024-07-26 06:51:45 -05:00
Andrew Welker	e374f7b50f	fix: add some options to destination type enum	2024-07-26 06:48:23 -05:00
Andrew Welker	7a263a644a	fix: devcommstatus response now prints correctly	2024-07-26 06:47:48 -05:00
Andrew Welker	97bd30e9c9	fix: add async/await patterns for activation/deactivation	2024-07-26 06:47:13 -05:00
Neil Dorin	63c653b21f	docs: adds debug statement to print preset count	2024-07-24 10:39:52 -06:00
Andrew Welker	c56841d95b	fix: attempt to catch a null ref happening in the Route Descriptor	2024-07-22 11:19:34 -05:00
Andrew Welker	64d6df70b0	fix: deactivate all rooms on startup As part of the Essentials startup process, ALL rooms are activated, meaning there are unnecessary rooms activated. Deactiving them all prior to determining a combination scenario helps keep unecessary activity from happening.	2024-07-22 11:19:08 -05:00
Andrew Welker	d970d806c9	fix: add mutex to prevent multiple scenarios from running at once	2024-07-19 13:09:47 -05:00
Andrew Welker	5a9b876d80	fix: remove route request once the request has been handled	2024-07-18 13:46:40 -05:00
Andrew Welker	fb60683af6	feat: add async method for devjson	2024-07-18 13:44:49 -05:00
Andrew Welker	e7d7b8638e	Merge pull request #1195 from PepperDash/feature/video-wall-mode Feature/video wall mode	2024-07-12 09:20:25 -04:00
Colin Denig	0eb2436fa0	fix: videowall mode raw fb for dm-rmc-4kz-scaler-c	2024-07-11 15:42:25 -04:00
Colin Denig	192991cc65	fix(wip): DmRmc4kzScalerC VideoWallModeFb not working - reverted PepperDashCode ref for Essentials_DM to unversioned and latest release - fixed Scaler_OutputChange function params - added instantiation of VideoWallModeRawFeedback - feedback event trigger causing null ref exception TODO: -[] trace nullref exception cause -[] Link Fb to Api	2024-07-10 16:45:02 -04:00
mhengeli	421f87db5e	feat: add video wall mode command to dm-rmc-4kz-scaler-c	2024-07-09 20:06:49 -04:00
Andrew Welker	b63996b9e6	fix: set partition state to match physical partitions when changing from manual to auto mode	2024-07-08 13:22:18 -05:00
mhengeli	eb388d28db	feat: add scaler mode for videowall set rmc 4kz scaler c	2024-06-21 15:37:28 -04:00
Neil Dorin	b326ccf6c3	feat: adds sdi in/out port names	2024-06-19 13:08:55 -06:00
Neil Dorin	a2b7a39082	Merge pull request #1188 from PepperDash/hotfix/add-hdcp-control-to-airmedia Hotfix/add hdcp control to airmedia	2024-05-16 15:31:35 -06:00
Neil Dorin	428f9f34bd	Merge pull request #1187 from PepperDash/hotfix/add-hdcp-control-to-airmedia main <- hotfix/add-hdcp-control-to-airmedia	2024-05-16 11:29:07 -06:00
Jason T Alborough	78e49871c6	Merge branch 'main' into hotfix/add-hdcp-control-to-airmedia	2024-05-16 12:18:08 -04:00
Andrew Welker	12e81af9e6	Merge pull request #1183 from PepperDash/hotfix/bridge-warning-fix Hotfix/bridge warning fix	2024-05-16 00:38:44 -05:00
Neil Dorin	544a7a2d73	Merge branch 'main' into hotfix/bridge-warning-fix	2024-05-02 09:46:45 -06:00
Neil Dorin	1d843c6c89	Merge pull request #1184 from PepperDash/hotfix/fix-ghidra-specific-verbiage fix: ghidra specific verbiage	2024-05-02 09:46:23 -06:00
Neil Dorin	c72db72e7e	Merge branch 'main' into feature/bridge-warning-fix	2024-04-26 09:58:02 -06:00
AECohn	9e588f4da5	fix: ghidra specific verbiage	2024-04-25 10:42:40 -04:00
Aviv Cohn	4c466b425c	fix: Change console message to include "use eiscApiAdvanced"	2024-04-25 10:24:09 -04:00
Jason T Alborough	d0aed1c1c5	Merge pull request #1173 from PepperDash/release/1.16.0 Release/1.16.0	2024-04-23 11:17:09 -04:00
Jason T Alborough	bf966121f9	Merge branch 'main' into release/1.16.0	2024-04-01 13:20:55 -04:00
Andrew Welker	ecadb439b2	Merge pull request #1176 from PepperDash/hotfix/ssh-fix fix: Update PepperDashCore version to 1.3.3-hotfix-390	2024-03-21 09:59:17 -05:00
jtalborough	8c1553a026	fix: Update PepperDashCore version to 1.3.3-hotfix-390	2024-02-26 13:22:35 -05:00
Andrew Welker	9755724342	Merge pull request #1164 from PepperDash/feature/hdps-dm-event-updates Feature/hdps dm event updates	2024-02-02 08:53:29 -06:00
Andrew Welker	4d25c420e5	Merge pull request #1161 from PepperDash/hotfix/video-codec-base fix: clear selected causes thread abort in 3 series	2024-02-02 08:52:47 -06:00
Andrew Welker	3190dacdf8	Merge branch 'development' into feature/hdps-dm-event-updates	2024-02-02 08:34:30 -06:00
Andrew Welker	44add9aac6	Merge branch 'main' into hotfix/video-codec-base	2024-02-02 08:33:47 -06:00
Andrew Welker	5bb6405874	Merge pull request #1169 from PepperDash/hotfix/latest-dbs Hotfix/latest dbs	2024-02-02 08:33:23 -06:00
Andrew Welker	fed3d7e13a	Merge branch 'development' into hotfix/latest-dbs	2024-01-25 14:44:35 -06:00
Andrew Welker	af848b9ca4	Merge pull request #1168 from PepperDash/hotfix/latest-dbs	2024-01-25 14:03:48 -06:00
jtalborough	b52c13d8e8	fix: Update PepperDashCore package version to 1.3.2	2024-01-25 13:50:44 -05:00
jtalborough	26f9118154	chore: update PepperDashCore package version	2024-01-25 13:15:12 -05:00
Neil Dorin	bba3c347c6	Merge pull request #1166 from PepperDash/feature/add-cen-io-com-x02 feat: add cen-io-com102 and cen-io-com202 support	2023-12-19 14:45:02 -07:00
jkdevito	be96adcc06	feat: add cen-io-com102 and cen-io-com202 support	2023-12-19 10:50:55 -06:00
Jason DeVito	b245016420	fix: updated dminputchange event debug message	2023-12-14 17:02:14 -06:00
Jason DeVito	19f2c6aa79	fix: update dm event handlers, adds debug statements	2023-12-14 16:32:22 -06:00
Jason DeVito	533ca05ac2	feat: adds additional dm input/output event cases to event handlers	2023-12-14 12:43:46 -06:00
Jason DeVito	9c7777fbaa	Merge pull request #1163 from PepperDash/feature/hdpsxxxx-volume-control Feature/hdpsxxxx volume control	2023-12-13 16:54:59 -06:00
Jason DeVito	5530c91b75	refactor: HdPsXxxOutputAudioController & HdPsXxxAnalogAuxMixerController - Updated audio controllers to implement `Volume(Feedback).ShortValue` per documentation for set and get - Changed `VolumeLevel` set to private set - Removed `VolumeLevel` and `IsMuted` set from constructors	2023-12-13 16:01:15 -06:00
Jason DeVito	67e0378806	fix: cleanup debug statements	2023-12-13 12:41:45 -06:00
Jason DeVito	1c5aca03d2	fix: resolves hdPsXxx audio controllers scaleWithLimits exception	2023-12-13 12:36:45 -06:00
Nick Genovese	6f5fa2c3b8	fix: clear selected causes thread abort in 3 series - the old method was using _directoryCode, _directoryTrilist, _directoryJoinmap which were never initialized	2023-12-12 15:29:41 -05:00
Neil Dorin	3d760cbedc	feat: adds support for hdcp input control and feedback on Airmedia devices	2023-11-14 16:28:32 -07:00
Jason DeVito	d713abf614	fix: update hd-ps audio controllers to resolve control issues	2023-11-09 23:36:54 -06:00
Jason DeVito	a64b5240ad	feat: add output audio controller	2023-11-03 18:14:53 -05:00
Jason DeVito	c528fecb9a	feat(wip): add HdPsXxx audio control	2023-11-02 17:52:27 -05:00
jkdevito	355e9cde12	chore(wip): save updates	2023-11-02 11:55:48 -05:00
jkdevito	1df8d3f617	feat: create branch to add volume control	2023-11-02 11:54:44 -05:00
Neil Dorin	2f1caff815	Merge pull request #1154 from PepperDash/hotfix/mpc3-button-list fix: list available buttons on startup	2023-10-27 12:53:52 -06:00
Jason DeVito	4da2f25c3d	fix: list available buttons on startup	2023-10-27 12:14:07 -05:00
Andrew Welker	d6334538c0	Merge pull request #1142 from PepperDash/feature/ir-bridge-map Add default IR join map using Crestron IR File naming conventions	2023-10-25 20:38:39 -06:00