build(force-patch): add props to package with Essentials version

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.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

.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

.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

.github/workflows/publish-docs.yml

@@ -0,0 +1,45 @@
+name: Publish Docs
+
+# Trigger the action on push to main
+on:
+  push:
+    branches:      
+      - main
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  actions: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+  
+jobs:
+  publish-docs:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Dotnet Setup
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.x
+
+    - run: dotnet tool update -g docfx
+    - run: docfx ./docs/docfx.json
+
+    - name: Upload artifact
+      uses: actions/upload-pages-artifact@v3
+      with:
+        # Upload entire repository
+        path: './docs/_site'
+    - name: Deploy to GitHub Pages
+      id: deployment
+      uses: actions/deploy-pages@v4

.gitignore

@@ -392,3 +392,5 @@ essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/Pepp
 .DS_Store
 /._PepperDash.Essentials.sln
 .vscode/settings.json
+_site/
+api/

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Essentials-Template-UI"]
-	path = Essentials-Template-UI
-	url = https://github.com/PepperDash/Essentials-Template-UI.git

.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"
+    }
+  ]
+}

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

PepperDash.Essentials.4Series.sln

@@ -0,0 +1,97 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Devices.Common", "src\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj", "{53E204B7-97DD-441D-A96C-721DF014DF82}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E5336563-1194-501E-BC4A-79AD9283EF90} = {E5336563-1194-501E-BC4A-79AD9283EF90}
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials", "src\PepperDash.Essentials\PepperDash.Essentials.csproj", "{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E5336563-1194-501E-BC4A-79AD9283EF90} = {E5336563-1194-501E-BC4A-79AD9283EF90}
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Core", "src\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj", "{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E5336563-1194-501E-BC4A-79AD9283EF90} = {E5336563-1194-501E-BC4A-79AD9283EF90}
+	EndProjectSection
+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}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E5336563-1194-501E-BC4A-79AD9283EF90} = {E5336563-1194-501E-BC4A-79AD9283EF90}
+	EndProjectSection
+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}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E5336563-1194-501E-BC4A-79AD9283EF90} = {E5336563-1194-501E-BC4A-79AD9283EF90}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Essentials", "Essentials", "{AD98B742-8D85-481C-A69D-D8D8ABED39EA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Core", "src\PepperDash.Core\PepperDash.Core.csproj", "{E5336563-1194-501E-BC4A-79AD9283EF90}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug 4.7.2|Any CPU = Debug 4.7.2|Any CPU
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
+		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug 4.7.2|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug 4.7.2|Any CPU.Build.0 = Debug|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5336563-1194-501E-BC4A-79AD9283EF90}.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}
+		{E5336563-1194-501E-BC4A-79AD9283EF90} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6907A4BF-7201-47CF-AAB1-3597F3B8E1C3}
+	EndGlobalSection
+EndGlobal

PepperDash.Essentials.sln

@@ -1,44 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33213.308
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Devices.Common", "src\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj", "{53E204B7-97DD-441D-A96C-721DF014DF82}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials", "src\PepperDash.Essentials\PepperDash.Essentials.csproj", "{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Core", "src\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj", "{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug 4.7.2|Any CPU = Debug 4.7.2|Any CPU
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
-		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
-		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53E204B7-97DD-441D-A96C-721DF014DF82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53E204B7-97DD-441D-A96C-721DF014DF82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
-		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
-		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB3B11BA-625C-4D35-B663-FDC5BE9A230E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|Any CPU.ActiveCfg = Debug 4.7.2|Any CPU
-		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug 4.7.2|Any CPU.Build.0 = Debug 4.7.2|Any CPU
-		{3D192FED-8FFC-4CB5-B5F7-BA307ABA254B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6907A4BF-7201-47CF-AAB1-3597F3B8E1C3}
-	EndGlobalSection
-EndGlobal

README.md

@@ -60,4 +60,4 @@ For detailed documentation, see the [Wiki](https://github.com/PepperDash/Essenti
 
 ## How-To (Getting Started)
 
-See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)
+See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)

docs/devjson commands.json

@@ -1,47 +0,0 @@
-devjson:1 {"deviceKey":"display-1-comMonitor","methodName":"PrintStatus"}
-
-devjson:1 {"deviceKey":"display-1-com","methodName":"SimulateReceive", "params": ["\\x05\\x06taco\\xAA"]}
-
-devjson:1 {"deviceKey":"display-1","methodName":"InputHdmi1", "params": []}
-
-devjson:1 {"deviceKey":"display-1","methodName":"PowerOff", "params": []}
-
-devjson:1 {"deviceKey":"timer","methodName":"Start" }
-
-devjson:1 {"deviceKey":"timer","methodName":"Cancel" }
-
-devjson:1 {"deviceKey":"timer","methodName":"Reset" }
-
-devjson:1 {"deviceKey":"room1","methodName":"Shutdown" }
-
-devjson:1 {"deviceKey":"mockVc-1", "methodName":"TestIncomingVideoCall", "params": ["123-456-7890"]}
-
-devjson:1 {"deviceKey":"mockVc-1", "methodName":"TestIncomingAudioCall", "params": ["111-111-1111"]}
-
-devjson:1 {"deviceKey":"mockVc-1", "methodName":"TestIncomingVideoCall", "params": ["444-444-4444"]}
-
-devjson:1 {"deviceKey":"mockVc-1", "methodName":"ListCalls"}
-
-devjson:1 {"deviceKey":"room1-emergency", "methodName":"RunEmergencyBehavior"}
-
-devjson:1 {"deviceKey":"microphonePrivacyController-1", "methodName":"TogglePrivacyMute"}
-
-devjson:1 {"deviceKey":"room1.InCallFeedback","methodName":"SetTestValue", "params": [ true ]}
-
-devjson:1 {"deviceKey":"room1.InCallFeedback","methodName":"ClearTestValue", "params": []}
-
-devjson:3 {"deviceKey":"room1.RoomOccupancy.RoomIsOccupiedFeedback","methodName":"SetTestValue", "params": [ true ]}
-
-devjson:2 {"deviceKey":"codec-comms-ssh", "methodName":"SendText", "params": ["xcommand dial number: 10.11.50.211\r"]}
-
-devjson:2 {"deviceKey":"codec-comms-ssh", "methodName":"Connect", "params": []}
-
-devjson:1 {"deviceKey":"commBridge", "methodName":"ExecuteJoinAction", "params":[ 301, "digital", true ]}
-
-devjson:2 {"deviceKey":"display01Comm-com", "methodName":"SendText", "params": [ "I'M GETTING TIRED OF THIS" ]}
-
-devjson:10 {"deviceKey":"dmLink-ssh", "methodName":"Connect", "params": []} 
-
-devjson:2 {"deviceKey":"roomCombiner", "methodName":"SetRoomCombinationScenario", "params": ["combined"]} 
-
-devjson:2 {"deviceKey":"roomCombiner", "methodName":"SetRoomCombinationScenario", "params": ["divided"]} 

docs/docfx.json

@@ -0,0 +1,58 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dotnet/docfx/main/schemas/docfx.schema.json",
+  "metadata": [
+    {
+      "src": [
+        {
+          "src": "../",
+          "files": [
+            "src/**/*.csproj"
+          ]
+        }
+      ],
+      "properties": {
+        "TargetFramework": "net472"
+      },
+      "dest": "api",
+      "namespaceLayout": "nested",
+      "outputFormat": "apiPage"
+    }
+  ],
+  "build": {
+    "content": [
+      {
+        "files": [
+          "docs/**/*.{md,yml}",
+          "api/**/*.{md,yml}",
+          "index.md",
+          "toc.yml"
+        ],
+        "exclude": [
+          "_site/**",
+          ".github/**"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "docs/images/**"
+        ]
+      }
+    ],
+    "output": "_site",
+    "template": [
+      "default",
+      "modern"
+    ],
+    "globalMetadata": {
+      "_appName": "PepperDash Essentials",
+      "_appTitle": "PepperDash Essentials",
+      "_enableSearch": true,
+      "_appLogoPath": "docs/images/favicon-32x32.png",
+      "_appFaviconPath": "docs/images/favicon.ico",
+      "_disableToc": false,
+      "pdf": false
+    }
+  }
+}

docs/docs/Arch-1.md

@@ -0,0 +1,41 @@
+# Essentials architecture
+
+## Device and DeviceManager
+
+---
+[YouTube Video - The Device Model in PepperDash Essentials](https://youtu.be/QF4vCQfOYGw)
+***
+
+A `Device` (`PepperDash.Core.Device`) is a logical construct. It may represent a piece of hardware, a port, a socket, a collection of other devices/ports/constructs that define an operation, or any unit of logic that should be created at startup and exist independent of other devices.
+
+`DeviceManager` (`PepperDash.Essentials.Core.DeviceManager`) is the collection of all Devices. The collection of everything we control, and other business logic in a system. See the list below for what is typical in the device manager.
+
+## Flat system design
+
+In Essentials, most everything we do is focused in one layer: The Devices layer. This layer interacts with the physical Crestron and other hardware and logical constructs underneath, and is designed so that we rarely act directly on the often-inconsistent hardware layer. The `DeviceManager` is responsible for containing all of the devices in this layer.
+
+Types of things in `DeviceManager`:
+
+* Rooms
+* Sources
+* Codecs, DSPs, displays, routing hardware
+* IR Ports, Com ports, SSh Clients, ...
+* Occupancy sensors and relay-driven devices
+* Logical devices that manage multiple devices and other business, like shade or lighting scene controllers
+* Fusion connectors to rooms
+
+A Device doesn't always represent a physical piece of hardware, but rather a logical construct that "does something" and is used by one or more other devices in the running program.  For example, we create a room device, and its corresponding Fusion device, and that room has a Cisco codec device, with an attached SSh client device. All of these lie in a flat collection in the `DeviceManager`.
+
+> The `DeviceManager` is nothing more than a modified collection of things, and technically those things don't have to be Devices, but must at least implement the `IKeyed` (`PepperDash.Core.IKeyed`) interface (simply so items can be looked up by their key.) Items in the `DeviceManager` that are Devices are run through additional steps of [activation](~/docs/Arch-activate.md#2-pre-activation) at startup.  This collection of devices is all interrelated by their string keys.
+
+In this flat design, we spin up devices, and then introduce them to their "coworkers and bosses" - the other devices and logical units that they will interact with - and get them all operating together to form a running unit. For example: A room configuration will contain a "VideoCodecKey" property and a "DefaultDisplayKey" property. The `DeviceManager` provides the room with the codec or displays having the appropriate keys. What the room does with those is dependent on its coding.
+
+> In the default Essentials routing scheme, the routing system gets the various devices involved in given route from `DeviceManager`, as they are discovered along the defined tie-lines. This is all done at route-time, on the fly, using only device and port keys. As soon as the routing operation is done, the whole process is released from memory. This is extremely-loose coupling between objects.
+
+This flat structure ensures that every device in a system exists in one place and may be shared and reused with relative ease. There is no hierarchy.
+
+## Architecture drawing
+
+![Architecture overview](~/docs/images/arch-overview.png)
+
+Next: [Configurable lifecycle](~/docs/Arch-lifecycle.md)

docs/docs/Arch-activate.md

@@ -0,0 +1,158 @@
+# Essentials architecture: DeviceManager activation
+
+## What is all this?
+
+The Essentials system architecture is a loose collection of "things" - generally real or logical Devices - that all need to relate to each other. In the interest of keeping Essentials extensible and flexible, we use an non-ordered collection of objects that should only have references to each other in the least-binding way possible. Meaning: Devices should be designed to be able to function without related objects present, and when they are present they should only retain loose reference to those other objects for memory management and later deconstruction as Essentials grows into a real-time configurable environment.
+
+In order to facilitate this loose coupling, Essentials devices go through five phases during the startup process: Construction; addition to `DeviceManager`; pre-activation; activation; post-activation. We will describe what is optimal behavior for each of the steps below:
+
+### Classes Referenced
+
+* `PepperDash.Core.Device`
+* `PepperDash.Essentials.Core.EssentialsDevice`
+* `PepperDash.Essentials.Core.DeviceManager`
+* `PepperDash.Essentials.Core.Privacy.MicrophonePrivacyController`
+
+## 1. Construction and addition to the DeviceManager
+
+In general, a device's constructor should only be used to get the "framework" of the device in place. All devices are constructed in this stage.  Rooms and fusion bridges included. Simple devices like IR driver devices, and devices with no controls can be completely spun up in this phase. All devices are added to the `DeviceManager` after they are constructed, but may not be fully functional.
+
+## 2. Pre-activation
+
+This stage is rarely used. It exists to allow an opportunity for any necessary logic to take place before the main activation phase.
+
+## 3. Activation
+
+This stage is the main phase of startup, and where most devices will get up and running, if they need additional startup behavior defined.  The developer will code an optional overridden `CustomActivate()` method on the device class. This is where hardware ports may be set up; signals and feedbacks linked; UI drivers fired up; rooms linked to their displays and codec... With the exception of early-designed devices, most new Essentials classes do all of their startup here, rather than in their constructors.
+
+Remember that in your `CustomActivate()` method, you cannot assume that a device you depend on is alive and running yet.  It may be activating later.  You _can_ depend on that device's existence, and link yourself to it, but it may not be functional yet. In general, there should be no conditions in any Essentials code that depend on device startup sequence and ordering. All rooms, devices, classes should be able to function without linked devices being alive, and respond appropriately when they do come to life. Any post-activation steps can be done in step four below - and should be avoided in general.
+
+If the `CustomActivate()` method is long, consider breaking it up into many smaller methods. This will enhance exception handling and debugging when things go wrong, with more-detailed stack traces, and makes for easier-to-read code.
+
+Note: It is best-practice in Essentials to not write arbitrarily-timed startup sequences to ensure that a "system" or room is functional. Rather, we encourage the developer to use various properties and conditions on devices to aggregate together "room is ready" statuses that can trigger further action. This ensures that all devices can be up and alive, allowing them to be debugged within a program that may otherwise be misbehaving - as well as not making users and expensive developers wait for code to start up!
+
+```cs
+public override bool CustomActivate()
+{
+    Debug.Console(0, this, "Final activation. Setting up actions and feedbacks");
+    SetupFunctions();
+    SetupFeedbacks();
+
+    EISC.SigChange += EISC_SigChange;
+    ...
+}
+```
+
+## 4. Post-activation
+
+This phase is used primarily to handle any logic in a device that might be dependent on another device, and we need to ensure that we have waited for the dependent device to be activated first.  For example, if we look at the `MicrophonePrivacyController` class, this is a "virtual" device whose purpose is to control the mute state of microphones from one or more contact closure inputs as well as provide feedback via different colored LEDs as to the current mute state.  This virtual-device doesn't actually represent any sort of physical hardware device, but rather relies on associating itself with other devices that represent digital inputs and relays as well as whatever device is responsible for preforming the actual muting of the microphones.
+
+We can see in the example below that during the `CustomActivate()` phase, we define a post-activation action via a lambda in `AddPostActivationAction()` that will execute during the post-activation phase.  The purpose here is to check the state of the microphone mute and set the state of the relays that control the LEDs accordingly.  We need to do this as a post-activation action because we need to make sure that the devices PrivacyDevice, RedLedRelay and GreenLedRelay are fully activated before we can attempt to interact with them.
+
+### **Example**
+
+```cs
+public override bool CustomActivate()
+{
+    foreach (var i in Config.Inputs)
+    {
+        var input = DeviceManager.GetDeviceForKey(i.DeviceKey) as IDigitalInput;
+        if(input != null)
+            AddInput(input);
+    }
+
+    var greenLed = DeviceManager.GetDeviceForKey(Config.GreenLedRelay.DeviceKey) as GenericRelayDevice;
+    if (greenLed != null)
+        GreenLedRelay = greenLed;
+    else
+        Debug.Console(0, this, "Unable to add Green LED device");
+
+    var redLed = DeviceManager.GetDeviceForKey(Config.RedLedRelay.DeviceKey) as GenericRelayDevice;
+    if (redLed != null)
+        RedLedRelay = redLed;
+    else
+        Debug.Console(0, this, "Unable to add Red LED device");
+
+    AddPostActivationAction(() => {
+        CheckPrivacyMode();
+        PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
+        PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
+    });
+
+    initialized = true;
+
+    return base.CustomActivate();
+}
+
+void CheckPrivacyMode()
+{
+    if (PrivacyDevice != null)
+    {
+        var privacyState = PrivacyDevice.PrivacyModeIsOnFeedback.BoolValue;
+        if (privacyState)
+            TurnOnRedLeds();
+        else
+            TurnOnGreenLeds();
+    }
+}
+```
+
+## Activation exceptions
+
+Each of the three activation phases operates in a try/catch block for each device.  This way if one device has a fatal failure during activation, the failure will be logged and the system can continue to activate. This allows the developer to chase down multiple issues per load while testing, or to fix configuration omissions/errors as a group rather than one-at-a-time. A program can theoretically be fully-initialized and have many or all devices fail. We generally do not want to depend on exception handling to log device failures. Construction and activation code should have plenty of null checks, parameter validity checks, and debugging output to prevent exceptions from occurring. `String.IsEmptyOrNull(myString)` and `if(myObject == null)` are your friends. Invite them often.
+
+## Interdependence
+
+In any real-world system, devices and business logic need to talk to each other, otherwise, what's the point of all this coding? When creating your classes and configuration, it is best practice to _try_ not to "plug" one device into another during construction or activation. For example your touchpanel controller class has a `Display1` property that holds the display-1 object. Rather, it may be better to refer to the device as it is stored in the `DeviceManager` when it's needed using the static `DeviceManager.GetDeviceForKey(key)` method to get a reference to the device, which can be cast using various interfaces/class types, and then interacted with.  This prevents objects from being referenced in places where the developer may later forget to dereference them, causing memory leak.  This will become more important as Essentials becomes more able to be reconfigured at runtime.
+
+As an example, [connection-based routing](~/docs/Connection-based-routing.md#essentials-connection-based-routing) uses these methods.  When a route is requested, the collection of tielines and devices is searched for the devices and paths necessary to complete a route, but there are no devices or tie lines that are object-referenced in running code.  It can all be torn down and reconfigured without any memory-management dereferencing, setting things to null.
+
+## Device Initialization
+
+Once the `DeviceManager` has completed the activation phase cycle for all devices, the devices themselves can be initialized.  The `EssentialsDevice` class subscribes to the `DeviceManager.AllDevicesActivated` event and invokes the virtual `Initialize()` method on `Device` in a separate thread.  This allows all devices to concurrently initialize in parallel threads. 
+
+The main task that should be undertaken in the `Initialize()` method for any 3rd party device class, it to begin communication with the device via its API.  Ideally, no class that communicates with a 3rd party device outside the program should attempt to start communicating before this point.
+
+### Example (from `PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec`)
+```cs
+        public override void Initialize()
+        {
+            var socket = Communication as ISocketStatus;
+            if (socket != null)
+            {
+                socket.ConnectionChange += new EventHandler<GenericSocketStatusChageEventArgs>(socket_ConnectionChange);
+            }
+
+            Communication.Connect();
+
+            CommunicationMonitor.Start();
+
+            const string prefix = "xFeedback register ";
+
+            CliFeedbackRegistrationExpression =
+                prefix + "/Configuration" + Delimiter +
+                prefix + "/Status/Audio" + Delimiter +
+                prefix + "/Status/Call" + Delimiter +
+                prefix + "/Status/Conference/Presentation" + Delimiter +
+                prefix + "/Status/Cameras/SpeakerTrack" + Delimiter +
+                prefix + "/Status/RoomAnalytics" + Delimiter +
+                prefix + "/Status/RoomPreset" + Delimiter +
+                prefix + "/Status/Standby" + Delimiter +
+                prefix + "/Status/Video/Selfview" + Delimiter +
+                prefix + "/Status/Video/Layout" + Delimiter +
+                prefix + "/Status/Video/Input/MainVideoMute" + Delimiter +
+                prefix + "/Bookings" + Delimiter +
+                prefix + "/Event/CallDisconnect" + Delimiter +
+                prefix + "/Event/Bookings" + Delimiter +
+                prefix + "/Event/CameraPresetListUpdated" + Delimiter +
+                prefix + "/Event/UserInterface/Presentation/ExternalSource/Selected/SourceIdentifier" + Delimiter;
+        }
+```
+
+## The goal
+
+Robust C#-based system code should not depend on "order" or "time" to get running.  We do not need to manage the order of our startup in this environment.  Our Room class may come alive before our DSP and or Codec, and the Room is responsible for handling things when those devices become available. The UI layer is responsible for blocking the UI or providing status when the Room's requirements are coming alive, or if something has gone away. We use events or `Feedbacks` to notify dependents that other devices/classes are ready or not, but we do not prevent continued construction/activation of the system when many of these events don't happen, or don't happen in a timely fashion.  This removes the need for startup management, which is often prolonged and consumes _tons_ of developer/installer time.  A fully-loaded Essentials system may go through activation in several seconds, with all devices concurrently getting themselves going, where legacy code may take 10 minutes.
+
+When designing new Device-based classes, be it rooms, devices, port controllers, bridges, make them as independent as possible.  They could exist alone in a program with no required partner objects, and just quietly exist without failing. We want the system to be fast and flexible, and keeping the interdependence between objects at a minimum improves this flexibility into the future.
+
+Next: [More architecture](~/docs/Arch-topics.md)

docs/docs/Arch-lifecycle.md

@@ -0,0 +1,9 @@
+# Essentials Configurable System Lifecycle
+
+The diagram below describes how Essentials gets a program up and running.
+
+(The various activation phases are covered in more detail on the [next page](~/docs/Arch-activate.md))
+
+![Lifecycle](~/docs/images/lifecycle.png)
+
+Next: [Activation phases](~/docs/Arch-activate.md)

docs/docs/Arch-summary.md

@@ -0,0 +1,19 @@
+# Essentials architecture
+
+## Summary
+
+PepperDash Essentials is an open-source framework for control systems, built on Crestron's Simpl# Pro framework. It can be configured as a standalone program capable of running a wide variety of system designs and can also be used to augment other Crestron programs.
+
+Essentials is a collection of C# libraries that can be used in many ways. It is a 100% configuration-driven framework that can be extended to add different workflows and behaviors, either through the addition of new device-types and classes, or via a plug-in mechanism. The framework is a collection of things that are all related and interconnected, but in general do not have strong dependencies on each other.
+
+## Framework Libraries
+
+The table below is a guide to understand the basic organization of code concepts within the various libraries that make up the architecture.
+
+![Table](~/docs/images/arch-table.PNG)
+
+The diagram below shows the reference dependencies that exist between the different component libraries that make up the Essentials Framework.
+
+![Architecture drawing](~/docs/images/arch-high-level.png)
+
+Next: [Architecture](~/docs/Arch-1.md)

docs/docs/Arch-topics.md

@@ -0,0 +1,156 @@
+# Configuration topics
+
+Configuration is central to Essentials. On this page we will cover configuration-related topics, including the important concept of configure-first and some details about the config file process.
+
+## Classes Referenced
+
+- `PepperDash.Essentials.Core.Config.DeviceConfig`
+
+## Configure-first development
+
+## Framework Libraries
+
+The table below is meant to serve as a guide to understand the basic organization of code concepts within the various libraries that make up the architecture.
+
+_Todo, try a text-based table:_
+
+![Table](~/docs/images/arch-table.PNG)
+
+The diagram below shows the reference dependencies that exist between the different component libraries that make up the Essentials Framework.
+
+![Architecture drawing](~/docs/images/arch-high-level.png)
+
+### Architecture
+
+#### Device and DeviceManager
+
+A `Device` is a logical construct. It may represent a piece of hardware, a port, a socket, a collection of other devices/ports/constructs that define an operation, or any unit of logic that should be created at startup and exist independent of other devices.
+
+`DeviceManager` is the collection of all Devices. The collection of everything we control on a system. **ADD SOME MORE HERE**
+
+#### Flat system design
+
+In Essentials, most everything we do is focused in one layer: The Devices layer. This layer interacts with the physical Crestron and other hardware and logical constructs underneath, and is designed so that we rarely act directly on the often-inconsistent hardware layer. The `DeviceManager` is responsible for containing all of the devices in this layer.
+
+Types of devices:
+
+- Rooms
+- Sources
+- Codecs, DSPs, displays, routing hardware
+- IR Ports, Com ports, SSh Clients, ...
+- Occupancy sensors and relay-driven devices
+- Logical devices that manage multiple devices and other business, like shade or lighting scene controllers
+- Fusion connectors to rooms
+
+A Device doesn't always represent a physical piece of hardware, but rather a logical construct that "does something" and is used by one or more other devices in the running program. For example, we create a room device, and its corresponding Fusion device, and that room has a Cisco codec device, with an attached SSh client device. All of these lie in a flat collection in the `DeviceManager`.
+
+> The `DeviceManager` is a modified collection of objects, and those objects don't have to inherit from Devices or EssentialsDevices, but must at least implement the `IKeyed` interface (so items can be looked up by their key.) Items in the `DeviceManager` that are Devices are run through additional steps of activation at startup. This collection of devices is all interrelated by their string keys.
+
+In this flat design, we spin up devices, and then introduce them to their "coworkers and bosses" - the other devices and logical units that they will interact with - and get them all operating together to form a running unit. For example: A room configuration will contain a "VideoCodecKey" property and a "DefaultDisplayKey" property. The `DeviceManager` provides the room with the codec or displays having the appropriate keys. What the room does with those is dependent on its coding.
+
+> In the default Essentials routing scheme, the routing system gets the various devices involved in given route from `DeviceManager`, as they are discovered along the defined tie-lines. This is all done at route-time, on the fly, using only device and port keys. As soon as the routing operation is done, the whole process is released from memory. This is extremely-loose coupling between objects.
+
+This flat structure ensures that every device in a system exists in one place and may be shared and reused with relative ease. There is no hierarchy.
+
+#### Architecture drawing
+
+![Architecture overview](~/docs/images/arch-overview.png)
+
+#### Essentials Configurable System Lifecycle
+
+![Lifecycle](~/docs/images/lifecycle.png)
+
+### Activation phases additional topics and examples (OTHER DOCS)
+
+Concepts (link)
+
+Room and touchpanel activation (link)
+
+#### Configure first development
+
+One of the primary concepts that has been adopted and must be adhered to when writing for Essentials framework is the concept of "configure first." The simple version is: Write what you need to do in the related configuration file (and configuration tool) first, then write the code that runs from that configuration. This ensures that the running code can actually be configured in the "flat" structure of devices and rooms that Essentials uses.
+
+Often, code is written and tested first without consideration for configurability. Then, when a developer tries to make it configurable, they discover that the code as written doesn’t support it without complicated configuration files. This creates spaghetti code in tools that are written to generate configurations and tends to create tighter coupling between objects than we desire. Later, a modified version of the original program is desired, but because the code was written in such a specific fashion, the code is hard to refactor and extend. This causes the configuration tool and configuration files to become even more convoluted. The modern versions of configuration tools that are starting to come out are modular and componentized. We want to ensure as much re-use of these modules as possible, with extensions and added features added on, rather than complete rewrites of existing code. In our running systems, we want to ensure as much flexibility in design as possible, eliminating multiple classes with similar code.
+
+### Configuration reader process
+
+At the heart of the Essentials framework is the configuration system. While not technically necessary for a system written with the Essentials framework, it is the preferred and, currently, the only way to build an Essentials system. The configuration file is JSON, and well-defined (but not well documented, yet). It is comprised of blocks:
+
+- info (object) Contains metadata about the config file
+- devices (array) Contains, well, the devices we intend to build and load
+- rooms (array, typically only one) Contains the rooms we need
+- sourceLists (object) Used by one or more rooms to represent list(s) of sources for those rooms
+- tieLines (array) Used by the routing system to discover routing between sources and displays
+
+In addition, a downloaded Portal config file will most likely be in a template/system form, meaning that the file contains two main objects, representing the template configuration and its system-level overrides. Other metadata, such as Portal UUIDs or URLs may be present.
+
+At startup, the configuration file is read, and a ReadyEvent is fired. Upon being ready, that configuration is loaded by the ConfigReader.LoadConfig() method. The template and system are merged into a single configuration object, and that object is then deserialized into configuration wrapper classes that define most of the structure of the program to be built. (Custom configuration objects were built to allow for better type handling rather than using JToken methods to parse out error-prone property names.)
+
+For example, a `DeviceConfig` object:
+
+```cs
+namespace PepperDash.Essentials.Core.Config
+{
+    public class DeviceConfig
+    {
+        [JsonProperty("key")]
+        public string Key { get; set; }
+
+        [JsonProperty("uid")]
+        public int Uid { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("group")]
+        public string Group { get; set; }
+
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        [JsonProperty("properties")]
+        [JsonConverter(typeof(DevicePropertiesConverter))]
+        public JToken Properties { get; set; }
+    }
+}
+```
+
+_Every_ `Device` present must adhere to those five properties plus a properties object. The properties object will have its own deserialization helpers, depending on what its structure is.
+
+Once the ConfigReader has successfully read and deserialized the config file, then `ControlSystem.Load()` is called. This does the following in order:
+
+1. Loads Devices
+2. Loads TieLines
+3. Loads Rooms
+4. Loads LogoServer
+5. Activation sequence
+
+This ordering ensures that all devices are at least present before building tie lines and rooms. Rooms can be built without their required devices being present. In principle, this could break from the loosely-coupled goal we have described, but it is the clearest way to build the system in code. The goal is still to build a room class that doesn't have functional dependencies on devices that may not be ready for use.
+
+In each device/room step, a device factory process is called. We call subsequent device factory methods in the various libraries that make up Essentials until one of them returns a functional device. This allows us to break up the factory process into individual libraries, and not have a huge list of types and build procedures. Here's part of the code:
+
+```cs
+// Try local factories first
+var newDev = DeviceFactory.GetDevice(devConf);
+
+if (newDev == null)
+    newDev = BridgeFactory.GetDevice(devConf);
+
+// Then associated library factories
+if (newDev == null)
+    newDev = PepperDash.Essentials.Core.DeviceFactory.GetDevice(devConf);
+if (newDev == null)
+    newDev = PepperDash.Essentials.Devices.Common.DeviceFactory.GetDevice(devConf);
+if (newDev == null)
+    newDev = PepperDash.Essentials.DM.DeviceFactory.GetDevice(devConf);
+if (newDev == null)
+    newDev = PepperDash.Essentials.Devices.Displays.DisplayDeviceFactory.GetDevice(devConf);
+```
+
+In each respective factory, or device constructor, the configuration's properties object is either converted to a config object or read from using `JToken` methods. This builds the device which may be ready to go, or may require activation as described above.
+
+A similar process is carried out for rooms, but as of now, the room types are so few that they are all handled in the `ControlSystem.LoadRooms()` method.
+
+_This process will soon be enhanced by a plug-in mechanism that will drill into dynamically-loaded DLLs and load types from factories in those libraries. This is where custom essentials systems will grow from._
+
+After those five steps, the system will be running and ready to use.

docs/docs/Bridging-To-Hardware-Resources.md

@@ -0,0 +1,15 @@
+# Bridging to Hardware and Network Resources
+
+One of the most powerful features of Essentials is the ability to bridge SIMPL to and hardware resource to any piece of equipment instantiated inside of essentials.  You can bridge directly to a comport on the processor just as easily as you can to the comport of an instantiated DM device.  A simple change in the connection location of a display can be made with just a few keystrokes.  This isn't restricted to comports either.  Devices and direct connections can be linked to Digital Inputs, IR Ports, Relays, Comports, SSH, TCP/IP, UDP, and Cresnet resources.
+
+## Examples
+
+Follow the links below for examples of bridging to hardware and network resources.
+
+**[GenericComm Bridging](~/docs/GenericComm.md)**
+
+**[RelayOutput Bridging](~/docs/RelayOutput.md)**
+
+**[Digital Input Bridging](~/docs/DigitalInput.md)**
+
+**[Card Frame Bridging](~/docs/CardFrame.md)**

docs/docs/CardFrame.md

@@ -0,0 +1,14 @@
+        {
+                "key": "cardCage1",
+                "uid": 1,
+                "name": "Internal Card Cage",
+                "type": "internalcardcage",
+                "group": "cardCage",
+                "properties": {
+                  "cards": {
+                    "1": "c3com3",
+                    "2": "c3com3",
+                    "3": ""
+                  }
+                }
+            },

docs/docs/Communication-Basics.md

@@ -0,0 +1,75 @@
+# Unifying communication methods
+
+In networked A/V systems, devices can use many different methods of communication: COM ports, TCP/IP sockets, Telnet, SSH. Generally, the data protocol and commands that are sent and received using any of these methods are the same, and it is not necessary for a device to know the details of the communication method it is using. A Samsung MDC protocol display in room 1 using RS232 speaks the same language as another Samsung MDC does in the next room using TCP/IP. For these, and most cases where the device doesn't need to know its communication method, we introduce the `IBasicCommunication` interface.
+## Classes Referenced
+
+* `PepperDash.Core.IBasicCommunication`
+* `PepperDash.Core.ISocketStatus`
+* `PepperDash.Core.GenericTcpIpClient`
+* `PepperDash.Core.GenericSshClient`
+* `PepperDash.Core.GenericSecureTcpIpClient`
+* `PepperDash.Essentials.Core.ComPortController`
+* `PepperDash.Essentials.Core.StatusMonitorBase`
+## IBasicCommunication and ISocketStatus
+
+All common communication controllers will implement the `IBasicCommunication` interface, which is an extension of `ICommunicationReceiver`. This defines receive events, connection state properties, and send methods. Devices that need to use COM port, TCP, SSh or other similar communication will require an `IBasicCommunication` type object to be injected at construction time.
+
+```cs
+/// <summary>
+/// An incoming communication stream
+/// </summary>
+public interface ICommunicationReceiver : IKeyed
+{
+    event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+    event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+    bool IsConnected { get; }
+    void Connect();
+    void Disconnect();
+}
+
+/// <summary>
+/// Represents a device that uses basic connection
+/// </summary>
+public interface IBasicCommunication : ICommunicationReceiver
+{
+    void SendText(string text);
+    void SendBytes(byte[] bytes);
+}
+
+/// <summary>
+/// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
+/// GenericTcpIpClient
+/// </summary>
+public interface ISocketStatus : IBasicCommunication
+{
+    event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+    SocketStatus ClientStatus { get; }
+}
+```
+
+### Developing devices with communication
+
+Essentials uses dependency injection concepts in its start up phase. Simply, most devices use the same methods of communication, and are often communication-agnostic. During the build-from-configuration phase, the communication method device is instantiated, and then injected into the device that will use it. Since the communication device is of `IBasicCommunication`, the device controller receiving it knows that it can do things like listen for events, send text, or be notified when sockets change.
+
+### Device Factory, Codec example
+
+![Communication Device factory](~/docs/images/comm-device-factory.png)
+
+The DeviceManager will contain two new devices after this: The Cisco codec, and the codec's `GenericSshClient`. This enables easier debugging of the client using console methods. Some devices like this codec will also have a `StatusMonitorBase` device, for Fusion and other reporting.
+
+> `ComPortController` is `IBasicCommunication` as well, but methods like `Connect()` and `Disconnect()` do nothing on these types.
+
+#### ISocketStatus
+
+`PepperDash.Core.GenericTcpIpClient`, `GenericSshClient` and some other socket controllers implement `ISocketStatus`, which is an extension of `IBasicCommunication`. This interface reveals connection status properties and events.
+
+```cs
+public interface ISocketStatus : IBasicCommunication
+{
+    event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+    SocketStatus ClientStatus { get; }
+}
+```
+
+Classes that are using socket-based comms will need to check if the communication is `ISocketStatus` and link up to the `ConnectionChange` event for connection handling.

docs/docs/ConfigurationStructure.md

@@ -0,0 +1,291 @@
+# Configuration Structure
+
+---
+
+[YouTube Video - Configuring PepperDash Essentials](https://youtu.be/EK8Ti9a1o7s)
+
+***
+
+The Essentials configuration structure is designed to allow minimum duplication of data across systems that share many similarities, which makes it ideally suited for applications where large numbers of duplicate room types must be deployed.
+
+At a high level, the idea is to define a template of all of the common configuration shared by a group of systems of the same type.  Then individual differences per system instance can be defined in a system block that either add data missing in the template, or override the default values set in the template.
+
+## Top Level Object Structure (Double Config)
+
+```cs
+{
+    // This object is deserialized to type PepperDash.Essentials.Core.Config.EssentialsConfig
+
+    "system_url":"", // For Portal use only
+    "template_url":"", // For Portal use only
+    "template":{
+        // This object is deserialized to type PepperDash.Essentials.Core.EssentialsConfig
+        // For most manually generated configuration, only define data here.  Leave system empty
+    },
+    "system":{
+        // This object is deserialized to type PepperDash.Essentials.Core.EssentialsConfig
+        // Any data here will be overlayed on top of the data in template.  In the case of duplicate values
+        // the value in system will be overwrite any value in template
+    }
+}
+```
+
+## Object Structure for `template` and `system` (`PepperDash.Essentials.Core.EssentialsConfig`)
+
+``` js
+{
+     "info": {
+        // This object is deserialized to type PepperDash.Essentials.Core.Config.InfoConfig
+        // Contains information about the system/configuration
+     },
+     "devices": [
+        // This object is deserialized to type List<PepperDash.Essentials.Core.Config.DeviceConfig>
+        // An array of devices
+     ],
+     "rooms": [
+        // This object is deserialized to type List<PepperDash.Essentials.Core.Config.DeviceConfig>
+        // An array of rooms.  These are not automatically deserialized
+     ],
+     "tielines":[
+        // An array of tie lines that describe the connections between routing ports on devices
+     ],
+     "sourceLists":{
+        // This object is deserialized to type Dictionary<string, Dictionary<string, PepperDash.Essentials.Core.SourceListItem>>
+        // An object that contains a collection
+     },
+     "joinMaps":{
+        // This object is deserialized to type Dictionary<string, string> where the value is a serialized class that inherits from JoinMapBase to be deserialized later
+        // Used to define custom join maps for bridging devices to SIMPL
+     }
+}
+```
+
+## The Template and System Concept (Merging Configurations)
+
+In order to understand how and why we use a double configuration concept, it's important to understand the relationship between a Template and a System in Portal.  A System represents a physical installed group of hardware(either currently or in the future), acting together usually as part of a single control system program.  A system MUST inherit from a Template.  A Template represents the common elements of one or more systems.
+
+The idea being that configuration values that are common to all systems can be stored in the configuration for the template.  Then, any configuration values that are unique to a particular system cane be stored in the configuration of the System.  By "merging" the System configuration values over top of the Template configuration values, the resulting data contains all of the values that should be shared by each system that inherits from a common template, as well as the unique values for each individual system.
+
+Below is an example of a double configuration containing both template and system properties.
+
+```JSON
+{
+    "template": {
+        "info": {
+            "name": "Template Name",
+            "description": "A 12 person conference room"
+        },
+        "devices": [
+
+        ],
+        "rooms": [
+
+        ]
+    },
+    "system": {
+        "info": {
+            "name": "System Name",
+            "myNewSystemProperty": "Some Value"
+        },
+        "devices": [
+
+        ],
+        "rooms": [
+
+        ]
+    }
+}
+```
+
+Below is an example of the result of merging the above double configuration example into a single configuration.
+
+```JSON
+{
+    "info": {
+        "name": "System Name",                          // Since this property existed in both the template and system, the system value replaces the template value after the merge
+        "description": "A 12 person conference room",   // This property existed only in the template and is unchanged after the merge
+        "myNewSystemProperty": "Some Value"             // This property existed only in the system and is unchanged after the merge
+    },
+    "devices": [
+
+    ],
+    "rooms": [
+
+    ]
+}
+```
+
+---
+
+## Device Object Structure
+
+The devices array is meant to hold a series of device objects.  The basic device object structure is defined below.
+
+```JSON
+{
+    "key": "someUniqueString",  // *required* a unique string
+    "name": "A friendly Name",  // *required* a friendly name meant for display to users
+    "type": "exampleType",      // *required* the type identifier for this object.  
+    "group": "exampleGroup",    // *required* the group identifier for this object.  This really equates to a category for the device,
+                                // such as "lighting" or "displays" and may be deprecated in future in favor of "category"
+    "uid":0,                    // *required* a unique numeric identifier for each device
+    "properties": {             // *required* an object where the configurable properties of the device are contained
+        "control": {            // an object to contain all of the properties to connect to and control the device
+            "method": "ssh",    // the control method used by this device
+            "tcpSshProperties": {   // contains the necessary properties for the specified method
+                "address": "1.2.3.4",
+                "port": 22,
+                "username": "admin",
+                "password": "uncrackablepassword"
+            }
+        },
+        "someCustomProperty": "I Love Tacos!"
+    }
+    // Do NOT add any custom data at the top level of the device object.  All custom data must be in the properties object.
+}
+```
+
+Some additional details about specific properties that are important to note:
+
+* "key": This value needs to be unique in the array of devices objects
+* "uid": This value also needs to be unique for reasons related to configuration tools and template/system merging
+* "type": Think of this as a way to identify what specific module you might associate with this device.  In Essentials, this value is used to determine what class will be instantiated for the device (ex. "necmpsx" or "samsungMdc" for two types of displays)
+* "properties":  This object is used to store both specific and miscellaneous data about the device.
+  * Specific data, like that shown above in the "control" object has a pre-defined structure.
+  * Other data must be stored as objects or new properties inside the "properties" object such as "someCustomProperty" in the example above.
+* Do NOT add any additional properties at the top level of the device object.  All custom data must be in the "properties" object.
+
+## The Device Properties.Control Object
+
+The control object inside properties has some reserved properties that are used by configuration tools and Essentials that require some caution.
+
+```JSON
+{
+    "properties": {             // *required* an object where the configurable properties of the device are contained
+        "control": {            // an object to contain all of the properties to connect to and control the device
+            // Example of the reserved properties for a socket based port (ssh, tcpIp, udp)
+            "method": "ssh",    // the control method used by this device
+            "tcpSshProperties": {   // contains the necessary properties for the specified method
+                "address": "1.2.3.4",               // IP Address or hostname
+                "port": 22,
+                "username": "admin",
+                "password": "uncrackablepassword",
+                "autoReconnect": true,              // If true, the client will attempt to re-connect if the connection is broken externally
+                "AutoReconnectIntervalMs": 2000     // The time between re-connection attempts
+            },
+
+            // Example of the reserved properties for a Com port
+            "method": "com",
+            "controlPortNumber": 1,                 // The number of the com port on the device specified by controlPortDevKey
+            "controlPortDevKey": "processor",       // The key of the device where the com port is located
+            "comParams": {                          // This object contains all of the com spec properties for the com port
+                "hardwareHandshake": "None",
+                "parity": "None",
+                "protocol": "RS232",
+                "baudRate": 9600,
+                "dataBits": 8,
+                "softwareHandshake": "None",
+                "stopBits": 1
+            }
+        }
+    }
+}
+```
+
+---
+
+## Device Merging
+
+The following examples illustrate how the device key and uid properties affect how devices are merged together in a double configuration scenario.  In order for a template device and a system device to merge, they must have the same key and uid values
+
+```JSON
+{
+    "template": {
+        "info": {
+            "name": "Template Name",
+            "description": "A 12 person conference room"
+        },
+        "devices": [
+            {                                           // This is the template device
+                "key": "display-1",
+                "name": "Display",
+                "type": "samsungMdc",
+                "group": "displays",
+                "uid":0,
+                "properties": {
+                    "control": {
+                        "method": "ssh",
+                        "tcpSshProperties": {
+                            "address": "",              // Note that at the template level we won't know the actual IP address so this value is left empty
+                            "port": 22,
+                            "username": "admin",
+                            "password": "uncrackablepassword"
+                        }
+                    }
+                }
+            }
+        ],
+        "rooms": [
+
+        ]
+    },
+    "system": {
+        "info": {
+            "name": "System Name",
+            "myNewSystemProperty": "Some Value"
+        },
+        "devices": [
+            {                                           // This is the system device
+                "key": "display-1",
+                "uid":0,
+                "properties": {
+                    "control": {
+                            "tcpSshProperties": {
+                            "address": "10.10.10.10"    // Note that the actual IP address is specified at the system level
+                        }
+                    }
+                }
+            }
+        ],
+        "rooms": [
+
+        ]
+    }
+}
+```
+
+Below is an example of the result of merging the above double configuration example into a single configuration.  
+
+```JSON
+{
+    "info": {
+        "name": "System Name",
+        "description": "A 12 person conference room",
+        "myNewSystemProperty": "Some Value"
+    },
+     "devices": [
+        {
+            "key": "display-1",
+            "name": "Display",
+            "type": "samsungMdc",
+            "group": "displays",
+            "uid":0,
+            "properties": {
+                "control": {
+                    "method": "ssh",
+                    "tcpSshProperties": {
+                        "address": "10.10.10.10",   // Note that the merged device object inherits all of the template
+                                                    // properties and overwrites the template address property with the system value
+                        "port": 22,
+                        "username": "admin",
+                        "password": "uncrackablepassword"
+                    }
+                }
+            }
+        }
+     ],
+     "rooms": [
+
+     ]
+}
+```

docs/docs/Connection-Based-Routing.md

@@ -0,0 +1,81 @@
+# Essentials connection-based routing
+
+## TL;DR
+
+Routing is defined by a connection graph or a wiring diagram. Routeable devices are sources, midpoints, or destinations. Devices are connected by tie lines. Tie lines represent the cables connecting devices, and are of type audio, video or both. Routes are made by telling a destination to get an audio/video/combined route from a source.
+
+## Summary
+
+Essentials routing is described by defining a graph of connections between devices in a system, typically in configuration. The audio, video and combination connections are like a wiring diagram. This graph is a collection of devices and tie lines, each tie line connecting a source device, source output port, destination device and destination input port. Tie lines are logically represented as a collection.
+
+When routes are to be executed, Essentials will use this connection graph to decide on routes from source to destination. A method call is made on a destination, which says “destination, find a way for source xyz to get to you.” An algorithm analyzes the tie lines, instantly walking backwards from the destination, down every connection until it finds a complete path from the source. If a connected path is found, the algorithm then walks forward through all midpoints to the destination, executing switches as required until the full route is complete. The developer or configurer only needs to say “destination, get source xyz” and Essentials figures out how, regardless of what devices lie in between.
+
+### Classes Referenced
+
+* `PepperDash.Essentials.Core.Routing.IRoutingSource`
+* `PepperDash.Essentials.Core.Routing.IRoutingOutputs`
+* `PepperDash.Essentials.Core.Routing.IRoutingInputs`
+* `PepperDash.Essentials.Core.Routing.IRoutingInputsOutputs`
+* `PepperDash.Essentials.Core.Routing.IRoutingSinkNoSwitching`
+* `PepperDash.Essentials.Core.Routing.IRoutingSinkWithSwitching`
+
+## Example system, a simple presentation system
+
+The diagram below shows the connections in a simple presentation system, with a few variations in connection paths. Example routes will be described following the diagram.
+
+Each visible line between ports on devices represents a tie line. A tie line connects an output port on one device to an input port on another device, for example: an HDMI port on a document camera to an HDMI input on a matrix switcher. A tie line may be audio, video or both. It is essentially a logical representation of a physical cable in a system. This diagram has 12 tie lines, and those tie lines are defined in the tieLines array in configuration.
+
+![Routing system diagram](~/docs/images/routing-system-diagram.png)
+
+Let’s go through some examples of routing, using pseudo-code:
+
+1. Method call: “Projector 1, show Doc cam.” Routing will walk backwards through DM-RMC-3 and DM-8x8 iterating through all “wired up” ports until it finds a path back to the Doc cam. Routing will then step back through all devices in the discovered chain, switching routes on those that are switchable: Doc cam: no switching; DM 8x8: route input 3 to output 3; DM-RMC-3: no switching; Projector 1: Select input HDMI In. Route is complete.
+2. Method call: “Projector 2, show Laptop, video-only.” Routing will walk backwards through DM-RMC-4, DM 8x8, DM-TX-1, iterating through all connected ports until it finds a connection to the laptop. Routing then steps back through all devices, switching video where it can: Laptop: No switching; DM-TX-1: Select HDMI in; DM 8x8: Route input 5 to output 4; DM-RMC-4: No switching; Projector 2: Select HDMI input. Route is complete.
+3. Method call: “Amplifier, connect Laptop audio.” Again walking backwards to Laptop, as in #2 above. Switching will take place on DM-TX-1, DM 8x8, audio-only.
+4. Very simple call: “Lobby display, show signage controller.” Routing will walk back on HDMI input 1 and immediately find the signage controller. It then does a switch to HDMI 1 on the display.
+
+All four of the above could be logically combined in a series of calls to define a possible “scene” in a room: Put Document camera on Projector 1, put Laptop on Projector 2 and the audio, put Signage on the Lobby display. They key takeaway is that the developer doesn’t need to define what is involved in making a certain route. The person configuring the system defines how it’s wired up, and the code only needs to tell a given destination to get a source, likely through configuration as well.
+
+All of the above routes can be defined in source list routing tables, covered elsewhere (**make link)**.
+
+---
+
+### Definitions
+
+#### Ports
+
+Ports are logical representations of the input and output ports on a device.
+
+#### Source
+
+A source is a device at the beginning of a signal chain. For example, a set-top box, or a camera. Source devices typically have only output ports.
+
+Source devices in Essentials must implement `IRoutingOutputs` or `IRoutingSource`
+
+#### Midpoint
+
+A midpoint is a device in the middle of the signal chain. Typically a switcher, matrix or otherwise. Examples: DM chassis; DM-TX; DM-RMC; A video codec. These devices will have input and output ports.
+
+Midpoint devices must implement `IRoutingInputsOutputs`. Midpoints with switching must implement `IRouting`.
+
+#### Sink
+
+A sink is a device at the end of a full signal path. For example, a display, amplifier, encoder, etc. Sinks typically contain only input ports. They may or may not have switching, like a display with several inputs. Classes defining sink devices must implement `IRoutingSinkNoSwitching` or `IRoutingSinkWithSwitching`.
+
+#### Tie-line
+
+A tie-line is a logical representation of a physical cable connection between two devices. It has five properties that define how the tie-line connects two devices. A configuration snippet for a single tie line connecting HDMI output 1 on a Cisco RoomKit to HDMI input 1 on a display, carrying both audio and video, is shown below.
+
+```json
+{
+  "sourceKey": "ciscoSparkPlusCodec-1",
+  "sourcePort": "HdmiOut1",
+  "destinationKey": "display-1",
+  "destinationPort": "HdmiIn1",
+  "type": "audioVideo"
+}
+```
+
+### Interfaces
+
+Todo: Define Interfaces IRouting, IRoutingOutputs, IRoutingInputs

docs/docs/Debugging.md

@@ -0,0 +1,274 @@
+# Methods of Debugging
+
+1. You can use Visual Studio step debugging
+   - Pros:
+     - Detailed real time debugging into with breakpoints and object inspection
+   - Cons:
+     - Doesn't really work remotely
+     - On processors with Control Subnet, you must be connected to the CS interface to use step debugging. Often not practical or possible.
+     - No logging
+     - Using breakpoints stops the program and can interrupt system usage
+     - Requires the running application to be built in debug mode, not release mode
+2. You can use the Debug class features build into the PepperDash.Core library.
+   - Pros:
+     - Can be easily enabled from console
+     - Allows for setting the level of verbosity
+     - Works when troubleshooting remotely and doesn't require a connection to the CS interface of the processor.
+     - Allows for logging to the Crestron error log or a custom log stored on removable media
+     - Works regardless of build type setting (debug/release)
+     - Can easily identify which class instance is generating console messages
+     - Can use console commands to view the state of public properties on devices
+     - Can use console commands to call methods on devices
+     - Doesn't stop the program
+   - Cons:
+     - No detailed object inspection in real time
+     - Only prints console statements already in code
+     - When enabled at the highest level of verbosity, it can produce a significant amount of data in console. Can be hard to find messages easily.
+     - No current mechanism to filter messages by device. (can be filtered by 3rd party tools easily, though)
+     - Not very effective in debugging applications running on the VC-4 platform as only log messages get printed to the Syslog
+
+## How to use the PepperDash.Core Debug Class
+
+The majority of interaction is done via console, preferably via an SSH session through Crestron Toolbox, PuTTy or any other suitable application.
+
+In code, the most useful method is `Debug.Console()` which has several overloads. All variations take an integer value for the level (0-2) as the first argument. Level 0 will ALWAYS print. Level 1 is for typical debug messages and level 2 is for verbose debugging. In cases where the overloads that accept a `Debug.ErrorLogLevel` parameter are used, the message will ALWAYS be logged, but will only print to console if the current debug level is the same or higher than the level set in the `Debug.Console()` statement.
+
+All statements printed to console are prefixed by a timestamp which can be greatly helpful in debugging order of operations.
+
+```cs
+// The most basic use, sets the level (0) and the message to print.
+Debug.Console(0, "Hello World");
+// prints: [timestamp]App 1:Hello World
+
+// The string parameter has a built in string.Format() that takes params object[] items
+string world = "World";
+Debug.Console(0, "Hello {0}", world);
+// prints: [timestamp]App 1:Hello World
+
+// This overload takes an IKeyed as the second parameter and the resulting statement will
+// print the Key of the device in console to help identify the class instance the message
+// originated from
+Debug.Console(0, this, "Hello World");
+// prints: [timestamp]App 1:[deviceKey]Hello World
+
+// Each of the above overloads has a corresponding variant that takes an argument to indicate
+// the level of error to log the message at as well as printing to console
+Debug.Console(0, Debug.ErrorLogLevel.Notice, "Hello World");
+// prints: [timestamp]App 1:Hello World
+```
+
+## Console Commands
+
+### General Console Commands
+
+Below are is a non-exhaustive list of some of the Essentials specific console commands that allow interaction with the application at runtime.
+
+### `help user`
+
+Will print the available console commands for each program slot.  Console commands can be added and removed dynamically by Essentials and may vary by the version of Essentials that is running.  This is the best place to start to determine the available commands registered for each instance of Essentials running on a processor.
+
+### `reportversions:[slot]`
+
+Will print the running versions of all .dll libraries.  Useful for determining the exact build version of the Essentials application and all plugins
+
+### `gettypes:[slot] [searchString(optional)]`
+
+The `searchString` value is an optional parameter to filter the results.
+
+Will print all of the valid `type` values registered in the `DeviceFactory` for the running Essentials application.  This helps when generating config structure and defining devices.  Device types added by plugins will also be shown.
+
+### `showconfig:[slot]`
+
+Will print out the merged config object
+
+### `donotloadonnextboot:[slot] [true/false]`
+
+When the value is set to true, Essentials will pause when starting up, to allow for a developer to attach to the running process from an IDE for purposes of step debugging.  Once attached, issuing the command `go:[slot]` will cause the configuration file to be read and the program to initialize.  This value gets set to false when the `go` command is issues.
+
+### DeviceManager Console Commands
+
+The following console commands all perform actions on devices that have been registered with the `PepperDash.Essentials.Core.DeviceManager` static class
+
+### `Appdebug:[slot][0-2]`
+
+Gets or sets the current debug level where 0 is the lowest setting and 2 is the most verbose
+
+### `getjoinmap:[slot] [bridgeKey][deviceKey (optional)]
+
+For use with SIMPL Bridging.  Prints the join map for the specified bridge.  If a device key is specified, only the joins for that device will be printed.
+
+Example:
+
+```sh
+RMC3>appdebug:1 // Gets current level
+RMC3>AppDebug level = 0
+
+RMC3>appdebug:1 1 // Sets level to 1 (all messages level 1 or lower will print)
+RMC3>[Application 1], Debug level set to 1
+```
+
+### `Devlist:[slot]`
+
+Gets the current list of devices from `DeviceManager`
+
+Prints in the form [deviceKey] deviceName
+
+Example:
+
+```sh
+// Get the list of devices for program 1
+RMC3>devlist:1
+
+RMC3>[16:34:05.819]App 1:28 Devices registered with Device Mangager:
+[16:34:05.834]App 1:  [cec-1] Tx 5 cec 1
+[16:34:05.835]App 1:  [cec-1-cec]
+[16:34:05.835]App 1:  [cec-5] Rmc 1 cec 1
+[16:34:05.836]App 1:  [cec-5-cec]
+[16:34:05.836]App 1:  [cec-6] Dm Chassis In 1 cec 1
+[16:34:05.837]App 1:  [cec-6-cec]
+[16:34:05.837]App 1:  [cec-7] Dm Chassis Out 1 cec 1
+[16:34:05.838]App 1:  [cec-7-cec]
+[16:34:05.838]App 1:  [comm-1] Generic comm 1
+[16:34:05.838]App 1:  [comm-1-com]
+[16:34:05.839]App 1:  [comm-2] Rmc comm 1
+[16:34:05.839]App 1:  [comm-2-com]
+[16:34:05.840]App 1:  [comm-3] Rmc comm 2
+[16:34:05.840]App 1:  [comm-3-com]
+[16:34:05.841]App 1:  [dmMd8x8-1] DM-MD8x8 Chassis 1
+[16:34:05.842]App 1:  [dmRmc100C-1] DM-RMC-100-C Out 3
+[16:34:05.843]App 1:  [dmRmc200C-1] DM-RMC-200-C Out 2
+[16:34:05.843]App 1:  [dmRmc4kScalerC-1] DM-RMC-4K-SCALER-C Out 1
+[16:34:05.844]App 1:  [dmTx201C-1] DM-TX-201C 1
+[16:34:05.845]App 1:  [eisc-1A]
+[16:34:05.845]App 1:  [gls-odt-1] GLS-ODT-CN 1
+[16:34:05.846]App 1:  [gls-oir-1] GLS-OIR-CN 1
+[16:34:05.846]App 1:  [processor]
+[16:34:05.847]App 1:  [ssh-1] Generic SSH 1
+[16:34:05.847]App 1:  [ssh-1-ssh]
+[16:34:05.848]App 1:  [systemMonitor]
+[16:34:05.848]App 1:  [tcp-1] Generic TCP 1
+[16:34:05.849]App 1:  [tcp-1-tcp]
+```
+### `Setdevicestreamdebug:[slot][devicekey][both/rx/tx/off]`
+
+Enables debug for communication on a single device
+
+Example:
+
+```sh
+PRO3>setdevicestreamdebug:1 lights-1-com both
+
+[13:13:57.000]App 1:[lights-1-com] Sending 4 characters of text: 'test'
+
+PRO3>setdevicestreamdebug:1 lights-1-com off
+```
+
+### `Devprops:[slot][devicekey]`
+
+Gets the list of public properties on the device with the corresponding `deviceKey`
+
+Example:
+
+```sh
+// Get the properties on the device with Key 'cec-1-cec'
+// This device happens to be a CEC port on a DM-TX-201-C's HDMI input
+RMC3>devprops:1 cec-1-cec
+[
+  {
+    "Name": "IsConnected",
+    "Type": "Boolean",
+    "Value": "True",
+    "CanRead": true,
+    "CanWrite": false
+  },
+  {
+    "Name": "Key",
+    "Type": "String",
+    "Value": "cec-1-cec",
+    "CanRead": true,
+    "CanWrite": true
+  },
+  {
+    "Name": "Name",
+    "Type": "String",
+    "Value": "",
+    "CanRead": true,
+    "CanWrite": true
+  },
+  {
+    "Name": "Enabled",
+    "Type": "Boolean",
+    "Value": "False",
+    "CanRead": true,
+    "CanWrite": true
+  }
+]
+
+RMC3>
+
+```
+
+### `Devmethods:[slot][devicekey]`
+
+Gets the list of public methods available on the device
+
+Example:
+
+```sh
+// Get the methods on the device with Key 'cec-1-cec'
+RMC3>devmethods:1 cec-1-cec
+[
+  {
+    "Name": "SendText",
+    "Params": [
+      {
+        "Name": "text",
+        "Type": "String"
+      }
+    ]
+  },
+  {
+    "Name": "SendBytes",
+    "Params": [
+      {
+        "Name": "bytes",
+        "Type": "Byte[]"
+      }
+    ]
+  },
+  {
+    "Name": "SimulateReceive",
+    "Params": [
+      {
+        "Name": "s",
+        "Type": "String"
+      }
+    ]
+  },
+  //... Response abbreviated for clarity ...
+]
+
+RMC3>
+```
+
+### `Devjson:[slot][json formatted object {"devicekey", "methodname", "params"}]`
+
+Used in conjunction with devmethods, this command allows any of the public methods to be called from console and the appropriate arguments can be passed in to the method via a JSON object.
+
+This command is most useful for testing without access to hardware as it allows both simulated input and output for a device.
+
+Example:
+
+```sh
+// This command will call the SendText(string text) method on the
+// device with the Key 'cec-1-cec' and pass in "hello world" as the
+// argument parameter.  On this particular device, it would cause
+// the string to be sent via the CEC Transmit
+RMC3>devjson:1 {"deviceKey":"cec-1-cec", "methodName":"SendText", "params": ["hello world\r"]}
+
+// This command will call SimulateReceive(string text) on the device with Key 'cec-1-cec'
+// This would simulate receiving data on the CEC port of the DM-TX-201-C's HDMI input
+RMC3>devjson:1 {"deviceKey":"cec-1-cec", "methodName":"SimulateReceive", "params": ["hello citizen of Earth\r"]}
+```
+
+For additional examples, see this [file](https://github.com/PepperDash/Essentials/blob/main/devjson%20commands.json).

docs/docs/DigitalInput.md

@@ -0,0 +1,171 @@
+# DigitalInput
+
+Digital Inputs can be bridged directly to SIMPL from any device that is both inlcuded within essentials and has a relay.
+
+Consider the following example.
+
+```JSON
+{
+    "template": {
+        "roomInfo": [
+            {}
+        ],
+        "devices": [
+            {
+                "key": "processor",
+                "uid": 0,
+                "type": "pro3",
+                "name": "pro3",
+                "group": "processor",
+                "supportedConfigModes": [
+                    "compliance",
+                    "essentials"
+                ],
+                "supportedSystemTypes": [
+                    "hudType",
+                    "presType",
+                    "vtcType",
+                    "custom"
+                ],
+                "supportsCompliance": true,
+                "properties": {}
+            },
+            {
+                "key": "DigitalInput-1",
+                "uid": 3,
+                "name": "Digital Input 1",
+                "group": "api",
+                "type": "digitalInput",
+                "properties": {
+                    "portDeviceKey" : "processor",
+                    "portNumber" : 1,
+                    "disablePullUpResistor" : true
+                }
+            },
+            {
+                "key": "DigitalInput-2",
+                "uid": 3,
+                "name": "Digital Input 2",
+                "group": "api",
+                "type": "digitalInput",
+                "properties": {
+                    "portDeviceKey" : "processor",
+                    "portNumber" : 2,
+                    "disablePullUpResistor" : true
+                }
+            },
+            {
+                "key": "deviceBridge",
+                "uid": 4,
+                "name": "BridgeToDevices",
+                "group": "api",
+                "type": "eiscapiadv",
+                "properties": {
+                    "control": {
+                        "tcpSshProperties": {
+                            "address": "127.0.0.2",
+                            "port": 0
+                        },
+                        "ipid": "03",
+                        "method": "ipidTcp"
+                    },
+                    "devices": [
+                        {
+                            "deviceKey": "DigitalInput-1",
+                            "joinStart": 1
+                        },
+                        {
+                            "deviceKey": "DigitalInput-2",
+                            "joinStart": 2
+                        }
+                    ]
+                }
+            }
+        ]
+    }
+}
+```
+
+## RelayOutput Configuration Explanation
+
+This configuration is meant for a Pro3 device, and instantiates two relay ports and links them to an eisc bridge to another processor slot on ipid 3.  Let's break down the ```DigitalInput-1``` device.
+
+```JSON
+{
+    "key": "DigitalInput-1",
+    "uid": 3,
+    "name": "Digital Input 1",
+    "group": "api",
+    "type": "digitalInput",
+    "properties": {
+        "portDeviceKey" : "processor",
+        "portNumber" : 1,
+        "disablePullUpResistor" : true
+    }
+}
+```
+
+**```Key```**
+
+The Key is a unique identifier for essentials.  The key allows the device to be linked to other devices also defined by key.  All Keys MUST be unique, as every device is added to a globally-accessible dictionary.  If you have accidentally utilized the same key twice, Essentials will notify you during startup that there is an issue with the device.
+
+**```Uid```**
+
+The Uid is reserved for use with an PepperDash internal config generation tool, and is not useful to Essentials in any way.
+
+**```Name```**
+
+The Name a friendly name assigned to the device.  Many devices pass this data to the bridge for utilization in SIMPL.
+
+**```Group```**
+
+Utilized in certain Essentials devices.  In this case, the value is unimportant.
+
+**```Type```**
+
+The Type is the identifier for a specific type of device in Essentials.  A list of all valid types can be reported by using the consolecommand ```gettypes``` in Essentials.  In this case, the type is ```digitalInput```.  This type is valid for any instance of a Relay Output.
+
+**```Properties```**
+
+These are the properties essential to the instantiation of the identified type.
+
+### Properties
+
+There are two properties relevant to the instantiation of a relay device.
+
+**```portDeviceKey```**
+
+This property maps to the ```key``` of the device upon which the relay resides.
+
+**```portNumber```**
+
+This property maps to the number of the relay on the device you have mapped the relay device to.  Even if the device has only a single relay, ```portNumber``` must be defined.
+
+**```disablePullUpResistor```**
+
+This is a boolean value, therefore it is a case-sensitive ```true``` or ```false``` utilized to determine if the pullup resistor on the digital input will be disabled or not.
+
+### The JoinMap
+
+The joinmap for a ```digitalInput``` device is comprised of a single digital join.
+
+```cs
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class IDigitalInputJoinMap : JoinMapBaseAdvanced
+    {
+
+        [JoinName("InputState")]
+        public JoinDataComplete InputState = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Room Email Url", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+
+        public IDigitalInputJoinMap(uint joinStart)
+            : base(joinStart, typeof(IDigitalInputJoinMap))
+        {
+        }
+    }
+}
+```
+
+```InputState``` is a digital join that represents the feedback for the associated Digital Input Device.  Its join is set to 1.

docs/docs/Feedback-Classes.md

@@ -0,0 +1,128 @@
+# Feedback classes
+
+***
+* [YouTube Video - Using Feedbacks in PepperDash Essentials](https://youtu.be/5GQVRKbD9Rk)
+***
+
+The various Feedback classes are like "signals". They can enable various events, and are designed to be used where we need small data events to be sent without requiring custom handlers.
+
+## Why Feedbacks?
+
+We have been writing "code" in an environment, Simpl, for years and have taken for granted the power that signals in that environment give us. With the release of the ability to develop in C#, we have been handed a massive set of tools to potentially make our lives better, but because of the age and limited scope of the .NET 3.5 Compact Framework, many of the things that have been very easy to do in the past have become challenging or bulky to write. Crestron classes have things called "Sigs", which are a less-functional version of the signal that we used in Simpl, but we have no ability to use our own Sigs around our own classes. This forces us to break out of the constraints and mindset of Simpl programming, but simultaneously keeps us partially bound to the "old way" of doing things.
+
+Signals as we have known them since Simpl came around are great. They allow a certain type of functional programming to be built, where things operate in solutions, and we are given a whole set of behaviors that we don't really have to think about: Something goes high, the next thing responds, something else happens, etc. With our older C# framework, it is most straightforward (and least-flexible) to take Sig transitions and handle them using very-flat and bulky coding techniques: Switch/case blocks, if/else blocks, slow dictionaries... In the Essentials environment (and in many other frameworks) these methods quickly reveal their flaws.
+
+Enter the Feedback. We want to define simple events that can be attached to various things - TP Sigs, EISC, event handlers - and maintain their own state. This simplifies the interface to various device classes, and allows us to define functional, simple classes with well-defined means of connecting them together.
+
+### Feedbacks are similar to signals
+
+Feedbacks can:
+
+- Fire an event (OutputChange)
+- Be linked to one or more matching Crestron Sigs and update those Sigs
+- May contain complex computations to define the output value
+- Be put into test mode and have their value function overridden
+
+A Feedback is defined on a class using a C# construct called a `Func`. A `Func` is a small operation that returns a single value and is typically written in a lambda. The operation/expression in the `Func` is calculated when FireUpdate() is called on the Feedback. The result is then available for all objects listening to this Feedback.
+
+[Func documentation (MSDN)](<https://msdn.microsoft.com/en-us/library/bb534960(v=vs.110).aspx>)
+
+#### Creating Feedbacks
+
+The following `IntFeedback` returns the value of the `_VolumeLevel` field in this display class:
+
+```cs
+public class MyDisplay
+{
+    public IntFeedback VolumeLevelFeedback { get; private set; }
+
+...
+
+    public MyDisplay(...)
+    {
+        VolumeLevelFeedback = new IntFeedback(() => { return _VolumeLevel; });
+
+        ...
+```
+
+This BoolFeedback, adapted from the DmTx201Controller class, defines the `Func` first, and then creates the BoolFeedback using that `Func`. The value returned is true if the input is the digital-HDMI connection, and the TX hardware's VideoAttributes.HdcpActiveFeedback is true as well.
+
+```cs
+public class MyTx
+{
+    public BoolFeedback HdcpActiveFeedback { get; private set; }
+
+    Func HdcpActiveFeedbackFunc = () =>
+        ActualVideoInput == DmTx200Base.eSourceSelection.Digital
+        && tx.HdmiInput.VideoAttributes.HdcpActiveFeedback.BoolValue,
+
+...
+
+    public MyTx(...)
+    {
+        HdcpActiveFeedback = new BoolFeedback(HdcpActiveFeedbackFunc);
+
+        ...
+```
+
+#### Triggering Feedback
+
+In your classes, when you need to update the objects listening to a Feedback, you will call MyFeedback.FireUpdate() inside your class. This will trigger the evaluation of the Func value, update any linked Sigs, and fire the OutputChange event.
+
+```cs
+int _VolumeLevel;
+
+void ComDataChanged(string data) // volume=77
+{
+    if(data.StartsWith("volume="))
+    {
+        _VolumeLevel = MyParseVolumeMethod(data); // get the level, 77
+        VolumeLevelFeedback.FireUpdate(); // all listeners updated
+
+```
+
+#### Using Feedbacks
+
+Feedbacks of the various types have BoolValue, IntValue, UShortValue, and StringValue properties that return the current value of the Feedback.
+
+```cs
+if (MyTxDevice.HdcpActiveFeedback.BoolValue)
+{
+    ... do something that needs to happen when HDCP is active ...
+```
+
+Feedbacks all share an OutputChange event, that fires an event with an empty EventArgs object. The event handler can go get the appropriate \*Value property when the event fires. The example below is a bit contrived, but explains the idea.
+
+```cs
+    ...
+    MyDisplayDevice.VolumeLevelFeedback.OutputChange += MyDisplayVolumeHandler;
+
+    ...
+}
+
+void MyDisplayVolumeHandler(object o, EventArgs a)
+{
+    MobileControlServer.VolumeLevel = MyDisplayDevice.VolumeLevelFeedback.IntValue;
+```
+
+Feedbacks also have a LinkInputSig(\*InputSig sig) method that can directly trigger one or more Sigs on a Crestron device, without requiring an event handler. This is very useful for attaching states of our devices to Crestron touchpanels or EISCs, for example. The BoolFeedback class also has a LinkComplementInputSig(BoolInputSig sig) method that will invert the BoolFeedback's value to one or more attached Sigs.
+
+As well as updating upon change, the Feedback will set the Sig's value to the Feedback value upon calling the LinkInputSig method. This eliminates the need to walk through an object, property-by-property, and update several Sig values - as well as setting up to watch those values for changes. It is all handled in one step.
+
+```cs
+public class MyClass
+{
+    Tsw760 MyTp;
+
+    MyDisplay Display;
+
+    HookUpSigsMethod()
+    {
+        ...
+
+        // changes to VolumeLevelFeedback will automatically propagate to UShortInputSig 123
+        // changes to HdcpActiveFeedback will propagate to BoolInputSig 456
+        // and these two panel Sigs are updated immediately as well.
+        Display.VolumeLevelFeedback.LinkInputSig(MyTp.UshortInput[123]);
+        MyHdcpDevice.HdcpActiveFeedback.LinkInputSig(MyTp.BoolInput[456]);
+```

docs/docs/GenericComm.md

@@ -0,0 +1,381 @@
+# GenericComm
+
+One of the most common scenarios in control system development is utilizing RS232 to connect to a device.  Essentials doesn't restrict you to connecting a native essentials device or plugin to the comport.  You can directly access the comport, and even set baudrates on the fly if you so desire.
+
+Similarly you can instantiate one of several socket types in this manner and bridge them directly to SIMPL.
+
+Consider the following example.
+
+```JSON
+{
+    "template": {
+        "roomInfo": [
+            {}
+        ],
+        "devices": [
+            {
+                "key": "processor",
+                "uid": 0,
+                "type": "pro3",
+                "name": "pro3",
+                "group": "processor",
+                "supportedConfigModes": [
+                    "compliance",
+                    "essentials"
+                ],
+                "supportedSystemTypes": [
+                    "hudType",
+                    "presType",
+                    "vtcType",
+                    "custom"
+                ],
+                "supportsCompliance": true,
+                "properties": {}
+            },
+            {
+                "key": "Comport-1",
+                "uid": 3,
+                "name": "Comport 1",
+                "group": "api",
+                "type": "genericComm",
+                "properties": {
+                    "control": {
+                        "method": "com",
+                        "comParams": {
+                            "hardwareHandshake": "None",
+                            "parity": "None",
+                            "protocol": "RS232",
+                            "baudRate": 115200,
+                            "dataBits": 8,
+                            "softwareHandshake": "None",
+                            "stopBits": 1
+                        },
+                        "controlPortNumber": 1,
+                        "controlPortDevKey": "processor",
+                    }
+                }
+            },
+            {
+                "key": "Comport-2",
+                "uid": 3,
+                "name": "Comport 2",
+                "group": "api",
+                "type": "genericComm",
+                "properties": {
+                    "control": {
+                        "method": "ssh",
+                        "tcpSshProperties": {
+                            "address": "192.168.1.57",
+                            "port": 22,
+                            "username": "",
+                            "password": "",
+                            "autoReconnect": true,
+                            "autoReconnectIntervalMs": 10000
+                        }
+                    }
+                }
+            },
+            {
+                "key": "deviceBridge",
+                "uid": 4,
+                "name": "BridgeToDevices",
+                "group": "api",
+                "type": "eiscapiadv",
+                "properties": {
+                    "control": {
+                        "tcpSshProperties": {
+                            "address": "127.0.0.2",
+                            "port": 0
+                        },
+                        "ipid": "03",
+                        "method": "ipidTcp"
+                    },
+                    "devices": [
+                        {
+                            "deviceKey": "Comport-1",
+                            "joinStart": 1
+                        },
+                        {
+                            "deviceKey": "Comport-2",
+                            "joinStart": 3
+                        }
+                    ]
+                }
+            }
+        ]
+    }
+}
+```
+
+## GenericComm Configuration Explanation
+
+This configuration is meant for a Pro3 device, and instantiates one comport and one SSH session and links them to an eisc bridge to another processor slot on ipid 3.  Let's break down the ```Comport-1``` device.
+
+```JSON
+{
+    "key": "Comport-1",
+    "uid": 3,
+    "name": "Comport 1",
+    "group": "comm",
+    "type": "genericComm",
+    "properties": {
+        "control": {
+            "comParams": {
+                "hardwareHandshake": "None",
+                "parity": "None",
+                "protocol": "RS232",
+                "baudRate": 115200,
+                "dataBits": 8,
+                "softwareHandshake": "None",
+                "stopBits": 1
+            },
+            "controlPortNumber": 1,
+            "controlPortDevKey": "processor",
+            "method": "com"
+        }
+    }
+}
+```
+
+**```Key```**
+
+The Key is a unique identifier for essentials.  The key allows the device to be linked to other devices also defined by key.  All Keys MUST be unique, as every device is added to a globally-accessible dictionary.  If you have accidentally utilized the same key twice, Essentials will notify you during startup that there is an issue with the device.
+
+**```Uid```**
+
+The Uid is reserved for use with an PepperDash internal config generation tool, and is not useful to Essentials in any way.
+
+**```Name```**
+
+The Name a friendly name assigned to the device.  Many devices pass this data to the bridge for utilization in SIMPL.
+
+**```Group```**
+
+Utilized in certain Essentials devices.  In this case, the value is unimportant.
+
+**```Type```**
+
+The Type is the identifier for a specific type of device in Essentials.  A list of all valid types can be reported by using the consolecommand ```gettypes``` in Essentials.  In this case, the type is ```genericComm```.  This type is valid for any instance of a serial-based communications channel such as a Serial Port, SSH, UDP, or standard TCP/IP Socket.
+
+**```Properties```**
+
+These are the properties essential to the instantiation of the identified type.
+
+#### Control
+
+The properties within this property are dependant on the type of genericComm you wish to instantiate.  There is one common property for control of any type, and that is ```method```.  The ```method``` property requires a string that maps to the following enumerations in Essentials :
+
+```cs
+namespace PepperDash.Core
+{
+    // Summary:
+    //     Crestron Control Methods for a comm object
+    public enum eControlMethod
+    {
+        None = 0,
+        Com = 1,
+        IpId = 2,
+        IpidTcp = 3,
+        IR = 4,
+        Ssh = 5,
+        Tcpip = 6,
+        Telnet = 7,
+        Cresnet = 8,
+        Cec = 9,
+        Udp = 10,
+    }
+}
+```
+
+These enumerations are not case sensitive.  Not all methods are valid for a ```genericComm``` device.  For a comport, the only valid type would be ```Com```.  For a direct network socket, valid options are ```Ssh```, ```Tcpip```, ```Telnet```, and ```Udp```.
+
+##### ComParams
+
+A ```Com``` device requires a ```comParams``` object to set the properties of the comport.  The values of all properties are case-insensitive.
+
+```JSON
+{
+"comParams": {
+    "hardwareHandshake": "None",
+    "parity": "None",
+    "protocol": "RS232",
+    "baudRate": 115200,
+    "dataBits": 8,
+    "softwareHandshake": "None",
+    "stopBits": 1
+}
+```
+
+**Valid ```hardwareHandshake``` values are as follows**
+
+```sh
+"None"
+"Rts"
+"Cts"
+"RtsCts"
+```
+
+**Valid ```parity``` values are as follows**
+
+```sh
+"None"
+"Even"
+"Odd"
+"Mark"
+```
+
+**Valid ```protocol``` values are as follows**
+
+```sh
+"RS232"
+"RS422"
+"RS485"
+```
+
+**Valid ```baudRate``` values are as follows**
+
+```sh
+300
+600
+1200
+1800
+2400
+3600
+4800
+7200
+9600
+14400
+19200
+28800
+38400
+57600
+115200
+```
+
+**Valid ```dataBits``` values are as follows**
+
+```sh
+7
+8
+```
+
+**Valid ```softwareHandshake``` values are as follows**
+
+```sh
+"None"
+"XON"
+"XONT"
+"XONR"
+```
+
+**Valid ```stopBits``` values are as follows**
+
+```sh
+1
+2
+```
+
+Additionally, a ```control``` object for a physical hardware port needs to map to that physical port.  This is accomplished by utilizing the ```controlPortDevKey``` and ```port``` properties.
+
+**```controlPortDevKey```**
+
+This property maps to the ```key``` of the device upon which the port resides.
+
+**```port```**
+
+This property maps to the number of the port on the device you have mapped the relay device to.  Even if the device has only a single port, ```port``` must be defined.
+
+##### TcpSshParams
+
+A ```Ssh```, ```TcpIp```, or ```Udp``` device requires a ```tcpSshProperties``` object to set the propeties of the socket.
+
+```Json
+{
+    "tcpSshProperties": {
+        "address": "192.168.1.57",
+        "port": 22,
+        "username": "",
+        "password": "",
+        "autoReconnect": true,
+        "autoReconnectIntervalMs": 10000
+    }
+}
+```
+
+**```address```**
+
+This is the IP address, hostname, or FQDN of the resource you wish to open a socket to.  In the case of a UDP device, you can set either a single whitelist address with this data, or an appropriate broadcast address.
+
+**```port```**
+
+This is the port you wish to utilize for the socket connection.  Certain protocols require certain ports - ```Ssh``` being ```22``` and ```Telnet``` being ```23```.
+
+**```username```**
+
+This is the username (if required) for authentication to the device you are connecting to.  Typcally only required for ```Ssh``` connections.
+
+**```password```**
+
+This is the password (if required) for authentication to the device you are connecting to.  Typcally only required for ```Ssh``` connections.
+
+**```autoreconnect```**
+
+This is a boolean value, therefore it is a case-sensitive ```true``` or ```false``` utilized to determine if the socket will attempt to reconnect upon loss of connection.
+
+**```autoReconnectIntervalMs```**
+
+This is the duration of time, in Miliseconds, that the socket will wait before discrete connection attempts if ```autoreconnect``` is set to true.
+
+##### The JoinMap
+
+The join map for a generic comms device is fairly simple.  
+
+```cs
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("TextReceived")]
+        public JoinDataComplete TextReceived = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Text Received From Remote Device", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("SendText")]
+        public JoinDataComplete SendText = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Text Sent To Remote Device", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("SetPortConfig")]
+        public JoinDataComplete SetPortConfig = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Set Port Config", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("Connect")]
+        public JoinDataComplete Connect = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Connect", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Connected")]
+        public JoinDataComplete Connected = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Connected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Status")]
+        public JoinDataComplete Status = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+
+        public IBasicCommunicationJoinMap(uint joinStart)
+            : base(joinStart, typeof(IBasicCommunicationJoinMap))
+        {
+        }
+    }
+}
+```
+
+```TextReceived``` is a stream of strings received **FROM** the connected device.
+
+```SendText``` is for any strings you wish to send **TO** the connected device.
+
+```Connect``` connects to a remote socket device on the rising edge of the signal.
+
+```Connected``` represents the current connection state.  High for Connected, low for Disconnected.
+
+```Status``` is an analog value that is representative of the connection states as reported by the SIMPL TCP/IP socket symbol.
+
+All of the preceeding joins are set to join ```1```.  The second serial input join is reserved for ```2```.  It allows you to send a ```comparams``` json object as a string, utilizing the same format mentioned previously in this document.  Doing so will override the configured comport specifications.

docs/docs/Get-started.md

@@ -0,0 +1,26 @@
+# Get started
+
+---
+[YouTube Video - Getting Started with PepperDash Essentials](https://youtu.be/FxEZtbpCwiQ)
+***
+
+## Download or clone
+
+You may clone Essentials at <https://github.com/PepperDash/Essentials.git>
+
+## How to Get Started
+
+This section assumes knowledge of loading programs to and working with the file system on a Crestron processor.
+
+1. Using an SFTP client, load `PepperDashEssentials1.4.32.cpz` to the processor in program slot 1 and start the program by sending console command `progload -p:1`
+1. On first boot, the Essentials Application will build the necessary configuration folder structure in the User/Program1/ path.
+1. The application has some example configuration files included. Copy `/Program01/Example Configuration/EssentialsSpaceHuddleRoom/configurationFile-HuddleSpace-2-Source.json` to the `/User/Program1/` folder.
+1. Copy the SGD files from `/Program01/SGD` to `/User/Program1/sgd`
+1. Reset the program via console `progreset -p:1`. The program will load the example configuration file.
+1. Via console, you can run the `devlist:1` command to get some insight into what has been loaded from the configuration file into the system . This will print the basic device information in the form of ["key"] "Name". The "key" value is what we can use to interact with each device uniquely.
+1. Run the command `devprops:1 display-1`. This will print the real-time property values of the device with key "display-1".
+1. Run the command `devmethods:1 display-1`. This will print the public methods available for the device with key "display-1".
+1. Run the command `devjson:1 {"deviceKey":"display-1","methodName":"PowerOn", "params": []}`. This will call the method PowerOn() on the device with key "display-1".
+1. Run the provided example XPanel SmartGraphics project and connect to your processor at the appropriate IPID.
+
+Next: [Standalone use](~/docs/Standalone-Use.md)

docs/docs/Glossary-of-Terms.md

@@ -0,0 +1,25 @@
+# Glossary of Terms
+
+**Assembly**
+ An assembly is a file that is automatically generated by the compiler upon successful compilation of every . NET application. It can be either a Dynamic Link Library or an executable file. It is generated only once for an application and upon each subsequent compilation the assembly gets updated.
+
+**Device**
+A base class, defined in the PepperDash.Core library (`PepperDash.Core.Device`).  It can represent a physical device, or a virtual device or behaviour.  Generally, most new classes defined in the Essentials ecosystem should derive from Device.
+
+**DeviceManager**
+A static class (`PepperDash.Core.Essentials.DeviceManager`) that contains an unordered collection of Devices.  Devices are added/registered to the DeviceManager and later can be retrieved as references by Key.
+
+**Essentials Application**
+A Crestron SIMPL# Pro application that is made up of the Essentials Framework and any optionally any number of Essentials Plugins
+
+**Essentials Framework**
+The collection of core libraries that make up the framework
+
+**Essentials Plugins**
+SIMPL# Pro libraries that reference the Essentials Framework and are loaded at runtime to add or extend functionality
+
+**IKeyed**
+An important interface defined in PepperDash.Core that requires a string property named Key, whose value must be unique.
+
+**PepperDash.Core**
+A SIMPL# utility library referenced by Essentials Framework.

docs/docs/Home.md

@@ -0,0 +1,59 @@
+# Welcome to PepperDash Essentials!
+
+PepperDash Essentials is an open-source framework for control systems, built on Crestron's Simpl# Pro framework. It can be configured as a standalone program capable of running a wide variety of system designs and can also be used to augment other Crestron programs.
+
+Essentials is a collection of C# libraries that can be used in many ways. It is a 100% configuration-driven framework that can be extended to add different workflows and behaviors, either through the addition of new device-types and classes, or via a plug-in mechanism. The framework is a collection of things that are all related and interconnected, but in general do not have strong dependencies on each other.
+
+---
+
+## Get started
+
+- [Download essentials build or clone repo](~/docs/Get-started.md)
+- [How to get started](~/docs/Get-started.md)
+- [YouTube Video Series Playlist](https://youtube.com/playlist?list=PLKOoNNwgPFZdV5wDEBDZxTHu1KROspaBu)
+- [Discord Server](https://discord.gg/6Vh3ssDdPs)
+
+Or use the links to the right to navigate our documentation.
+
+---
+
+## Benefits
+
+- Runs on Crestron 3-Series, **4-Series** and VC-4 Control System platforms
+- Reduced hardware overhead compared to S+ and Simpl solutions
+- Quick development cycle
+- Shared resources made easily available
+- More flexibility with less code
+- Configurable using simple JSON files
+- Is awesome
+
+---
+
+## Comment
+
+The Essentials wiki is clearly in-progress right now. Take a look at the links to the right. We are actively working on this documentation, so please be patient with us. If you have any comments on or suggestions for the documentation, please file an issue here, with as much detail as you can provide: <https://github.com/PepperDash/Essentials/issues>
+
+Thanks!
+
+---
+
+## Collaboration
+
+Essentials is an open-source project and we encourage collaboration on this community project. For features that may not be useful to the greater community, or for just-plain learning, we want to remind developers to try writing plugins for Essentials. More information can be found here: [Plugins](~/docs/Plugins.md)
+
+### Open-source-collaborative workflow
+
+The `main` branch always contain the latest stable version. The `development` branch is used for most development efforts.
+
+[GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) will be used as the workflow for this collaborative project. To contribute, follow this process:
+
+1. Fork this repository ([More Info](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/working-with-forks))
+2. Create a branch using standard GitFlow branch prefixes (feature/hotfix) followed by a descriptive name.
+   - Example: `feature/add-awesomeness` or `hotfix/really-big-oops`
+   - When working on a new feature or bugfix, branch from the `development` branch. When working on a hotfix, branch from `main`.
+3. Make commits as necessary (often is better). And use concise, descriptive language, leveraging issue notation and/or [Closing Keywords](https://help.github.com/articles/closing-issues-using-keywords) to ensure any issues addressed by your work are referenced accordingly.
+4. When the scope of the work for your branch is complete, make sure to rebase your branch in case further progress has been made since the repo was forked
+5. Create a Pull Request to pull your branch into the appropriate branch in the main repository.
+6. Your Pull Request will be reviewed by our team and evaluated for inclusion into the main repository.
+
+Next: [Get started](~/docs/Get-started.md)

docs/docs/IR-Driver-Bridging.md

@@ -0,0 +1,103 @@
+## Legacy IR Driver Bridging
+
+```json
+{
+	"id": "1",
+	"name": "Apple TV",
+	"key": "appleTv-1",
+	"type": "genericIrController",
+	"uid": 3,
+	"group": "devices",
+	"properties": {
+		"control": {
+			"method": "ir",
+			"irFile": "Apple_AppleTV_4th_Gen_Essentials.ir",
+			"controlPortDevKey": "processor",
+			"controlPortNumber": "1"
+		}
+	}
+}
+```
+
+## Bridge Join Map IR Driver Bridging
+
+```json
+{
+	"id": "1",
+	"name": "Apple TV",
+	"key": "appleTv-1",
+	"type": "genericIrController",
+	"uid": 3,
+	"group": "devices",
+	"properties": {
+		"control": {
+			"method": "ir",
+			"irFile": "Apple_AppleTV_4th_Gen_Essentials.ir",
+			"controlPortDevKey": "processor",
+			"controlPortNumber": "1",
+			"useBridgeJoinMap": true
+		}
+	}
+}
+```
+
+Both methods will bridge the IR signals with `Standard Command` defined in the IR file.  
+
+The `useBridgeJoinMap` property implements `GenericIrControllerJoinMap.cs` to standardized IR driver `Standard Command` signal joins.  This allows users to swap IR drivers that implement `Standard Command` while bridging IR signals consistently between drivers.  For example, when `useBridgeJoinMap` is present, channel up will be mapped to join-22 + device `joinstart` for any IR driver that has the signal marked as `Standard Command`.
+
+
+## GenericIrControllerJoinMap (Example)
+
+### Digitals
+
+| Join Number | Join Span | Description | Type                | Capabilities |
+| ----------- | --------- | ----------- | ------------------- | ------------ |
+| 1           | 1         | PLAY        | Digital             | FromSIMPL    |
+| 2           | 1         | STOP        | Digital             | FromSIMPL    |
+| 3           | 1         | PAUSE       | Digital             | FromSIMPL    |
+| 4           | 1         | FSCAN       | Digital             | FromSIMPL    |
+| 5           | 1         | RSCAN       | Digital             | FromSIMPL    |
+| 9           | 1         | POWER       | Digital             | FromSIMPL    |
+| 10          | 1         | 0           | Digital             | FromSIMPL    |
+| 11          | 1         | 1           | Digital             | FromSIMPL    |
+| 12          | 1         | 2           | Digital             | FromSIMPL    |
+| 13          | 1         | 3           | Digital             | FromSIMPL    |
+| 14          | 1         | 4           | Digital             | FromSIMPL    |
+| 15          | 1         | 5           | Digital             | FromSIMPL    |
+| 16          | 1         | 6           | Digital             | FromSIMPL    |
+| 17          | 1         | 7           | Digital             | FromSIMPL    |
+| 18          | 1         | 8           | Digital             | FromSIMPL    |
+| 19          | 1         | 9           | Digital             | FromSIMPL    |
+| 21          | 1         | ENTER       | Digital             | FromSIMPL    |
+| 22          | 1         | CH+         | Digital             | FromSIMPL    |
+| 23          | 1         | CH-         | Digital             | FromSIMPL    |
+| 27          | 1         | POWER_ON    | Digital             | FromSIMPL    |
+| 28          | 1         | POWER_OFF   | Digital             | FromSIMPL    |
+| 30          | 1         | LAST        | Digital             | FromSIMPL    |
+| 41          | 1         | BACK        | Digital             | FromSIMPL    |
+| 42          | 1         | GUIDE       | Digital             | FromSIMPL    |
+| 43          | 1         | INFO        | Digital             | FromSIMPL    |
+| 44          | 1         | MENU        | Digital             | FromSIMPL    |
+| 45          | 1         | UP_ARROW    | Digital             | FromSIMPL    |
+| 46          | 1         | DN_ARROW    | Digital             | FromSIMPL    |
+| 47          | 1         | LEFT_ARROW  | Digital             | FromSIMPL    |
+| 48          | 1         | RIGHT_ARROW | Digital             | FromSIMPL    |
+| 49          | 1         | SELECT      | Digital             | FromSIMPL    |
+| 54          | 1         | PAGE_UP     | Digital             | FromSIMPL    |
+| 55          | 1         | PAGE_DOWN   | Digital             | FromSIMPL    |
+| 61          | 1         | A           | Digital             | FromSIMPL    |
+| 62          | 1         | B           | Digital             | FromSIMPL    |
+| 63          | 1         | C           | Digital             | FromSIMPL    |
+| 64          | 1         | D           | Digital             | FromSIMPL    |
+
+### Analogs
+
+| Join Number | Join Span | Description | Type                | Capabilities |
+| ----------- | --------- | ----------- | ------------------- | ------------ |
+
+### Serials
+
+| Join Number | Join Span | Description | Type                | Capabilities |
+| ----------- | --------- | ----------- | ------------------- | ------------ |
+
+

docs/docs/JoinMaps.md

@@ -0,0 +1,155 @@
+# What is a Join Map?
+
+A join map is a class that defines the list of joins accessible to an `EssentialsBridgeableDevice` across an EISC Bridge.
+
+## Why use a Join Map?
+
+A join map is necessary to bridge joins across an EISC bridge from Essentials to a SIMPL program. Join maps can be overriden in a configuration as necessary, but by default each device has a standard join map that publishes joins as a function of the joinOffset property of the device within a given Essentials Bridge. Join maps are reusable and extensible. Several join maps for standard device types already exist within Essentials, and those can be utilized for plugin creation without creation of a new join map. Utilizing standard join maps allows you to create a consistent API between device types that allows switching of devices via config without any new SIMPL or SIMPL#Pro code being written.
+
+## How Join maps Work
+
+Whenever you instantiate a device and link that device to an EISC bridge utilizing your configuration in Essentials, the method `LinkToApi()` is called. This method matches various methods, feedbacks, and properties to joins on the EISC bridge in order to create a consistent API for communication to SIMPL.
+
+Whenever `LinkToApi()` is called, it creates a new instance of the device's joinMap class on demand. The constructor of that joinMap creates an object containing the join metadata, adds any configured join offsets to the standard join map, and adds all associated joins to a global join list that can be easily referenced from the command line.
+
+There are several components for each join within a join map.
+
+```cs
+[JoinName("Online")]
+        public JoinDataComplete Online = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Reports Online Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+```
+
+### Attribute
+
+```cs
+[JoinName("Online")]
+```
+
+If the attribute is present, the join data is added to the publically available list `Joins`. This can be used to "prebuild" functionality within a join map that you may not yet need. If you do not add this attribute (or simply comment it out), the join data will not be displayed whenever join data is printed using the `getjoinmap` command.
+
+### JoinData
+
+```cs
+JoinData() { JoinNumber = 1, JoinSpan = 1 };
+```
+
+`JoinData` contains the pertinent information for the bridge. JoinData contains the information that the bridge utilizes to create each associated connection from the EISC to the methods, properties, and feedbacks associated with a device.
+
+`JoinNumber` is the 1-based index of the join you wish to tie to a given method, property, or feedback. This join, combined with the offset defined in the brdige's configuration for a device, will give you the SIMPL EISC join linked to the given data.
+
+`JoinSpan` determines a number of associated joins. Perhaps you have a list of Camera Presets, or a list of inputs. You can create one single join map entry and define the span of all associated join types.
+
+A `JoinData` object with a `JoinNumber` of 11 and a `JoinSpan` of 10 and a `joinOffset` of 0 is associated with joins 11-20 on the EISC.
+
+### JoinMetadata
+
+```cs
+JoinMetadata() { Label = "Reports Online Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital }
+```
+
+`JoinMetadata` provides the data reported when the `getjoinmap` command is used.
+
+`Label` is the description of the what this join does.
+
+`JoinCapabilities` is represented by an enum defining the direction that the data is flowing for this join. Appropriate values are:
+
+```cs
+public enum eJoinCapabilities
+    {
+        None = 0,
+        ToSIMPL = 1,
+        FromSIMPL = 2,
+        ToFromSIMPL = ToSIMPL | FromSIMPL
+    }
+```
+
+`JoinType` is represented by an enum defining the data type in SIMPL. Appropriate values are:
+
+```cs
+public enum eJoinType
+    {
+        None = 0,
+        Digital = 1,
+        Analog = 2,
+        Serial = 4,
+        DigitalAnalog = Digital | Analog,
+        DigitalSerial = Digital | Serial,
+        AnalogSerial = Analog | Serial,
+        DigitalAnalogSerial = Digital | Analog | Serial
+    }
+```
+
+### JoinDataComplete
+
+```chsarp
+JoinDataComplete(JoinData data, JoinMetadata metadata);
+```
+
+`JoinDataComplete` represents the `JoinData` and the `JoinMetadata` in a single object. You can call an instance of `JoinDataComplete` to report any information about a specific join. In a device bridge, you would utilize the `JoinNumber` property to link a feature from the plugin to the EISC API.
+
+### Example Join Map
+
+This is the join map for `IBasicCommunication` Devices
+
+```cs
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("TextReceived")]
+        public JoinDataComplete TextReceived = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Text Received From Remote Device", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("SendText")]
+        public JoinDataComplete SendText = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Text Sent To Remote Device", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("SetPortConfig")]
+        public JoinDataComplete SetPortConfig = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Set Port Config", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("Connect")]
+        public JoinDataComplete Connect = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Connect", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Connected")]
+        public JoinDataComplete Connected = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Connected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Status")]
+        public JoinDataComplete Status = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+
+        public IBasicCommunicationJoinMap(uint joinStart)
+            : base(joinStart, typeof(IBasicCommunicationJoinMap))
+        {
+        }
+    }
+}
+```
+
+### Returning Data on Join Maps
+
+A mechanism for printing join maps to console from a running Essentials program is built in to Essentials.
+
+Given a single Generic Communication device with a `joinStart` of 11 and a key of "Com-1", defined on a bridge with a key of "Bridge-1" and IPID of A0, the command `getjoinmap Bridge-1 Com-1` would return:
+
+```sh
+Join Map for device 'Com-1' on EISC 'Bridge-1':
+GenericComm:
+
+Digitals:
+Found 2 Digital Joins
+Join Number: '11' | JoinSpan: '1' | Label : 'Connect' | Type: 'Digital' | Capabilities : 'FromSimpl'
+Join Number: '11' | JoinSpan: '1' | Label : 'Connected' | Type: 'Digital' | Capabilities : 'ToSimpl'
+Analogs:
+Found 1 Analog Joins
+Join Number: '11' | JoinSpan: '1' | Label : 'Status' | Type: 'Analog' | Capabilities : 'ToSimpl'
+Serials:
+Found 3 Serial Joins
+Join Number: '11' | JoinSpan: '1' | Label : 'Text Received From Remote Device' | Type: 'Serial' | Capabilities : 'FromSimpl'
+Join Number: '11' | JoinSpan: '1' | Label : 'Text Sent To Remote Device' | Type: 'Serial' | Capabilities : 'ToSimpl'
+Join Number: '12' | JoinSpan: '1' | Label : 'Set Port Config' | Type: 'Serial' | Capabilities : 'FromSimpl'
+```

docs/docs/Plugins-Deprecated.md

@@ -0,0 +1,74 @@
+# Deprecated
+
+**Note : this entry is out of date - please see [Plugins](~/docs/Plugins.md)**
+
+## What are Essentials Plugins?
+
+Plugins are SIMPL# Pro libraries that reference the Essentials Framework and can be loaded into an Essentials Application at runtime to extend functionality beyond what the Essentials Framework provides on its own.
+
+## Why Use Plugins?
+
+Plugins are a way to extend or add new functionality to the Essentials Application without having to modify the actual Framework. In most cases, a plugin can be written to support a new device or behavior. Using plugins also limits the scope of understanding needed to work within the Essentials Framework.
+
+## Should I use a Plugin?
+
+Essentials is meant to be a lightweight framework and an extensible basis for development. While some devices are included in the framework, mostly for the purposes of providing examples and developing and prototyping new device types, the bulk of new development is intended to take place in Plugins. Once a plugin adds new functionality that may be of benefit if shared across multiple plugins, it may make sense to port that common logic (base classes and/or interfaces) back into the framework to make it available to others. The thrust of future Essentials development is targeted towards building a library of plugins.
+
+## How do Plugins Work?
+
+One or more plugins can be loaded to the /user/ProgramX/plugins as .dlls or .cplz packages. When the Essentials Application starts, it looks for any .cplz files, unzips them and then iterates any .dll assemblies in that folder and loads them. Once the plugin assemblies are loaded the Essentials Application will then attempt to load a configuration file and construct items as defined in the file. Those items can be defined in either the Essentials Framework or in any of the loaded plugin assemblies.
+
+![Architecture drawing](~/docs/images/Plugin%20Load%20Sequence.png)
+
+## What Must be Implemented in a Plugin for it to Work?
+
+All plugin assemblies must contain a static method called LoadPlugin():
+
+```cs
+public class SomeDevice : Device , IBridge  //IBridge only needs to be implemented if using a bridge
+{
+    // This string is used to define the minimum version of the
+    // Essentials Framework required for this plugin
+    public static string MinimumEssentialsFrameworkVersion = "1.4.23";
+
+    // This method gets called by the Essentials Framework when the application starts.
+    // It is intended to be used to load the new Device type(s) specified in the plugin
+    public static void LoadPlugin()
+    {
+        DeviceFactory.AddFactoryForType("typeName", FactoryMethod);
+        // typeName should be the unique string that identifies the type of device to build,
+        // FactoryMethod represents the method that takes a DevicConfig object as and argument
+        // and returns an instance of the desired device type
+    }
+
+    // This is a factory method to construct a device and return it to be
+    // added to the DeviceManager
+    public static Device FactoryMethod(DeviceConfig dc)
+    {
+        return new SomeDevice(dc.key, dc.name, dc);
+    }
+
+#region IBridge
+    // This method is called by an EiscApi bridge instance and should call an extension method
+    // defined in your plugin.  Required for implementing IBridge
+    public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey)
+    {
+        this.LinkToApiExt(trilist, joinStart, joinMapKey);
+    }
+#endregion
+}
+```
+
+## SIMPL Bridging
+
+Optionally, if your plugin device needs to be able to bridge to a SIMPL program over EISC, and there isn't already an existing bridge class in the Essentials Framework, you can write a new bridge class in your plugin. However, in order for the Essentials Application to be able to us that new bridge, the bridge must implement the IBridge interface with the required LinkToApi() Extension method.
+
+Often though, you may find that a bridge class already exists in the Essentials Framework that you can leverage. For example, if you were writing a plugin to support a new display model that isn't already in the Essentials Framework, you would define a class in your plugin that inherits from PepperDash.Essentials.Core.DisplayBase. If you're only implementing the standard display control functions such as power/input/volume control, then the existing bridge class `DisplayControllerBridge` can be used. If you needed to add additional functions to the bridge, then you would need to write your own bridge in the plugin.
+
+For additional info see the [SIMPL-Bridging article](~/docs/SIMPL-Bridging.md).
+
+## Template Essentials Plugin Repository
+
+Fork this repository when starting a new plugin. The template repository uses the essentials-builds repository as a submodule. This allows the plugin to reference a specific build version of Essentials. You must make sure that you checkout the correct build of the Essentials-Builds repo that contains any dependencies that your plugin may rely on.
+
+[Essentials Plugin Template Repository](https://github.com/PepperDash/EssentialsPluginTemplate)

docs/docs/Plugins.md

@@ -0,0 +1,131 @@
+# What are Essentials Plugins?
+
+**Note : this entry updates a deprecated method - for information related to that deprecated method, see [Plugins - Deprecated](~/docs/Plugins-Deprecated.md)**
+
+***
+* [YouTube Video - Loading Plugins in PepperDash Essentials](https://youtu.be/NA64iyNNAgE)
+* [YouTube Video - Build Your Own Plugin, Part 1](https://youtu.be/m2phC8g3Kfk)
+* [YouTube Video - Build Your Own Plugin, Part 2](https://youtu.be/2_PrWRk6Gy0)
+***
+
+Plugins are SIMPL# Pro libraries that reference the Essentials Framework and can be loaded into an Essentials Application at runtime to extend functionality beyond what the Essentials Framework provides on its own.
+
+## Why Use Plugins?
+
+Plugins are a way to extend or add new functionality to the Essentials Application without having to modify the actual Framework. In most cases, a plugin can be written to support a new device or behavior. Using plugins also limits the scope of understanding needed to work within the Essentials Framework.
+
+## Should I use a Plugin?
+
+Essentials is meant to be a lightweight framework and an extensible basis for development. While some devices are included in the framework, mostly for the purposes of providing examples and developing and prototyping new device types, the bulk of new development is intended to take place in Plugins. Once a plugin adds new functionality that may be of benefit if shared across multiple plugins, it may make sense to port that common logic (base classes and/or interfaces) back into the framework to make it available to others. The thrust of future Essentials development is targeted towards building a library of plugins.
+
+## How do Plugins Work?
+
+One or more plugins can be loaded to the /user/ProgramX/plugins as .dlls or .cplz packages. When the Essentials Application starts, it looks for any .cplz files, unzips them and then iterates any .dll assemblies in that folder and loads them. Once the plugin assemblies are loaded the Essentials Application will then attempt to load a configuration file and construct items as defined in the file. Those items can be defined in either the Essentials Framework or in any of the loaded plugin assemblies.
+
+![Architecture drawing](~/docs/images/Plugin%20Load%20Sequence.png)
+
+## What Must be Implemented in a Plugin for it to Work?
+
+All plugin assemblies must contain a class which inherits from ```EssentialsPluginDeviceFactory<T>```, where ```<T>``` is a class which inherits from ```PepperDash.Essentials.Core.EssentialsDevice```
+
+Within this class, we will define some metadata for the plugin and define which constructor to use
+for instantiating each class as defined by type.
+
+Note that multiple types can be loaded from the same plugin.
+
+```cs
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Core;
+using System.Collections.Generic;
+
+namespace MyPlugin
+{
+    public class SomeDeviceFactory : EssentialsPluginDeviceFactory<SomeDevice>
+    {
+        // This method defines metadata for the devices in the plugin
+        public SomeDeviceFactory()
+        {
+            // This string is used to define the minimum version of the
+            // Essentials Framework required for this plugin
+            MinimumEssentialsFrameworkVersion = "1.5.0";
+
+            // This string is used to define all valid type names for
+            // this plugin.  This string is case insensitive
+            TypeNames = new List<string> { "SomeDevice" , "ThisNewDevice" };
+        }
+
+        // This method instantiates new devices for the defined type
+        // within the plugin
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            // Deserialize the json properties for the loaded type to a new object
+            var props = dc.Properties.ToObject<SomeDeviceProperties>();
+
+            // Return a newly instantiated device using the desired constructor
+            // If no valid property data exists, return null with console print
+            // describing the failure.
+            if (props == null)
+            {
+                Debug.Console(0, "No valid property data for 'SomeDevice' - Verify Configuration.");
+                Debug.Console(0, dc.Properties.ToString());
+                return null;
+            }
+            return new SomeDevice(dc.Key, dc.Name, props);
+        }
+    }
+
+    public class OtherDeviceFactory : EssentialsPluginDeviceFactory<OtherDevice>
+    {
+        // This method defines metadata for the devices in the plugin
+        public OtherDeviceFactory()
+        {
+            // This string is used to define the minimum version of the
+            // Essentials Framework required for this plugin
+            MinimumEssentialsFrameworkVersion = "1.5.0";
+
+            // This string is used to define all valid type names for
+            // this plugin.  This string is case insensitive
+            TypeNames = new List<string> { "OtherDevice", "ThisOtherDevice" };
+        }
+
+        // This method instantiates new devices for the defined type
+        // within the plugin
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            // Deserialize the json properties for the loaded type to a new object
+            var props = dc.Properties.ToObject<OtherDeviceProperties>();
+
+            // Return a newly instantiated device using the desired constructor
+            // If no valid property data exists, return null with console print
+            // describing the failure.
+            if (props == null)
+            {
+                Debug.Console(0, "No valid property data for 'OtherDevice' - Verify Configuration.");
+                Debug.Console(0, dc.Properties.ToString());
+                return null;
+            }
+            return new OtherDevice(dc.Key, dc.Name, props);
+        }
+    }
+}
+```
+
+## SIMPL Bridging
+
+Optionally, if your plugin device needs to be able to bridge to a SIMPL program over EISC, and there isn't already an existing bridge class in the Essentials Framework, you can write a new bridge class in your plugin. However, in order for the Essentials Application to be able to us that new bridge, the bridge must implement the ```IBridgeAdvanced``` interface with the required ```LinkToApi()``` Extension method.
+
+If you are writing code for a bridgeable device, you should be inheriting from ```EssentialsBridgeableDevice```, which inherits from the already-required ```EssentialsDevice``` and implements ```IBridgeAdvanced```.
+
+Often though, you may find that a bridge class already exists in the Essentials Framework that you can leverage. For example, if you were writing a plugin to support a new display model that isn't already in the Essentials Framework, you would define a class in your plugin that inherits from PepperDash.Essentials.Core.DisplayBase. If you're only implementing the standard display control functions such as power/input/volume control, then the existing bridge class `DisplayControllerBridge` can be used. If you needed to add additional functions to the bridge, then you would need to write your own bridge in the plugin.
+
+For additional info see the [SIMPL-Bridging article](~/docs/SIMPL-Bridging.md).
+
+## Template Essentials Plugin Repository
+
+Fork this repository when starting a new plugin. The template repository uses the essentials-builds repository as a submodule. This allows the plugin to reference a specific build version of Essentials. You must make sure that you checkout the correct build of the Essentials-Builds repo that contains any dependencies that your plugin may rely on.
+
+[Essentials Plugin Template Repository](https://github.com/PepperDash/EssentialsPluginTemplate)

docs/docs/RelayOutput.md

@@ -0,0 +1,164 @@
+# RelayOutput
+
+Relays can be bridged directly to SIMPL from any device that is both inlcuded within essentials and has a relay.
+
+Consider the following example.
+
+```JSON
+{
+    "template": {
+        "roomInfo": [
+            {}
+        ],
+        "devices": [
+            {
+                "key": "processor",
+                "uid": 0,
+                "type": "pro3",
+                "name": "pro3",
+                "group": "processor",
+                "supportedConfigModes": [
+                    "compliance",
+                    "essentials"
+                ],
+                "supportedSystemTypes": [
+                    "hudType",
+                    "presType",
+                    "vtcType",
+                    "custom"
+                ],
+                "supportsCompliance": true,
+                "properties": {}
+            },
+            {
+                "key": "Relay-1",
+                "uid": 3,
+                "name": "Relay 1",
+                "group": "api",
+                "type": "relayOutput",
+                "properties": {
+                    "portDeviceKey" : "processor",
+                    "portNumber" : 1
+                }
+            },
+            {
+                "key": "Relay-2",
+                "uid": 3,
+                "name": "Relay 2",
+                "group": "api",
+                "type": "relayOutput",
+                "properties": {
+                    "portDeviceKey" : "processor",
+                    "portNumber" : 2
+                }
+            },
+            {
+                "key": "deviceBridge",
+                "uid": 4,
+                "name": "BridgeToDevices",
+                "group": "api",
+                "type": "eiscapiadv",
+                "properties": {
+                    "control": {
+                        "tcpSshProperties": {
+                            "address": "127.0.0.2",
+                            "port": 0
+                        },
+                        "ipid": "03",
+                        "method": "ipidTcp"
+                    },
+                    "devices": [
+                        {
+                            "deviceKey": "Relay-1",
+                            "joinStart": 1
+                        },
+                        {
+                            "deviceKey": "Relay-2",
+                            "joinStart": 2
+                        }
+                    ]
+                }
+            }
+        ]
+    }
+}
+```
+
+## RelayOutput Configuration Explanation
+
+This configuration is meant for a Pro3 device, and instantiates two relay ports and links them to an eisc bridge to another processor slot on ipid 3.  Let's break down the ```Relay-1``` device.
+
+```JSON
+{
+    "key": "Relay-1",
+    "uid": 3,
+    "name": "Relay 1",
+    "group": "api",
+    "type": "relayOutput",
+    "properties": {
+        "portDeviceKey" : "processor",
+        "portNumber" : 1
+    }
+}
+```
+
+**```Key```**
+
+The Key is a unique identifier for essentials.  The key allows the device to be linked to other devices also defined by key.  All Keys MUST be unique, as every device is added to a globally-accessible dictionary.  If you have accidentally utilized the same key twice, Essentials will notify you during startup that there is an issue with the device.
+
+**```Uid```**
+
+The Uid is reserved for use with an PepperDash internal config generation tool, and is not useful to Essentials in any way.
+
+**```Name```**
+
+The Name a friendly name assigned to the device.  Many devices pass this data to the bridge for utilization in SIMPL.
+
+**```Group```**
+
+Utilized in certain Essentials devices.  In this case, the value is unimportant.
+
+**```Type```**
+
+The Type is the identifier for a specific type of device in Essentials.  A list of all valid types can be reported by using the consolecommand ```gettypes``` in Essentials.  In this case, the type is ```relayOutput```.  This type is valid for any instance of a Relay Output.
+
+**```Properties```**
+
+These are the properties essential to the instantiation of the identified type.
+
+### Properties
+
+There are two properties relevant to the instantiation of a relay device.
+
+**```portDeviceKey```**
+
+This property maps to the ```key``` of the device upon which the relay resides.
+
+**```portNumber```**
+
+This property maps to the number of the relay on the device you have mapped the relay device to.  Even if the device has only a single relay, ```portNumber``` must be defined.
+
+### The JoinMap
+
+The joinmap for a ```relayOutput``` device is comprised of a single digital join.
+
+```cs
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
+    {
+
+        [JoinName("Relay")]
+        public JoinDataComplete Relay = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Device Relay State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+
+        public GenericRelayControllerJoinMap(uint joinStart)
+            : base(joinStart, typeof(GenericRelayControllerJoinMap))
+        {
+        }
+    }
+}
+```
+
+```Relay``` is a digital join that represents both the trigger and the feedback for the associated relay device.  Its join is set to 1.

docs/docs/SIMPL-Bridging-Deprecated.md

@@ -0,0 +1,477 @@
+# Deprecated
+
+**Note : this entry is out of date - please see [SIMPL Windows Bridging](~/docs/SIMPL-Bridging.md)**
+
+## SIMPL Windows Bridging - Deprecated
+
+Essentials allows for devices defined within the SIMPL# Pro application to be bridged to a SIMPL Windows application over Ethernet Intersystem Communication (EISC). This allows a SIMPL Windows program to take advantage of some of the features of the SIMPL# Pro environment, without requiring the entire application to be written in C#.
+
+Some of the main advantages are:
+
+1. The ability to instantiate devices from configuration.
+1. The ability to leverage C# concepts to handle data intensive tasks (Serialization/Deserialization of JSON/XML, cyrptography, etc.).
+1. The ability to reuse the same compiled SIMPL Windows program (regardless of target processor type) by offloading all the variables that may be room or hardware specific to Essentials.
+1. The ability to handle multiple communciation types generically without changing the SIMPL Program (TCP/UDP/SSH/HTTP/HTTPS/CEC, etc.)
+1. Much faster development cycle
+1. Reduced processor overhead
+1. Ability to easily share devices defined in Essentials between multiple other programs
+
+## Implementation
+
+Bridges are devices that are defined within the devices array in the config file. They are unique devices with a specialized purpose; to act as a bridge between Essentials Devices and applications programmed traditionally in Simpl Windows. This is accomplished by instantiating a Three Series Intersystem Communication symbol within the bridge device, and linking its Boolean/Ushort/String inputs and outputs to actions on one or multiple Essentials device(s). The definition for which joins map to which actions is defined within the device to be bridged to in a class that derives from JoinMapBase.
+
+Let's consider the following Essentials Configuration:
+
+```JSON
+{
+    "template": {
+        "roomInfo": [
+            {}
+        ],
+        "devices": [
+            {
+                "key": "processor",
+                "uid": 1,
+                "type": "pro3",
+                "name": "PRO3 w/o cards",
+                "group": "processor",
+                "supportedConfigModes": [
+                    "essentials"
+                ],
+                "supportedSystemTypes": [
+                    "hudType",
+                    "presType",
+                    "vtcType",
+                    "custom"
+                ],
+                "supportsCompliance": true,
+                "properties": {
+                    "numberOfComPorts": 6,
+                    "numberOfIrPorts": 8,
+                    "numberOfRelays": 8,
+                    "numberOfDIOPorts": 8
+                }
+            },
+            {
+                "key": "panasonicDisplay01",
+                "type": "PanasonicThefDisplay",
+                "name": "Main Display",
+                "group": "displays",
+                "uid": 2,
+                "properties": {
+                    "id": "01",
+                    "inputNumber": 1,
+                    "outputNumber": 1,
+                    "control": {
+                        "comParams": {
+                            "hardwareHandshake": "None",
+                            "parity": "None",
+                            "protocol": "RS232",
+                            "baudRate": 9600,
+                            "dataBits": 8,
+                            "softwareHandshake": "None",
+                            "stopBits": 1
+                        },
+                        "controlPortNumber": 1,
+                        "controlPortDevKey": "processor",
+                        "method": "com"
+                    }
+                }
+            },
+            {
+                "key": "vtcComPort",
+                "uid": 3,
+                "name": "VTC Coms",
+                "group": "comm",
+                "type": "genericComm",
+                "properties": {
+                    "control": {
+                        "comParams": {
+                            "hardwareHandshake": "None",
+                            "parity": "None",
+                            "protocol": "RS232",
+                            "baudRate": 38400,
+                            "dataBits": 8,
+                            "softwareHandshake": "None",
+                            "stopBits": 1
+                        },
+                        "controlPortNumber": 2,
+                        "controlPortDevKey": "processor",
+                        "method": "com"
+                    }
+                }
+            },
+            {
+                "key": "deviceBridge",
+                "uid": 4,
+                "name": "BridgeToDevices",
+                "group": "api",
+                "type": "eiscApi",
+                "properties": {
+                    "control": {
+                        "tcpSshProperties": {
+                            "address": "127.0.0.2",
+                            "port": 0
+                        },
+                        "ipid": "03",
+                        "method": "ipidTcp"
+                    },
+                    "devices": [
+                        {
+                            "deviceKey": "panasonicDisplay01",
+                            "joinStart": 1
+                        },
+                        {
+                            "deviceKey": "vtcComPort",
+                            "joinStart": 51
+                        }
+                    ]
+                }
+            }
+        ]
+    }
+}
+```
+
+We have four Essentials Devices configured:
+
+1. Pro3 with a Key of "processor"
+
+1. Panasonic Display with a Key of "panasonicDisplay01"
+
+1. Com port with a Key of "vtcComPort"
+
+1. Bridge with a Key of "deviceBridge"
+
+We want to have access to the com port for VTC Control from Simpl Windows and we want to control the display from Simpl Windows. To accomplish this, we have created a bridge device and added the devices to be bridged to the "devices" array on the bridge. As you can see we define the device key and the join start, which will determine which joins we will use on the resulting EISC to interact with the devices. In the Bridge control properties we defined ipid 03, and we will need a corresponding Ethernet System Intercommunication in the Simpl Windows program at ipid 03.
+
+Now that our devices have been built, we can refer to the device join maps to see which joins correspond to which actions.
+
+See below:
+
+```cs
+namespace PepperDash.Essentials.Bridges
+{
+    public class DisplayControllerJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Turns the display off and reports power off feedback
+        /// </summary>
+        public uint PowerOff { get; set; }
+        /// <summary>
+        /// Turns the display on and repots power on feedback
+        /// </summary>
+        public uint PowerOn { get; set; }
+        /// <summary>
+        /// Indicates that the display device supports two way communication when high
+        /// </summary>
+        public uint IsTwoWayDisplay { get; set; }
+        /// <summary>
+        /// Increments the volume while high
+        /// </summary>
+        public uint VolumeUp { get; set; }
+        /// <summary>
+        /// Decrements teh volume while high
+        /// </summary>
+        public uint VolumeDown { get; set; }
+        /// <summary>
+        /// Toggles the mute state.  Feedback is high when volume is muted
+        /// </summary>
+        public uint VolumeMute { get; set; }
+        /// <summary>
+        /// Range of digital joins to select inputs and report current input as feedback
+        /// </summary>
+        public uint InputSelectOffset { get; set; }
+        /// <summary>
+        /// Range of digital joins to report visibility for input buttons
+        /// </summary>
+        public uint ButtonVisibilityOffset { get; set; }
+        /// <summary>
+        /// High if the device is online
+        /// </summary>
+        public uint IsOnline { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Analog join to set the input and report current input as feedback
+        /// </summary>
+        public uint InputSelect { get; set; }
+        /// <summary>
+        /// Sets the volume level and reports the current level as feedback
+        /// </summary>
+        public uint VolumeLevel { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Reports the name of the display as defined in config as feedback
+        /// </summary>
+        public uint Name { get; set; }
+        /// <summary>
+        /// Range of serial joins that reports the names of the inputs as feedback
+        /// </summary>
+        public uint InputNamesOffset { get; set; }
+        #endregion
+
+        public DisplayControllerJoinMap()
+        {
+            // Digital
+            IsOnline = 50;
+            PowerOff = 1;
+            PowerOn = 2;
+            IsTwoWayDisplay = 3;
+            VolumeUp = 5;
+            VolumeDown = 6;
+            VolumeMute = 7;
+
+            ButtonVisibilityOffset = 40;
+            InputSelectOffset = 10;
+
+            // Analog
+            InputSelect = 11;
+            VolumeLevel = 5;
+
+            // Serial
+            Name = 1;
+            InputNamesOffset = 10;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            PowerOff = PowerOff + joinOffset;
+            PowerOn = PowerOn + joinOffset;
+            IsTwoWayDisplay = IsTwoWayDisplay + joinOffset;
+            ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
+            Name = Name + joinOffset;
+            InputNamesOffset = InputNamesOffset + joinOffset;
+            InputSelectOffset = InputSelectOffset + joinOffset;
+
+            InputSelect = InputSelect + joinOffset;
+
+            VolumeUp = VolumeUp + joinOffset;
+            VolumeDown = VolumeDown + joinOffset;
+            VolumeMute = VolumeMute + joinOffset;
+            VolumeLevel = VolumeLevel + joinOffset;
+        }
+    }
+}
+```
+
+We know that the Panasonic Display uses the DisplayControllerJoinMap class and can see the join numbers that will give us access to functionality in the Device.
+
+IsOnline = 50  
+PowerOff = 1  
+PowerOn = 2  
+IsTwoWayDisplay = 3  
+VolumeUp = 5  
+VolumeDown = 6  
+VolumeMute = 7
+
+```cs
+namespace PepperDash.Essentials.Bridges
+{
+    public class IBasicCommunicationJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Set High to connect, Low to disconnect
+        /// </summary>
+        public uint Connect { get; set; }
+        /// <summary>
+        /// Reports Connected State (High = Connected)
+        /// </summary>
+        public uint Connected { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Reports the connections status value
+        /// </summary>
+        public uint Status { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Data back from port
+        /// </summary>
+        public uint TextReceived { get; set; }
+        /// <summary>
+        /// Sends data to the port
+        /// </summary>
+        public uint SendText { get; set; }
+        /// <summary>
+        /// Takes a JSON serialized string that sets a COM port's parameters
+        /// </summary>
+        public uint SetPortConfig { get; set; }
+        #endregion
+
+        public IBasicCommunicationJoinMap()
+        {
+            TextReceived = 1;
+            SendText = 1;
+            SetPortConfig = 2;
+            Connect = 1;
+            Connected = 1;
+            Status = 1;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            TextReceived = TextReceived + joinOffset;
+            SendText = SendText + joinOffset;
+            SetPortConfig = SetPortConfig + joinOffset;
+            Connect = Connect + joinOffset;
+            Connected = Connected + joinOffset;
+            Status = Status + joinOffset;
+        }
+    }
+}
+```
+
+TextReceived = 1  
+SendText = 1  
+SetPortConfig = 2  
+Connect = 1  
+Connected = 1  
+Status = 1
+
+Considering our Bridge config, we can see that the display controls will start at join 1, and the VTC Com port will start at join 51. The result is a single EISC that allows us to interact with our Essentials devices.
+
+To control diplay power from Simpl Windows, we would connect Digital Signals to joins 1 & 2 on the EISC to control Display Power On & Off.
+To utilize the com port device, we would connect Serial Signals (VTC_TX$ and VTC_RX$) to join 51 on the EISC.
+
+You can refer to our [Simpl Windows Bridging Example](https://github.com/PepperDash/EssentialsSIMPLWindowsBridgeExample) for a more complex example.  
+Example device config: <https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Example%20Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json>
+
+## Notes
+
+1. It is important to realize that there are no safety checks (yet) when assigning joinStarts in bridge configurations. If you were to put two devices on a bridge with overlapping joins, the most recently bridged join would overwrite previously bridged joins. For now it is on the programmer to ensure there are no conflicting join maps.
+
+1. There is _no_ limit to the amount of times a device may be bridged to. You may have the same device on multiple bridges across multiple applications without problem. That being said, we recommend using common sense. Accessing a single com port for VTC control via multiple bridges may not be wise...
+
+1. A bridge need not only bridge between applications on the same processor. A bridge may bridge to an application on a completely separate processor; simply define the ip address in the Bridge control properties accordingly.
+
+1. For devices included in Essentials, you will be able to find defined join maps below. If you are building your own plugins, you will need to build the join map yourself. It would be beneficial to review the wiki entry on the [Feedback Class](~/docs/Feedback-Classes.md) for this.
+
+1. When building plugins, we highly recommend reusing JoinMaps, as this will make code more easily interchangeable. For example; if you were to build a display plugin, we'd recommend you use/extend the existing DisplayControllerJoinMap. This way, you can swap plugins without needing any change on the Simpl Windows side. This is extremely powerful when maintaining Simpl Windows code bases for large deployments that may utilize differing equipment per room. If you can build a Simpl Windows program that interacts with established join maps, you can swap out the device via config without any change needed to Simpl Windows.
+
+1. Related to item 5, you can use the same paradigm with respect to physical device communication. If you were to have a DSP device in some rooms communicating over RS232 and some via SSH, it would be trival to swap the device from a Com port to an SSH client in the Essentials Devicee Config and update the Bridge Config to brigde to the desired communication method. Again this would require no change on the Simpl Windows side as long as you maintain the same join Start in the Bridge Device Configuration.
+
+## Common Use Cases
+
+1. There are 10 conference rooms that all operate the same, but have hardware differences that are impossible to account for in SIMPL Windows. For example, each room might have a DM-MD8X8 chassis, but the input and output cards aren't all in the same order, or they might be different models but function the same. You can use Essentials with a unique configuration file for each hardware configuration.
+
+1. You have a floor of conference rooms that all share some centralized hardware like DSP, AV Routing and a shared CEN-GWEXER gateway with multiple GLS-OIR-CSM-EX-BATT occupancy sensors. All the shared hardware can be defined in the Essentials configuration and bridged over an EISC to each program that needs access. The same device can even be exposed to multiple programs over different EISCs.
+
+1. You have a SIMPL program that works for many room types, but because some rooms have different models of processors than others (CP3/CP3N/AV3/PRO3/DMPS3 variants), you have to maintain several versions of the program, compiled for each processor model to maintain access to features like the System Monitor slot. You can use Essentials running in a slot on a processor to expose the System Monitor and many other features of the processor, regardless of model. Now you only need to maintain a single SIMPL program defined for your most complex processor application (ex. PRO3)
+
+## Device Type Join Maps
+
+### AirMediaController
+
+> supports: AM-200, AM-300
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs>
+
+### AppleTvController
+
+> supports: IR control of Apple TV
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs>
+
+### CameraControlBase
+
+> supports: any camera that derives from CameraBase
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs>
+
+### DisplayController
+
+> supports: IR controlled displays, any two way display driver that derives from PepperDash.Essentials.Core.DisplayBase
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs>
+
+### DmChasisController
+
+> supports: All DM-MD-8x8/16x16/32x32 chassis, with or w/o DM-CPU3 Card
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs>
+
+### DmRmcController
+
+> supports: All DM-RMC devices
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs>
+
+### DmTxController
+
+> supports: All Dm-Tx devices
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs>
+
+### DmpsAudioOutputController
+
+> supports: Program, Aux1, Aux2 outputs of all DMPS3 Control Systems
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs>
+
+### DmpsRoutingController
+
+> supports: Av routing for all DMPS3 Control Systems
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs>
+
+### GenericRelayController
+
+> supports: Any relay port on a Crestron Control System or Dm Endpoint
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs>
+
+### GenericLightingJoinMap
+
+> supports: Devices derived from PepperDash.Essentials.Core.Lighting.LightingBase
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs>
+
+### GlsOccupancySensorBase
+
+> supports: Any Crestron GLS-Type Occupancy sensor - single/dual type
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs>
+
+### HdMdxxxCEController
+
+> supports: HD-MD-400-C-E, HD-MD-300-C-E, HD-MD-200-C-E, HD-MD-200-C-1G-E-B/W
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs>
+
+### IBasicCommunication
+
+> supports: Any COM Port on a Control System or Dm Endpoint device, TCP Client, SSH Client, or UDP Server
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs>
+
+### IDigitalInput
+
+> supports: Any Digital Input on a Control System, or DM Endpoint device
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs>
+
+### SystemMonitorController
+
+> supports: Exposing the system monitor slot for any Control System
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs>
+
+## Example SIMPL Windows Program
+
+We've provided an [example program](https://github.com/PepperDash/EssentialsSIMPLWindowsBridgeExample) for SIMPL Windows that works with the provided example Essentials configuration file [SIMPLBridgeExample_configurationFile.json](https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Example%20Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json). Load Essentials and the example SIMPL program to two slots on the same processor and you can get a better idea of how to take advantage of SIMPL Windows bridging.
+
+Next: [Essentials architecture](~/docs/Arch-summary.md)

docs/docs/SIMPL-Bridging-Updated.md

@@ -0,0 +1,411 @@
+# Use with SIMPL Windows
+
+***
+* [YouTube Video - SIMPL Windows in PepperDash Essentials](https://youtu.be/P2jNzsfpgJE)
+***
+
+Essentials allows for devices defined within the SIMPL# Pro application to be bridged to a SIMPL Windows application over Ethernet Intersystem Communication (EISC). This allows a SIMPL Windows program to take advantage of some of the features of the SIMPL# Pro environment, without requiring the entire application to be written in C#.
+
+Some of the main advantages are:
+
+1. The ability to instantiate devices from configuration.
+2. The ability to leverage C# concepts to handle data intensive tasks (Serialization/Deserialization of JSON/XML, cyrptography, etc.).
+3. The ability to reuse the same compiled SIMPL Windows program (regardless of target processor type) by offloading all the variables that may be room or hardware specific to Essentials.
+4. The ability to handle multiple communciation types generically without changing the SIMPL Program (TCP/UDP/SSH/HTTP/HTTPS/CEC, etc.)
+5. Much faster development cycle
+6. Reduced processor overhead
+7. Ability to easily share devices defined in Essentials between multiple other programs
+
+## Implementation
+
+Bridges are devices that are defined within the devices array in the config file. They are unique devices with a specialized purpose: to act as a bridge between Essentials Devices and applications programmed traditionally in SIMPL Windows. This is accomplished by instantiating a Three Series Intersystem Communication symbol within the bridge device, and linking its Boolean/Ushort/String inputs and outputs to actions on one or multiple Essentials device(s). The definition for which joins map to which actions is defined within the device to be bridged to in a class that derives from JoinMapBase.
+
+Let's consider the following Essentials Configuration:
+
+```JSON
+{
+    "template": {
+        "roomInfo": [
+            {}
+        ],
+        "devices": [
+            {
+                "key": "processor",
+                "uid": 1,
+                "type": "pro3",
+                "name": "PRO3 w/o cards",
+                "group": "processor",
+                "supportedConfigModes": [
+                    "essentials"
+                ],
+                "supportedSystemTypes": [
+                    "hudType",
+                    "presType",
+                    "vtcType",
+                    "custom"
+                ],
+                "supportsCompliance": true,
+                "properties": {
+                    "numberOfComPorts": 6,
+                    "numberOfIrPorts": 8,
+                    "numberOfRelays": 8,
+                    "numberOfDIOPorts": 8
+                }
+            },
+            {
+                "key": "panasonicDisplay01",
+                "type": "PanasonicThefDisplay",
+                "name": "Main Display",
+                "group": "displays",
+                "uid": 2,
+                "properties": {
+                    "id": "01",
+                    "inputNumber": 1,
+                    "outputNumber": 1,
+                    "control": {
+                        "comParams": {
+                            "hardwareHandshake": "None",
+                            "parity": "None",
+                            "protocol": "RS232",
+                            "baudRate": 9600,
+                            "dataBits": 8,
+                            "softwareHandshake": "None",
+                            "stopBits": 1
+                        },
+                        "controlPortNumber": 1,
+                        "controlPortDevKey": "processor",
+                        "method": "com"
+                    }
+                }
+            },
+            {
+                "key": "vtcComPort",
+                "uid": 3,
+                "name": "VTC Coms",
+                "group": "comm",
+                "type": "genericComm",
+                "properties": {
+                    "control": {
+                        "comParams": {
+                            "hardwareHandshake": "None",
+                            "parity": "None",
+                            "protocol": "RS232",
+                            "baudRate": 38400,
+                            "dataBits": 8,
+                            "softwareHandshake": "None",
+                            "stopBits": 1
+                        },
+                        "controlPortNumber": 2,
+                        "controlPortDevKey": "processor",
+                        "method": "com"
+                    }
+                }
+            },
+            {
+                "key": "deviceBridge",
+                "uid": 4,
+                "name": "BridgeToDevices",
+                "group": "api",
+                "type": "eiscApi",
+                "properties": {
+                    "control": {
+                        "tcpSshProperties": {
+                            "address": "127.0.0.2",
+                            "port": 0
+                        },
+                        "ipid": "03",
+                        "method": "ipidTcp"
+                    },
+                    "devices": [
+                        {
+                            "deviceKey": "panasonicDisplay01",
+                            "joinStart": 1
+                        },
+                        {
+                            "deviceKey": "vtcComPort",
+                            "joinStart": 51
+                        }
+                    ]
+                }
+            }
+        ]
+    }
+}
+```
+
+We have four Essentials Devices configured:
+
+1. Pro3 with a Key of "processor"
+
+1. Panasonic Display with a Key of "panasonicDisplay01"
+
+1. Com port with a Key of "vtcComPort"
+
+1. Bridge with a Key of "deviceBridge"
+
+We want to have access to the com port for VTC Control from SIMPL Windows and we want to control the display from SIMPL Windows. To accomplish this, we have created a bridge device and added the devices to be bridged to the "devices" array on the bridge. As you can see we define the device key and the join start, which will determine which joins we will use on the resulting EISC to interact with the devices. In the Bridge control properties we defined ipid 03, and we will need a corresponding Ethernet System Intercommunication in the SIMPL Windows program at ipid 03.
+
+Now that our devices have been built, we can refer to the device join maps to see which joins correspond to which actions.
+
+See below:
+
+```cs
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class DisplayControllerJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("PowerOff")]
+        public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("PowerOn")]
+        public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("IsTwoWayDisplay")]
+        public JoinDataComplete IsTwoWayDisplay = new JoinDataComplete(new JoinData() { JoinNumber = 3, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Is Two Way Display", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("VolumeUp")]
+        public JoinDataComplete VolumeUp = new JoinDataComplete(new JoinData() { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Volume Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("VolumeLevel")]
+        public JoinDataComplete VolumeLevel = new JoinDataComplete(new JoinData() { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Volume Level", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("VolumeDown")]
+        public JoinDataComplete VolumeDown = new JoinDataComplete(new JoinData() { JoinNumber = 6, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Volume Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("VolumeMute")]
+        public JoinDataComplete VolumeMute = new JoinDataComplete(new JoinData() { JoinNumber = 7, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Volume Mute", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("VolumeMuteOn")]
+        public JoinDataComplete VolumeMuteOn = new JoinDataComplete(new JoinData() { JoinNumber = 8, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Volume Mute On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("VolumeMuteOff")]
+        public JoinDataComplete VolumeMuteOff = new JoinDataComplete(new JoinData() { JoinNumber = 9, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Volume Mute Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("InputSelectOffset")]
+        public JoinDataComplete InputSelectOffset = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 10 },
+            new JoinMetadata() { Label = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("InputNamesOffset")]
+        public JoinDataComplete InputNamesOffset = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 10 },
+            new JoinMetadata() { Label = "Input Names Offset", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("InputSelect")]
+        public JoinDataComplete InputSelect = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("ButtonVisibilityOffset")]
+        public JoinDataComplete ButtonVisibilityOffset = new JoinDataComplete(new JoinData() { JoinNumber = 41, JoinSpan = 10 },
+            new JoinMetadata() { Label = "Button Visibility Offset", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalSerial });
+
+        [JoinName("IsOnline")]
+        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData() { JoinNumber = 50, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        public DisplayControllerJoinMap(uint joinStart)
+            : base(joinStart, typeof(CameraControllerJoinMap))
+        {
+        }
+    }
+}
+```
+
+We know that the Panasonic Display uses the DisplayControllerJoinMap class and can see the join numbers that will give us access to functionality in the Device.
+
+IsOnline = 50  
+PowerOff = 1  
+PowerOn = 2  
+IsTwoWayDisplay = 3  
+VolumeUp = 5  
+VolumeDown = 6  
+VolumeMute = 7
+
+```cs
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("TextReceived")]
+        public JoinDataComplete TextReceived = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Text Received From Remote Device", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("SendText")]
+        public JoinDataComplete SendText = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Text Sent To Remote Device", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("SetPortConfig")]
+        public JoinDataComplete SetPortConfig = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Set Port Config", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("Connect")]
+        public JoinDataComplete Connect = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Connect", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Connected")]
+        public JoinDataComplete Connected = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Connected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Status")]
+        public JoinDataComplete Status = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata() { Label = "Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+
+        public IBasicCommunicationJoinMap(uint joinStart)
+            : base(joinStart, typeof(IBasicCommunicationJoinMap))
+        {
+        }
+    }
+}
+```
+
+Considering our Bridge config, we can see that the display controls will start at join 1, and the VTC Com port will start at join 51. The result is a single EISC that allows us to interact with our Essentials devices.
+
+To control diplay power from SIMPL Windows, we would connect Digital Signals to joins 1 & 2 on the EISC to control Display Power On & Off.
+To utilize the com port device, we would connect Serial Signals (VTC_TX$ and VTC_RX$) to join 51 on the EISC.
+
+You can refer to our [SIMPL Windows Bridging Example](https://github.com/PepperDash/EssentialsSIMPLWindowsBridgeExample) for a more complex example.  
+Example device config: <https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Example%20Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json>
+
+## Notes
+
+1. It is important to realize that there are no safety checks (yet) when assigning joinStarts in bridge configurations. If you were to put two devices on a bridge with overlapping joins, the most recently bridged join would overwrite previously bridged joins. For now it is on the programmer to ensure there are no conflicting join maps.
+
+2. There is _no_ limit to the amount of times a device may be bridged to. You may have the same device on multiple bridges across multiple applications without problem. That being said, we recommend using common sense. Accessing a single com port for VTC control via multiple bridges may not be wise...
+
+3. A bridge need not only bridge between applications on the same processor. A bridge may bridge to an application on a completely separate processor; simply define the ip address in the Bridge control properties accordingly.
+
+4. For devices included in Essentials, you will be able to find defined join maps below. If you are building your own plugins, you will need to build the join map yourself. It would be beneficial to review the wiki entry on the [Feedback Class](~/docs/Feedback-Classes.md) for this.
+
+5. When building plugins, we highly recommend reusing JoinMaps, as this will make code more easily interchangeable. For example; if you were to build a display plugin, we'd recommend you use/extend the existing `DisplayControllerJoinMap`. This way, you can swap plugins without needing any change on the SIMPL Windows side. This is extremely powerful when maintaining SIMPL Windows code bases for large deployments that may utilize differing equipment per room. If you can build a SIMPL Windows program that interacts with established join maps, you can swap out the device via config without any change needed to SIMPL Windows.
+
+6. Related to item 5, you can use the same paradigm with respect to physical device communication. If you were to have a DSP device in some rooms communicating over RS232 and some via SSH, it would be trival to swap the device from a Com port to an SSH client in the Essentials Devicee Config and update the Bridge Config to brigde to the desired communication method. Again this would require no change on the SIMPL Windows side as long as you maintain the same join Start in the Bridge Device Configuration.
+
+## Common Use Cases
+
+1. There are 10 conference rooms that all operate the same, but have hardware differences that are impossible to account for in SIMPL Windows. For example, each room might have a DM-MD8X8 chassis, but the input and output cards aren't all in the same order, or they might be different models but function the same. You can use Essentials with a unique configuration file for each hardware configuration.
+
+2. You have a floor of conference rooms that all share some centralized hardware like DSP, AV Routing and a shared CEN-GWEXER gateway with multiple GLS-OIR-CSM-EX-BATT occupancy sensors. All the shared hardware can be defined in the Essentials configuration and bridged over an EISC to each program that needs access. The same device can even be exposed to multiple programs over different EISCs.
+
+3. You have a SIMPL program that works for many room types, but because some rooms have different models of processors than others (CP3/CP3N/AV3/PRO3/DMPS3 variants), you have to maintain several versions of the program, compiled for each processor model to maintain access to features like the System Monitor slot. You can use Essentials running in a slot on a processor to expose the System Monitor and many other features of the processor, regardless of model. Now you only need to maintain a single SIMPL program defined for your most complex processor application (ex. PRO3)
+
+## Join Map Documentation
+
+[Join Map Documentation](~/docs/JoinMaps.md)
+
+## Device Type Join Maps
+
+Please note that these joinmaps _may_ be using a deprecated implementation. The implementation is valid but nonetheless frowned upon for new features and plugins.
+
+### AirMediaController
+
+> supports: AM-200, AM-300
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/AirMediaControllerJoinMap.cs>
+
+### AppleTvController
+
+> supports: IR control of Apple TV
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/AppleTvJoinMap.cs>
+
+### CameraControlBase
+
+> supports: any camera that derives from CameraBase
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/CameraControllerJoinMap.cs>
+
+### DisplayController
+
+> supports: IR controlled displays, any two way display driver that derives from PepperDash.Essentials.Core.DisplayBase
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/DisplayControllerJoinMap.cs>
+
+### DmChasisController
+
+> supports: All DM-MD-8x8/16x16/32x32 chassis, with or w/o DM-CPU3 Card
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmChassisControllerJoinMap.cs>
+
+### DmRmcController
+
+> supports: All DM-RMC devices
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmRmcControllerJoinMap.cs>
+
+### DmTxController
+
+> supports: All Dm-Tx devices
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmTxControllerJoinMap.cs>
+
+### DmpsAudioOutputController
+
+> supports: Program, Aux1, Aux2 outputs of all DMPS3 Control Systems
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs>
+
+### DmpsRoutingController
+
+> supports: Av routing for all DMPS3 Control Systems
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs>
+
+### GenericRelayController
+
+> supports: Any relay port on a Crestron Control System or Dm Endpoint
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs>
+
+### GenericLightingJoinMap
+
+> supports: Devices derived from PepperDash.Essentials.Core.Lighting.LightingBase
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericLightingJoinMap.cs>
+
+### GlsOccupancySensorBase
+
+> supports: Any Crestron GLS-Type Occupancy sensor - single/dual type
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs>
+
+### HdMdxxxCEController
+
+> supports: HD-MD-400-C-E, HD-MD-300-C-E, HD-MD-200-C-E, HD-MD-200-C-1G-E-B/W
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs>
+
+### IBasicCommunication
+
+> supports: Any COM Port on a Control System or Dm Endpoint device, TCP Client, SSH Client, or UDP Server
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs>
+
+### IDigitalInput
+
+> supports: Any Digital Input on a Control System, or DM Endpoint device
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/IDigitalInputJoinMap.cs>
+
+### SystemMonitorController
+
+> supports: Exposing the system monitor slot for any Control System
+
+<https://github.com/PepperDash/Essentials/blob/main/essentials-framework/Essentials%20Core/PepperDashEssentialsBase/Bridges/JoinMaps/SystemMonitorJoinMap.cs>
+
+## Example SIMPL Windows Program
+
+We've provided an [example program](https://github.com/PepperDash/EssentialsSIMPLWindowsBridgeExample) for SIMPL Windows that works with the provided example Essentials configuration file [SIMPLBridgeExample_configurationFile.json](https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Example%20Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json). Load Essentials and the example SIMPL program to two slots on the same processor and you can get a better idea of how to take advantage of SIMPL Windows bridging.
+
+Next: [Essentials architecture](~/docs/Arch-summary.md)

docs/docs/SIMPL-Bridging.md

@@ -0,0 +1,475 @@
+# SIMPL Windows Bridging
+
+**Note : this entry is out of date - please see [SIMPL Windows Bridging - Updated](~/docs/SIMPL-Bridging-Updated.md)**
+
+Essentials allows for devices defined within the SIMPL# Pro application to be bridged to a SIMPL Windows application over Ethernet Intersystem Communication (EISC). This allows a SIMPL Windows program to take advantage of some of the features of the SIMPL# Pro environment, without requiring the entire application to be written in C#.
+
+Some of the main advantages are:
+
+1. The ability to instantiate devices from configuration.
+1. The ability to leverage C# concepts to handle data intensive tasks (Serialization/Deserialization of JSON/XML, cyrptography, etc.).
+1. The ability to reuse the same compiled SIMPL Windows program (regardless of target processor type) by offloading all the variables that may be room or hardware specific to Essentials.
+1. The ability to handle multiple communciation types generically without changing the SIMPL Program (TCP/UDP/SSH/HTTP/HTTPS/CEC, etc.)
+1. Much faster development cycle
+1. Reduced processor overhead
+1. Ability to easily share devices defined in Essentials between multiple other programs
+
+## Implementation
+
+Bridges are devices that are defined within the devices array in the config file. They are unique devices with a specialized purpose; to act as a bridge between Essentials Devices and applications programmed traditionally in Simpl Windows. This is accomplished by instantiating a Three Series Intersystem Communication symbol within the bridge device, and linking its Boolean/Ushort/String inputs and outputs to actions on one or multiple Essentials device(s). The definition for which joins map to which actions is defined within the device to be bridged to in a class that derives from JoinMapBase.
+
+Let's consider the following Essentials Configuration:
+
+```JSON
+{
+    "template": {
+        "roomInfo": [
+            {}
+        ],
+        "devices": [
+            {
+                "key": "processor",
+                "uid": 1,
+                "type": "pro3",
+                "name": "PRO3 w/o cards",
+                "group": "processor",
+                "supportedConfigModes": [
+                    "essentials"
+                ],
+                "supportedSystemTypes": [
+                    "hudType",
+                    "presType",
+                    "vtcType",
+                    "custom"
+                ],
+                "supportsCompliance": true,
+                "properties": {
+                    "numberOfComPorts": 6,
+                    "numberOfIrPorts": 8,
+                    "numberOfRelays": 8,
+                    "numberOfDIOPorts": 8
+                }
+            },
+            {
+                "key": "panasonicDisplay01",
+                "type": "PanasonicThefDisplay",
+                "name": "Main Display",
+                "group": "displays",
+                "uid": 2,
+                "properties": {
+                    "id": "01",
+                    "inputNumber": 1,
+                    "outputNumber": 1,
+                    "control": {
+                        "comParams": {
+                            "hardwareHandshake": "None",
+                            "parity": "None",
+                            "protocol": "RS232",
+                            "baudRate": 9600,
+                            "dataBits": 8,
+                            "softwareHandshake": "None",
+                            "stopBits": 1
+                        },
+                        "controlPortNumber": 1,
+                        "controlPortDevKey": "processor",
+                        "method": "com"
+                    }
+                }
+            },
+            {
+                "key": "vtcComPort",
+                "uid": 3,
+                "name": "VTC Coms",
+                "group": "comm",
+                "type": "genericComm",
+                "properties": {
+                    "control": {
+                        "comParams": {
+                            "hardwareHandshake": "None",
+                            "parity": "None",
+                            "protocol": "RS232",
+                            "baudRate": 38400,
+                            "dataBits": 8,
+                            "softwareHandshake": "None",
+                            "stopBits": 1
+                        },
+                        "controlPortNumber": 2,
+                        "controlPortDevKey": "processor",
+                        "method": "com"
+                    }
+                }
+            },
+            {
+                "key": "deviceBridge",
+                "uid": 4,
+                "name": "BridgeToDevices",
+                "group": "api",
+                "type": "eiscApi",
+                "properties": {
+                    "control": {
+                        "tcpSshProperties": {
+                            "address": "127.0.0.2",
+                            "port": 0
+                        },
+                        "ipid": "03",
+                        "method": "ipidTcp"
+                    },
+                    "devices": [
+                        {
+                            "deviceKey": "panasonicDisplay01",
+                            "joinStart": 1
+                        },
+                        {
+                            "deviceKey": "vtcComPort",
+                            "joinStart": 51
+                        }
+                    ]
+                }
+            }
+        ]
+    }
+}
+```
+
+We have four Essentials Devices configured:
+
+1. Pro3 with a Key of "processor"
+
+1. Panasonic Display with a Key of "panasonicDisplay01"
+
+1. Com port with a Key of "vtcComPort"
+
+1. Bridge with a Key of "deviceBridge"
+
+We want to have access to the com port for VTC Control from Simpl Windows and we want to control the display from Simpl Windows. To accomplish this, we have created a bridge device and added the devices to be bridged to the "devices" array on the bridge. As you can see we define the device key and the join start, which will determine which joins we will use on the resulting EISC to interact with the devices. In the Bridge control properties we defined ipid 03, and we will need a corresponding Ethernet System Intercommunication in the Simpl Windows program at ipid 03.
+
+Now that our devices have been built, we can refer to the device join maps to see which joins correspond to which actions.
+
+See below:
+
+```cs
+namespace PepperDash.Essentials.Bridges
+{
+    public class DisplayControllerJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Turns the display off and reports power off feedback
+        /// </summary>
+        public uint PowerOff { get; set; }
+        /// <summary>
+        /// Turns the display on and repots power on feedback
+        /// </summary>
+        public uint PowerOn { get; set; }
+        /// <summary>
+        /// Indicates that the display device supports two way communication when high
+        /// </summary>
+        public uint IsTwoWayDisplay { get; set; }
+        /// <summary>
+        /// Increments the volume while high
+        /// </summary>
+        public uint VolumeUp { get; set; }
+        /// <summary>
+        /// Decrements teh volume while high
+        /// </summary>
+        public uint VolumeDown { get; set; }
+        /// <summary>
+        /// Toggles the mute state.  Feedback is high when volume is muted
+        /// </summary>
+        public uint VolumeMute { get; set; }
+        /// <summary>
+        /// Range of digital joins to select inputs and report current input as feedback
+        /// </summary>
+        public uint InputSelectOffset { get; set; }
+        /// <summary>
+        /// Range of digital joins to report visibility for input buttons
+        /// </summary>
+        public uint ButtonVisibilityOffset { get; set; }
+        /// <summary>
+        /// High if the device is online
+        /// </summary>
+        public uint IsOnline { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Analog join to set the input and report current input as feedback
+        /// </summary>
+        public uint InputSelect { get; set; }
+        /// <summary>
+        /// Sets the volume level and reports the current level as feedback
+        /// </summary>
+        public uint VolumeLevel { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Reports the name of the display as defined in config as feedback
+        /// </summary>
+        public uint Name { get; set; }
+        /// <summary>
+        /// Range of serial joins that reports the names of the inputs as feedback
+        /// </summary>
+        public uint InputNamesOffset { get; set; }
+        #endregion
+
+        public DisplayControllerJoinMap()
+        {
+            // Digital
+            IsOnline = 50;
+            PowerOff = 1;
+            PowerOn = 2;
+            IsTwoWayDisplay = 3;
+            VolumeUp = 5;
+            VolumeDown = 6;
+            VolumeMute = 7;
+
+            ButtonVisibilityOffset = 40;
+            InputSelectOffset = 10;
+
+            // Analog
+            InputSelect = 11;
+            VolumeLevel = 5;
+
+            // Serial
+            Name = 1;
+            InputNamesOffset = 10;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            PowerOff = PowerOff + joinOffset;
+            PowerOn = PowerOn + joinOffset;
+            IsTwoWayDisplay = IsTwoWayDisplay + joinOffset;
+            ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
+            Name = Name + joinOffset;
+            InputNamesOffset = InputNamesOffset + joinOffset;
+            InputSelectOffset = InputSelectOffset + joinOffset;
+
+            InputSelect = InputSelect + joinOffset;
+
+            VolumeUp = VolumeUp + joinOffset;
+            VolumeDown = VolumeDown + joinOffset;
+            VolumeMute = VolumeMute + joinOffset;
+            VolumeLevel = VolumeLevel + joinOffset;
+        }
+    }
+}
+```
+
+We know that the Panasonic Display uses the DisplayControllerJoinMap class and can see the join numbers that will give us access to functionality in the Device.
+
+IsOnline = 50  
+PowerOff = 1  
+PowerOn = 2  
+IsTwoWayDisplay = 3  
+VolumeUp = 5  
+VolumeDown = 6  
+VolumeMute = 7
+
+```cs
+namespace PepperDash.Essentials.Bridges
+{
+    public class IBasicCommunicationJoinMap : JoinMapBase
+    {
+        #region Digitals
+        /// <summary>
+        /// Set High to connect, Low to disconnect
+        /// </summary>
+        public uint Connect { get; set; }
+        /// <summary>
+        /// Reports Connected State (High = Connected)
+        /// </summary>
+        public uint Connected { get; set; }
+        #endregion
+
+        #region Analogs
+        /// <summary>
+        /// Reports the connections status value
+        /// </summary>
+        public uint Status { get; set; }
+        #endregion
+
+        #region Serials
+        /// <summary>
+        /// Data back from port
+        /// </summary>
+        public uint TextReceived { get; set; }
+        /// <summary>
+        /// Sends data to the port
+        /// </summary>
+        public uint SendText { get; set; }
+        /// <summary>
+        /// Takes a JSON serialized string that sets a COM port's parameters
+        /// </summary>
+        public uint SetPortConfig { get; set; }
+        #endregion
+
+        public IBasicCommunicationJoinMap()
+        {
+            TextReceived = 1;
+            SendText = 1;
+            SetPortConfig = 2;
+            Connect = 1;
+            Connected = 1;
+            Status = 1;
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            TextReceived = TextReceived + joinOffset;
+            SendText = SendText + joinOffset;
+            SetPortConfig = SetPortConfig + joinOffset;
+            Connect = Connect + joinOffset;
+            Connected = Connected + joinOffset;
+            Status = Status + joinOffset;
+        }
+    }
+}
+```
+
+TextReceived = 1  
+SendText = 1  
+SetPortConfig = 2  
+Connect = 1  
+Connected = 1  
+Status = 1
+
+Considering our Bridge config, we can see that the display controls will start at join 1, and the VTC Com port will start at join 51. The result is a single EISC that allows us to interact with our Essentials devices.
+
+To control diplay power from Simpl Windows, we would connect Digital Signals to joins 1 & 2 on the EISC to control Display Power On & Off.
+To utilize the com port device, we would connect Serial Signals (VTC_TX$ and VTC_RX$) to join 51 on the EISC.
+
+You can refer to our [Simpl Windows Bridging Example](https://github.com/PepperDash/EssentialsSIMPLWindowsBridgeExample) for a more complex example.  
+Example device config: <https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Example%20Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json>
+
+## Notes
+
+1. It is important to realize that there are no safety checks (yet) when assigning joinStarts in bridge configurations. If you were to put two devices on a bridge with overlapping joins, the most recently bridged join would overwrite previously bridged joins. For now it is on the programmer to ensure there are no conflicting join maps.
+
+1. There is _no_ limit to the amount of times a device may be bridged to. You may have the same device on multiple bridges across multiple applications without problem. That being said, we recommend using common sense. Accessing a single com port for VTC control via multiple bridges may not be wise...
+
+1. A bridge need not only bridge between applications on the same processor. A bridge may bridge to an application on a completely separate processor; simply define the ip address in the Bridge control properties accordingly.
+
+1. For devices included in Essentials, you will be able to find defined join maps below. If you are building your own plugins, you will need to build the join map yourself. It would be beneficial to review the wiki entry on the [Feedback Class](~/docs/Feedback-Classes.md) for this.
+
+1. When building plugins, we highly recommend reusing JoinMaps, as this will make code more easily interchangeable. For example; if you were to build a display plugin, we'd recommend you use/extend the existing DisplayControllerJoinMap. This way, you can swap plugins without needing any change on the Simpl Windows side. This is extremely powerful when maintaining Simpl Windows code bases for large deployments that may utilize differing equipment per room. If you can build a Simpl Windows program that interacts with established join maps, you can swap out the device via config without any change needed to Simpl Windows.
+
+1. Related to item 5, you can use the same paradigm with respect to physical device communication. If you were to have a DSP device in some rooms communicating over RS232 and some via SSH, it would be trival to swap the device from a Com port to an SSH client in the Essentials Devicee Config and update the Bridge Config to brigde to the desired communication method. Again this would require no change on the Simpl Windows side as long as you maintain the same join Start in the Bridge Device Configuration.
+
+## Common Use Cases
+
+1. There are 10 conference rooms that all operate the same, but have hardware differences that are impossible to account for in SIMPL Windows. For example, each room might have a DM-MD8X8 chassis, but the input and output cards aren't all in the same order, or they might be different models but function the same. You can use Essentials with a unique configuration file for each hardware configuration.
+
+1. You have a floor of conference rooms that all share some centralized hardware like DSP, AV Routing and a shared CEN-GWEXER gateway with multiple GLS-OIR-CSM-EX-BATT occupancy sensors. All the shared hardware can be defined in the Essentials configuration and bridged over an EISC to each program that needs access. The same device can even be exposed to multiple programs over different EISCs.
+
+1. You have a SIMPL program that works for many room types, but because some rooms have different models of processors than others (CP3/CP3N/AV3/PRO3/DMPS3 variants), you have to maintain several versions of the program, compiled for each processor model to maintain access to features like the System Monitor slot. You can use Essentials running in a slot on a processor to expose the System Monitor and many other features of the processor, regardless of model. Now you only need to maintain a single SIMPL program defined for your most complex processor application (ex. PRO3)
+
+## Device Type Join Maps
+
+### AirMediaController
+
+> supports: AM-200, AM-300
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/AirMediaControllerJoinMap.cs>
+
+### AppleTvController
+
+> supports: IR control of Apple TV
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/AppleTvJoinMap.cs>
+
+### CameraControlBase
+
+> supports: any camera that derives from CameraBase
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs>
+
+### DisplayController
+
+> supports: IR controlled displays, any two way display driver that derives from PepperDash.Essentials.Core.DisplayBase
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DisplayControllerJoinMap.cs>
+
+### DmChasisController
+
+> supports: All DM-MD-8x8/16x16/32x32 chassis, with or w/o DM-CPU3 Card
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs>
+
+### DmRmcController
+
+> supports: All DM-RMC devices
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmRmcControllerJoinMap.cs>
+
+### DmTxController
+
+> supports: All Dm-Tx devices
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs>
+
+### DmpsAudioOutputController
+
+> supports: Program, Aux1, Aux2 outputs of all DMPS3 Control Systems
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs>
+
+### DmpsRoutingController
+
+> supports: Av routing for all DMPS3 Control Systems
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs>
+
+### GenericRelayController
+
+> supports: Any relay port on a Crestron Control System or Dm Endpoint
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs>
+
+### GenericLightingJoinMap
+
+> supports: Devices derived from PepperDash.Essentials.Core.Lighting.LightingBase
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/GenericLightingJoinMap.cs>
+
+### GlsOccupancySensorBase
+
+> supports: Any Crestron GLS-Type Occupancy sensor - single/dual type
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs>
+
+### HdMdxxxCEController
+
+> supports: HD-MD-400-C-E, HD-MD-300-C-E, HD-MD-200-C-E, HD-MD-200-C-1G-E-B/W
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs>
+
+### IBasicCommunication
+
+> supports: Any COM Port on a Control System or Dm Endpoint device, TCP Client, SSH Client, or UDP Server
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs>
+
+### IDigitalInput
+
+> supports: Any Digital Input on a Control System, or DM Endpoint device
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/IDigitalInputJoinMap.cs>
+
+### SystemMonitorController
+
+> supports: Exposing the system monitor slot for any Control System
+
+<https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs>
+
+## Example SIMPL Windows Program
+
+We've provided an [example program](https://github.com/PepperDash/EssentialsSIMPLWindowsBridgeExample) for SIMPL Windows that works with the provided example Essentials configuration file [SIMPLBridgeExample_configurationFile.json](https://github.com/PepperDash/Essentials/blob/main/PepperDashEssentials/Example%20Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json). Load Essentials and the example SIMPL program to two slots on the same processor and you can get a better idea of how to take advantage of SIMPL Windows bridging.
+
+Next: [Essentials architecture](~/docs/Arch-summary.md)

docs/docs/Standalone-Use.md

@@ -0,0 +1,19 @@
+# Stand-alone Application
+
+Essentials was originally designed as a standalone SIMPL# Pro control system application and has developed into a versatile, pluggable application. This page describes how to use our built-in room types for a completely self-contained "one-slot" control program.
+
+By defining devices and a room in a JSON configuration file, Essentials can control an entire AV control system for a room. A file can be manually created in an IDE such as Visual Studio Code, or it can be generated by a friendly web-based configuration tool on [PepperDash Portal](http://pepperdash.com/products/), or some other configuration tool application, both requiring no knowledge of JSON.  These tools step a user through building the necessary devices and setting to achieve a full working room.
+
+## Plugins
+
+### Devices
+
+Essentials supports device plugins for communicating with various devices using both standard Crestron CIP communications, Cresnet, SSH, or other TCP/IP-based communication methods. See [the Plugins section](~/docs/Plugins.md) for more details
+
+### Rooms
+
+In order to tie together equipment into a unit that comprises what devices are used in a room, Essentials supports Room plugins. These plugins are similar to device plugins, in that they're loaded at runtime and allow for customization of business logic and behavior. They're loaded into a different section of the Device Manager, and can reference devices created by device plugins using the device's key.
+
+See Also: [[Supported Devices|Supported-Devices]]
+
+Next: [Simpl Windows bridging](~/docs/SIMPL-Bridging-Updated.md)

docs/docs/Supported-Devices.md

@@ -0,0 +1,68 @@
+# Essentials Framework Devices by Type
+
+## Cameras
+
+* VISCA protocol
+* Cisco (via codec)
+* Zoom (via Zoom Room)
+
+## Disc Player
+
+* Any IR disc player that implements standard RAD commands
+
+## Displays
+
+* Any IR display that implements standard RAD commands
+* Samsung MDC protocol (commercial)
+* NEC Professional series flat panel
+* Avocor VTF
+* Panasonic TH series flat panels
+* Panasonic Projectors [(via plugin)](https://github.com/PepperDash/epi-display-panasonic-projectors)
+* LG Commercial series [(via plugin)](https://github.com/PepperDash/epi-display-lg)
+* Generic CEC control via HDMI [(via plugin)](https://github.com/PepperDash/epi-generic-cec-display)
+* Crestron Certified Driver Display [(via plugin)](https://github.com/batourin/epi-display-ccd)
+
+## Lighting/Shading
+
+* Lutron Quantum
+* Somfy Shades (relay control)
+
+## Power Controllers
+
+* Digital Logger
+
+## Set Top Boxes
+
+* Any IR set top box that implements standard RAD commands
+
+## Streaming Players
+
+* AppleTV (IR)
+* Roku (IR)
+
+## Video Codecs
+
+* Cisco CE series (C/SX/RoomKit)
+* Zoom Room
+
+## DSPs / Audio Codecs
+
+* BiAmp Tesira [(via plugin](https://github.com/PepperDash/epi-dsp-tesira)
+
+## Crestron Devices
+
+* AM-200/300 Airmedia
+* All DM Chassis (8x8 * 128x128)
+* All DM input/output cards
+* All DMPS Processors
+* All DM Transmitter models (with COM/IR/Relay/CEC port access)
+* All DM Receiver models (with COM/IR/Relay/CEC port access)
+* DGE-100
+* DM-DGE-200-C
+* DIN-8SW8
+* CEN-IO-DIGIN-104
+* CEN-RFGWEX/GWEXER
+* GLS-ODT/OIR-C-CN Occupancy Sensors
+* TSW-XXX series touchpanels
+* XPanel for SmartGraphics
+* Fusion Room and Assets

docs/docs/getting-started.md

@@ -0,0 +1 @@
+# Getting Started

docs/docs/toc.yml

@@ -0,0 +1,48 @@
+- name: Get Started With Essentials
+- href: ../index.md
+- href: Get-started.md    
+- name: Usage
+  items:
+  - href: Standalone-Use.md    
+  - href: SIMPL-Bridging-Updated.md
+    items:
+    - name: Join Maps
+      href: JoinMaps.md
+    - name: Bridging to Hardware Resources
+      href: Bridging-To-Hardware-Resources.md
+      items:
+      - name: GenericComm Bridging
+        href: GenericComm.md
+      - name: RelayOutput Bridging
+        href: RelayOutput.md
+      - name: Digital Input Bridging
+        href: DigitalInput.md
+      - name: IR Driver Bridging
+        href: IR-Driver-Bridging.md
+- name: Technical documentation
+  items:    
+    - href: Arch-summary.md
+    - name: Devices and DeviceManager
+      href: Arch-1.md
+    - name: Configurable lifecycle
+      href: Arch-lifecycle.md
+    - name: Activation phases
+      href: Arch-activate.md
+    - name: More
+      href: Arch-topics.md
+    - name: Plugins
+      href: Plugins.md
+    - name: Communication Basics
+      href: Communication-Basics.md
+    - name: Debugging
+      href: Debugging.md
+    - name: Feedback Classes
+      href: Feedback-Classes.md
+    - name: Connection Based Routing
+      href: Connection-Based-Routing.md
+    - name: Configuration Structure
+      href: ConfigurationStructure.md
+    - name: Supported Devices
+      href: Supported-Devices.md
+    - name: Glossary of Terms
+      href: Glossary-of-Terms.md

docs/index.md

@@ -0,0 +1,59 @@
+# Welcome to PepperDash Essentials!
+
+PepperDash Essentials is an open-source framework for control systems, built on Crestron's Simpl# Pro framework. It can be configured as a standalone program capable of running a wide variety of system designs and can also be used to augment other Crestron programs.
+
+Essentials is a collection of C# libraries that can be used in many ways. It is a 100% configuration-driven framework that can be extended to add different workflows and behaviors, either through the addition of new device-types and classes, or via a plug-in mechanism. The framework is a collection of things that are all related and interconnected, but in general do not have strong dependencies on each other.
+
+---
+
+## Get started
+
+- [Download essentials build or clone repo](~/docs/Get-started.md)
+- [How to get started](~/docs/Get-started.md)
+- [YouTube Video Series Playlist](https://youtube.com/playlist?list=PLKOoNNwgPFZdV5wDEBDZxTHu1KROspaBu)
+- [Discord Server](https://discord.gg/6Vh3ssDdPs)
+
+Or use the links to the right to navigate our documentation.
+
+---
+
+## Benefits
+
+- Runs on Crestron 3-Series, **4-Series** and VC-4 Control System platforms
+- Reduced hardware overhead compared to S+ and Simpl solutions
+- Quick development cycle
+- Shared resources made easily available
+- More flexibility with less code
+- Configurable using simple JSON files
+- Is awesome
+
+---
+
+## Comment
+
+The Essentials wiki is clearly in-progress right now. Take a look at the links to the right. We are actively working on this documentation, so please be patient with us. If you have any comments on or suggestions for the documentation, please file an issue here, with as much detail as you can provide: <https://github.com/PepperDash/Essentials/issues>
+
+Thanks!
+
+---
+
+## Collaboration
+
+Essentials is an open-source project and we encourage collaboration on this community project. For features that may not be useful to the greater community, or for just-plain learning, we want to remind developers to try writing plugins for Essentials. More information can be found here: [Plugins](~/docs/Plugins.md)
+
+### Open-source-collaborative workflow
+
+The `main` branch always contain the latest stable version. The `development` branch is used for most development efforts.
+
+[GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) will be used as the workflow for this collaborative project. To contribute, follow this process:
+
+1. Fork this repository ([More Info](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/working-with-forks))
+2. Create a branch using standard GitFlow branch prefixes (feature/hotfix) followed by a descriptive name.
+   - Example: `feature/add-awesomeness` or `hotfix/really-big-oops`
+   - When working on a new feature or bugfix, branch from the `development` branch. When working on a hotfix, branch from `main`.
+3. Make commits as necessary (often is better). And use concise, descriptive language, leveraging issue notation and/or [Closing Keywords](https://help.github.com/articles/closing-issues-using-keywords) to ensure any issues addressed by your work are referenced accordingly.
+4. When the scope of the work for your branch is complete, make sure to rebase your branch in case further progress has been made since the repo was forked
+5. Create a Pull Request to pull your branch into the appropriate branch in the main repository.
+6. Your Pull Request will be reviewed by our team and evaluated for inclusion into the main repository.
+
+Next: [Get started](~/docs/Get-started.md)

docs/toc.yml

@@ -0,0 +1,4 @@
+- name: Docs
+  href: docs/
+- name: API
+  href: api/

src/Directory.Build.props

@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
-    <Version>2.0.0-local</Version>
+    <Version>2.4.0-local</Version>    
     <InformationalVersion>$(Version)</InformationalVersion>
-    <Authors>PepperDash Technologies</Authors>
-    <Company>PepperDash Technologies</Company>
+    <Authors>PepperDash Technology</Authors>
+    <Company>PepperDash Technology</Company>
     <Product>PepperDash Essentials</Product>
-    <Copyright>Copyright ©  2023</Copyright>
+    <Copyright>Copyright ©  2025</Copyright>
     <RepositoryUrl>https://github.com/PepperDash/Essentials</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>Crestron; 4series</PackageTags>
@@ -13,9 +13,12 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\LICENSE.md" Pack="true" PackagePath=""/>
     <None Include="..\..\README.md" Pack="true" PackagePath=""/>
+    <None Include=".\build\**" Pack="true" PackagePath="build"/>
   </ItemGroup>
 </Project>

src/Directory.Build.targets

@@ -1,26 +1,61 @@
 <Project>
-  <ItemGroup>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cpz" Condition="$(ProjectType) == 'Program'">
+  <ItemGroup>    
+    <None Include="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).clz" Condition="$(ProjectType) == 'Library'">
       <Pack>true</Pack>
       <PackagePath>build;</PackagePath>
     </None>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
+    <None Include="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" Condition="$(ProjectType) == 'Program'">
+      <Pack>true</Pack>
+      <PackagePath>build;</PackagePath>
+    </None>
+    <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) == 'Library'">
+    <FileName>$(TargetDir)$(TargetName).$(Version).$(TargetFramework).clz</FileName>
+  </PropertyGroup>
+  <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="DeleteCLZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'Library' And $(TargetDir) != '' And Exists($(FileName))">
+    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).clz">
+      <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
+    </Delete>
+    <Message Text="Deleted files: '@(DeletedList)'" />
+  </Target>
+  <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="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 CLZ" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Library')">
+    <Message Text="Copying CLZ"></Message>
+    <Move SourceFiles="$(TargetDir)\$(TargetName).clz" DestinationFiles="$(TargetDir)\$(TargetName).$(Version).$(TargetFramework).clz"/>
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).$(Version).$(TargetFramework).clz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).clz"/>
   </Target>
-  <Target Name="Copy CPZ NET6" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' == 'net6.0' ) Or ( '$(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" />
-  </Target>
-  <Target Name="Copy CPZ NET47" AfterTargets="SimplSharpPostProcess47" 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>

src/PepperDash.Core/Comm/CommunicationGather.cs

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

src/PepperDash.Core/Comm/CommunicationStreamDebugging.cs

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

src/PepperDash.Core/Comm/ControlPropertiesConfig.cs

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

src/PepperDash.Core/Comm/EventArgs.cs

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

src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs

@@ -0,0 +1,955 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronSockets;
+using PepperDash.Core.Logging;
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// A class to handle secure TCP/IP communications with a server
+    /// </summary>
+    public class GenericSecureTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
+    {
+        private const string SplusKey = "Uninitialized Secure Tcp _client";
+        /// <summary>
+        /// Stream debugging 
+        /// </summary>
+        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+
+        /// <summary>
+        /// Fires when data is received from the server and returns it as a Byte array
+        /// </summary>
+        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+
+        /// <summary>
+        /// Fires when data is received from the server and returns it as text
+        /// </summary>
+        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+        #region GenericSecureTcpIpClient Events & Delegates
+
+        /// <summary>
+        /// 
+        /// </summary>
+        //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;		
+        public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+
+        /// <summary>
+        /// Auto reconnect evant handler
+        /// </summary>
+        public event EventHandler AutoReconnectTriggered;
+
+        /// <summary>
+        /// Event for Receiving text. Once subscribed to this event the receive callback will start a thread that dequeues the messages and invokes the event on a new thread. 
+        /// It is not recommended to use both the TextReceived event and the TextReceivedQueueInvoke event. 
+        /// </summary>
+        public event EventHandler<GenericTcpServerCommMethodReceiveTextArgs> TextReceivedQueueInvoke;
+        
+        /// <summary>
+        /// For a client with a pre shared key, this will fire after the communication is established and the key exchange is complete. If you require
+        /// a key and subscribe to the socket change event and try to send data on a connection the data sent will interfere with the key exchange and disconnect.
+        /// </summary>
+        public event EventHandler<GenericTcpServerClientReadyForcommunicationsEventArgs> ClientReadyForCommunications;
+
+        #endregion
+
+
+        #region GenricTcpIpClient properties
+
+        private string _hostname;
+
+        /// <summary>
+        /// Address of server
+        /// </summary>
+        public string Hostname
+        {
+            get { return _hostname; }
+            set
+            {
+                _hostname = value;
+                if (_client != null)
+                {
+                    _client.AddressClientConnectedTo = _hostname;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Port on server
+        /// </summary>
+        public int Port { get; set; }
+
+        /// <summary>
+        /// S+ helper
+        /// </summary>
+        public ushort UPort
+        {
+            get { return Convert.ToUInt16(Port); }
+            set { Port = Convert.ToInt32(value); }
+        }
+
+        /// <summary>
+        /// Defaults to 2000
+        /// </summary>
+        public int BufferSize { get; set; }
+
+        /// <summary>
+        /// Internal secure client
+        /// </summary>
+        private SecureTCPClient _client;
+
+        /// <summary>
+        /// Bool showing if socket is connected
+        /// </summary>
+        public bool IsConnected
+        {
+            get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+        }
+
+        /// <summary>
+        /// S+ helper for IsConnected
+        /// </summary>
+        public ushort UIsConnected
+        {
+            get { return (ushort)(IsConnected ? 1 : 0); }
+        }
+
+        /// <summary>
+        /// _client socket status Read only
+        /// </summary>
+        public SocketStatus ClientStatus
+        {
+            get
+            {
+                return _client == null ? SocketStatus.SOCKET_STATUS_NO_CONNECT : _client.ClientStatus;
+            }
+        }
+
+        /// <summary>
+        /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
+        /// and IsConnected would be true when this == 2.
+        /// </summary>
+        public ushort UStatus
+        {
+            get { return (ushort)ClientStatus; }
+        }
+
+        /// <summary>
+        /// Status text shows the message associated with socket status
+        /// </summary>
+        public string ClientStatusText { get { return ClientStatus.ToString(); } }
+
+        /// <summary>
+        /// Connection failure reason
+        /// </summary>
+        public string ConnectionFailure { get { return ClientStatus.ToString(); } }
+
+        /// <summary>
+        /// bool to track if auto reconnect should be set on the socket
+        /// </summary>
+        public bool AutoReconnect { get; set; }
+
+        /// <summary>
+        /// S+ helper for AutoReconnect
+        /// </summary>
+        public ushort UAutoReconnect
+        {
+            get { return (ushort)(AutoReconnect ? 1 : 0); }
+            set { AutoReconnect = value == 1; }
+        }
+
+        /// <summary>
+        /// Milliseconds to wait before attempting to reconnect. Defaults to 5000
+        /// </summary>
+        public int AutoReconnectIntervalMs { get; set; }
+
+        /// <summary>
+        /// Flag Set only when the disconnect method is called.
+        /// </summary>
+        bool DisconnectCalledByUser;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool Connected
+        {
+            get { return _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+        }
+
+        // private Timer for auto reconnect
+        private CTimer RetryTimer;
+
+        #endregion
+
+        #region GenericSecureTcpIpClient properties
+
+        /// <summary>
+        /// Bool to show whether the server requires a preshared key. This is used in the DynamicTCPServer class
+        /// </summary>
+        public bool SharedKeyRequired { get; set; }
+
+        /// <summary>
+        /// S+ helper for requires shared key bool
+        /// </summary>
+        public ushort USharedKeyRequired
+        {
+            set
+            {
+                if (value == 1)
+                    SharedKeyRequired = true;
+                else
+                    SharedKeyRequired = false;
+            }
+        }
+
+        /// <summary>
+        /// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module
+        /// </summary>
+        public string SharedKey { get; set; }
+
+        /// <summary>
+        /// flag to show the client is waiting for the server to send the shared key
+        /// </summary>
+        private bool WaitingForSharedKeyResponse { get; set; }
+
+        /// <summary>
+        /// Semaphore on connect method
+        /// </summary>
+        bool IsTryingToConnect;
+
+        /// <summary>
+        /// Bool showing if socket is ready for communication after shared key exchange
+        /// </summary>
+        public bool IsReadyForCommunication { get; set; }
+
+        /// <summary>
+        /// S+ helper for IsReadyForCommunication
+        /// </summary>
+        public ushort UIsReadyForCommunication
+        {
+            get { return (ushort)(IsReadyForCommunication ? 1 : 0); }
+        }
+
+        /// <summary>
+        /// Bool Heartbeat Enabled flag
+        /// </summary>
+        public bool HeartbeatEnabled { get; set; }
+
+        /// <summary>
+        /// S+ helper for Heartbeat Enabled
+        /// </summary>
+        public ushort UHeartbeatEnabled
+        {
+            get { return (ushort)(HeartbeatEnabled ? 1 : 0); }
+            set { HeartbeatEnabled = value == 1; }
+        }
+
+        /// <summary>
+        /// Heartbeat String
+        /// </summary>
+        public string HeartbeatString { get; set; }
+        //public int HeartbeatInterval = 50000;
+
+        /// <summary>
+        /// Milliseconds before server expects another heartbeat. Set by property HeartbeatRequiredIntervalInSeconds which is driven from S+
+        /// </summary>
+        public int HeartbeatInterval { get; set; }
+
+        /// <summary>
+        /// Simpl+ Heartbeat Analog value in seconds
+        /// </summary>
+        public ushort HeartbeatRequiredIntervalInSeconds { set { HeartbeatInterval = (value * 1000); } }
+
+        CTimer HeartbeatSendTimer;
+        CTimer HeartbeatAckTimer;
+
+        // Used to force disconnection on a dead connect attempt
+        CTimer ConnectFailTimer;
+        CTimer WaitForSharedKey;
+        private int ConnectionCount;
+
+        bool ProgramIsStopping;
+
+        /// <summary>
+        /// Queue lock
+        /// </summary>
+        CCriticalSection DequeueLock = new CCriticalSection();
+
+        /// <summary>
+        /// Receive Queue size. Defaults to 20. Will set to 20 if QueueSize property is less than 20. Use constructor or set queue size property before
+        /// calling initialize. 
+        /// </summary>
+        public int ReceiveQueueSize { get; set; }
+
+        /// <summary>
+        /// Queue to temporarily store received messages with the source IP and Port info. Defaults to size 20. Use constructor or set queue size property before
+        /// calling initialize. 
+        /// </summary>
+        private CrestronQueue<GenericTcpServerCommMethodReceiveTextArgs> MessageQueue;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="address"></param>
+        /// <param name="port"></param>
+        /// <param name="bufferSize"></param>
+        public GenericSecureTcpIpClient(string key, string address, int port, int bufferSize)
+            : base(key)
+        {
+            StreamDebugging = new CommunicationStreamDebugging(key);
+            Hostname = address;
+            Port = port;
+            BufferSize = bufferSize;
+            AutoReconnectIntervalMs = 5000;
+
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+        }
+
+        /// <summary>
+        /// Contstructor that sets all properties by calling the initialize method with a config object. 
+        /// </summary>        
+        /// <param name="key"></param>
+        /// <param name="clientConfigObject"></param>
+        public GenericSecureTcpIpClient(string key, TcpClientConfigObject clientConfigObject)
+            : base(key)
+        {
+            StreamDebugging = new CommunicationStreamDebugging(key);
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            AutoReconnectIntervalMs = 5000;
+            BufferSize = 2000;
+
+            Initialize(clientConfigObject);
+        }
+
+        /// <summary>
+        /// Default constructor for S+
+        /// </summary>
+        public GenericSecureTcpIpClient()
+            : base(SplusKey)
+        {
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            AutoReconnectIntervalMs = 5000;
+            BufferSize = 2000;
+        }
+
+        /// <summary>
+        /// Just to help S+ set the key
+        /// </summary>
+        public void Initialize(string key)
+        {
+            Key = key;
+        }
+
+        /// <summary>
+        /// Initialize called by the constructor that accepts a client config object. Can be called later to reset properties of client. 
+        /// </summary>
+        /// <param name="config"></param>
+        public void Initialize(TcpClientConfigObject config)
+        {
+            if (config == null)
+            {
+                Debug.Console(0, this, "Could not initialize client with key: {0}", Key);
+                return;
+            }
+            try
+            {
+                Hostname = config.Control.TcpSshProperties.Address;
+                Port = config.Control.TcpSshProperties.Port > 0 && config.Control.TcpSshProperties.Port <= 65535
+                    ? config.Control.TcpSshProperties.Port
+                    : 80;
+
+                AutoReconnect = config.Control.TcpSshProperties.AutoReconnect;
+                AutoReconnectIntervalMs = config.Control.TcpSshProperties.AutoReconnectIntervalMs > 1000
+                    ? config.Control.TcpSshProperties.AutoReconnectIntervalMs
+                    : 5000;
+
+                SharedKey = config.SharedKey;
+                SharedKeyRequired = config.SharedKeyRequired;
+
+                HeartbeatEnabled = config.HeartbeatRequired;
+                HeartbeatRequiredIntervalInSeconds = config.HeartbeatRequiredIntervalInSeconds > 0
+                    ? config.HeartbeatRequiredIntervalInSeconds
+                    : (ushort)15;
+
+
+                HeartbeatString = string.IsNullOrEmpty(config.HeartbeatStringToMatch)
+                    ? "heartbeat"
+                    : config.HeartbeatStringToMatch;
+
+                BufferSize = config.Control.TcpSshProperties.BufferSize > 2000
+                    ? config.Control.TcpSshProperties.BufferSize
+                    : 2000;
+
+                ReceiveQueueSize = config.ReceiveQueueSize > 20
+                    ? config.ReceiveQueueSize
+                    : 20;
+
+                MessageQueue = new CrestronQueue<GenericTcpServerCommMethodReceiveTextArgs>(ReceiveQueueSize);
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, "Exception initializing client with key: {0}\rException: {1}", Key, ex);
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Handles closing this up when the program shuts down
+        /// </summary>
+        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        {
+            if (programEventType == eProgramStatusEventType.Stopping || programEventType == eProgramStatusEventType.Paused)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Program stopping. Closing _client connection");
+                ProgramIsStopping = true;
+                Disconnect();
+            }
+
+        }
+
+        /// <summary>
+        /// Deactivate the client
+        /// </summary>
+        /// <returns></returns>
+        public override bool Deactivate()
+        {
+            if (_client != null)
+            {
+                _client.SocketStatusChange -= this.Client_SocketStatusChange;
+                DisconnectClient();
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Connect Method. Will return if already connected. Will write errors if missing address, port, or unique key/name.
+        /// </summary>
+        public void Connect()
+        {
+            ConnectionCount++;
+            Debug.Console(2, this, "Attempting connect Count:{0}", ConnectionCount);
+
+
+            if (IsConnected)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Already connected. Ignoring.");
+                return;
+            }
+            if (IsTryingToConnect)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Already trying to connect. Ignoring.");
+                return;
+            }
+            try
+            {
+                IsTryingToConnect = true;
+                if (RetryTimer != null)
+                {
+                    RetryTimer.Stop();
+                    RetryTimer = null;
+                }
+                if (string.IsNullOrEmpty(Hostname))
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "DynamicTcpClient: No address set");
+                    return;
+                }
+                if (Port < 1 || Port > 65535)
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "DynamicTcpClient: Invalid port");
+                    return;
+                }
+                if (string.IsNullOrEmpty(SharedKey) && SharedKeyRequired)
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "DynamicTcpClient: No Shared Key set");
+                    return;
+                }
+
+                // clean up previous client
+                if (_client != null)
+                {
+                    Disconnect();
+                }
+                DisconnectCalledByUser = false;
+
+                _client = new SecureTCPClient(Hostname, Port, BufferSize);
+                _client.SocketStatusChange += Client_SocketStatusChange;
+                if (HeartbeatEnabled)
+                    _client.SocketSendOrReceiveTimeOutInMs = (HeartbeatInterval * 5);
+                _client.AddressClientConnectedTo = Hostname;
+                _client.PortNumber = Port;
+                // SecureClient = c;
+
+                //var timeOfConnect = DateTime.Now.ToString("HH:mm:ss.fff");
+
+                ConnectFailTimer = new CTimer(o =>
+                {
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Connect attempt has not finished after 30sec Count:{0}", ConnectionCount);
+                    if (IsTryingToConnect)
+                    {
+                        IsTryingToConnect = false;
+
+                        //if (ConnectionHasHungCallback != null)
+                        //{
+                        //    ConnectionHasHungCallback();
+                        //}		
+                        //SecureClient.DisconnectFromServer();
+                        //CheckClosedAndTryReconnect();
+                    }
+                }, 30000);
+
+                Debug.Console(2, this, "Making Connection Count:{0}", ConnectionCount);
+                _client.ConnectToServerAsync(o =>
+                {
+                    Debug.Console(2, this, "ConnectToServerAsync Count:{0} Ran!", ConnectionCount);
+
+                    if (ConnectFailTimer != null)
+                    {
+                        ConnectFailTimer.Stop();
+                    }
+                    IsTryingToConnect = false;
+
+                    if (o.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                    {
+                        Debug.Console(2, this, "_client connected to {0} on port {1}", o.AddressClientConnectedTo, o.LocalPortNumberOfClient);
+                        o.ReceiveDataAsync(Receive);
+
+                        if (SharedKeyRequired)
+                        {
+                            WaitingForSharedKeyResponse = true;
+                            WaitForSharedKey = new CTimer(timer =>
+                            {
+
+                                Debug.Console(1, this, Debug.ErrorLogLevel.Warning, "Shared key exchange timer expired. IsReadyForCommunication={0}", IsReadyForCommunication);
+                                // Debug.Console(1, this, "Connect attempt failed {0}", c.ClientStatus);
+                                // This is the only case where we should call DisconectFromServer...Event handeler will trigger the cleanup 
+                                o.DisconnectFromServer();
+                                //CheckClosedAndTryReconnect();
+                                //OnClientReadyForcommunications(false); // Should send false event
+                            }, 15000);
+                        }
+                        else
+                        {
+                            //CLient connected and shared key is not required so just raise the ready for communication event. if Shared key 
+                            //required this is called by the shared key being negotiated
+                            if (IsReadyForCommunication == false)
+                            {
+                                OnClientReadyForcommunications(true); // Key not required
+                            }
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(1, this, "Connect attempt failed {0}", o.ClientStatus);
+                        CheckClosedAndTryReconnect();
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "_client connection exception: {0}", ex.Message);
+                IsTryingToConnect = false;
+                CheckClosedAndTryReconnect();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Disconnect()
+        {
+            this.LogVerbose("Disconnect Called");
+
+            DisconnectCalledByUser = true;
+
+            // stop trying reconnects, if we are
+            if (RetryTimer != null)
+            {
+                RetryTimer.Stop();
+                RetryTimer = null;
+            }
+
+            if (_client != null)
+            {
+                DisconnectClient();
+                this.LogDebug("Disconnected");
+            }
+        }
+
+        /// <summary>
+        /// Does the actual disconnect business
+        /// </summary>
+        public void DisconnectClient()
+        {
+            if (_client == null) return;
+
+            Debug.Console(1, this, "Disconnecting client");
+            if (IsConnected)
+                _client.DisconnectFromServer();
+
+            // close up client. ALWAYS use this when disconnecting.
+            IsTryingToConnect = false;
+
+            Debug.Console(2, this, "Disconnecting _client {0}", DisconnectCalledByUser ? ", Called by user" : "");
+            _client.SocketStatusChange -= Client_SocketStatusChange;
+            _client.Dispose();
+            _client = null;
+
+            if (ConnectFailTimer == null) return;
+            ConnectFailTimer.Stop();
+            ConnectFailTimer.Dispose();
+            ConnectFailTimer = null;
+        }
+       
+        #region Methods
+
+        /// <summary>
+        /// Called from Connect failure or Socket Status change if 
+        /// auto reconnect and socket disconnected (Not disconnected by user)
+        /// </summary>
+        void CheckClosedAndTryReconnect()
+        {
+            if (_client != null)
+            {
+                Debug.Console(2, this, "Cleaning up remotely closed/failed connection.");
+                Disconnect();
+            }
+            if (!DisconnectCalledByUser && AutoReconnect)
+            {
+                var halfInterval = AutoReconnectIntervalMs / 2;
+                var rndTime = new Random().Next(-halfInterval, halfInterval) + AutoReconnectIntervalMs;
+                Debug.Console(2, this, "Attempting reconnect in {0} ms, randomized", rndTime);
+                if (RetryTimer != null)
+                {
+                    RetryTimer.Stop();
+                    RetryTimer = null;
+                }
+                if (AutoReconnectTriggered != null)
+                    AutoReconnectTriggered(this, new EventArgs());
+                RetryTimer = new CTimer(o => Connect(), rndTime);
+            }
+        }
+
+        /// <summary>
+        /// Receive callback
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="numBytes"></param>
+        void Receive(SecureTCPClient client, int numBytes)
+        {
+            if (numBytes > 0)
+            {
+                string str = string.Empty;
+                var handler = TextReceivedQueueInvoke;
+                try
+                {
+                    var bytes = client.IncomingDataBuffer.Take(numBytes).ToArray();
+                    str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+                    Debug.Console(2, this, "_client Received:\r--------\r{0}\r--------", str);
+                    if (!string.IsNullOrEmpty(checkHeartbeat(str)))
+                    {
+
+                        if (SharedKeyRequired && str == "SharedKey:")
+                        {
+                            Debug.Console(2, this, "Server asking for shared key, sending");
+                            SendText(SharedKey + "\n");
+                        }
+                        else if (SharedKeyRequired && str == "Shared Key Match")
+                        {
+                            StopWaitForSharedKeyTimer();
+
+
+                            Debug.Console(2, this, "Shared key confirmed. Ready for communication");
+                            OnClientReadyForcommunications(true); // Successful key exchange
+                        }
+                        else
+                        {
+                            //var bytesHandler = BytesReceived;
+                            //if (bytesHandler != null)
+                            //    bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+                            var textHandler = TextReceived;
+                            if (textHandler != null)
+                                textHandler(this, new GenericCommMethodReceiveTextArgs(str));
+                            if (handler != null)
+                            {
+                                MessageQueue.TryToEnqueue(new GenericTcpServerCommMethodReceiveTextArgs(str));
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(1, this, "Error receiving data: {1}. Error: {0}", ex.Message, str);
+                }
+                if (client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                    client.ReceiveDataAsync(Receive);
+
+                //Check to see if there is a subscription to the TextReceivedQueueInvoke event. If there is start the dequeue thread. 
+                if (handler != null)
+                {
+                    var gotLock = DequeueLock.TryEnter();
+                    if (gotLock)
+                        CrestronInvoke.BeginInvoke((o) => DequeueEvent());
+                }
+            }
+            else //JAG added this as I believe the error return is 0 bytes like the server. See help when hover on ReceiveAsync
+            {
+                client.DisconnectFromServer();
+            }
+        }
+
+        /// <summary>
+        /// This method gets spooled up in its own thread an protected by a CCriticalSection to prevent multiple threads from running concurrently.
+        /// It will dequeue items as they are enqueued automatically.
+        /// </summary>
+        void DequeueEvent()
+        {
+            try
+            {
+                while (true)
+                {
+                    // Pull from Queue and fire an event. Block indefinitely until an item can be removed, similar to a Gather.
+                    var message = MessageQueue.Dequeue();
+                    var handler = TextReceivedQueueInvoke;
+                    if (handler != null)
+                    {
+                        handler(this, message);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                this.LogException(e, "DequeueEvent error");
+            }
+            // Make sure to leave the CCritical section in case an exception above stops this thread, or we won't be able to restart it.
+            if (DequeueLock != null)
+            {
+                DequeueLock.Leave();
+            }
+        }
+
+        void HeartbeatStart()
+        {
+            if (HeartbeatEnabled)
+            {
+                this.LogVerbose("Starting Heartbeat");
+                if (HeartbeatSendTimer == null)
+                {
+
+                    HeartbeatSendTimer = new CTimer(this.SendHeartbeat, null, HeartbeatInterval, HeartbeatInterval);
+                }
+                if (HeartbeatAckTimer == null)
+                {
+                    HeartbeatAckTimer = new CTimer(HeartbeatAckTimerFail, null, (HeartbeatInterval * 2), (HeartbeatInterval * 2));
+                }
+            }
+
+        }
+        void HeartbeatStop()
+        {
+
+            if (HeartbeatSendTimer != null)
+            {
+                Debug.Console(2, this, "Stoping Heartbeat Send");
+                HeartbeatSendTimer.Stop();
+                HeartbeatSendTimer = null;
+            }
+            if (HeartbeatAckTimer != null)
+            {
+                Debug.Console(2, this, "Stoping Heartbeat Ack");
+                HeartbeatAckTimer.Stop();
+                HeartbeatAckTimer = null;
+            }
+
+        }
+        void SendHeartbeat(object notused)
+        {
+            this.SendText(HeartbeatString);
+            Debug.Console(2, this, "Sending Heartbeat");
+
+        }
+
+        //private method to check heartbeat requirements and start or reset timer
+        string checkHeartbeat(string received)
+        {
+            try
+            {
+                if (HeartbeatEnabled)
+                {
+                    if (!string.IsNullOrEmpty(HeartbeatString))
+                    {
+                        var remainingText = received.Replace(HeartbeatString, "");
+                        var noDelimiter = received.Trim(new char[] { '\r', '\n' });
+                        if (noDelimiter.Contains(HeartbeatString))
+                        {
+                            if (HeartbeatAckTimer != null)
+                            {
+                                HeartbeatAckTimer.Reset(HeartbeatInterval * 2);
+                            }
+                            else
+                            {
+                                HeartbeatAckTimer = new CTimer(HeartbeatAckTimerFail, null, (HeartbeatInterval * 2), (HeartbeatInterval * 2));
+                            }
+                            Debug.Console(2, this, "Heartbeat Received: {0}, from Server", HeartbeatString);
+                            return remainingText;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(1, this, "Error checking heartbeat: {0}", ex.Message);
+            }
+            return received;
+        }
+
+
+
+        void HeartbeatAckTimerFail(object o)
+        {
+            try
+            {
+
+                if (IsConnected)
+                {
+                    Debug.Console(1, Debug.ErrorLogLevel.Warning, "Heartbeat not received from Server...DISCONNECTING BECAUSE HEARTBEAT REQUIRED IS TRUE");
+                    SendText("Heartbeat not received by server, closing connection");
+                    CheckClosedAndTryReconnect();
+                }
+
+            }
+            catch (Exception ex)
+            {
+                ErrorLog.Error("Heartbeat timeout Error on _client: {0}, {1}", Key, ex);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void StopWaitForSharedKeyTimer()
+        {
+            if (WaitForSharedKey != null)
+            {
+                WaitForSharedKey.Stop();
+                WaitForSharedKey = null;
+            }
+        }
+
+        /// <summary>
+        /// General send method
+        /// </summary>
+        public void SendText(string text)
+        {
+            if (!string.IsNullOrEmpty(text))
+            {
+                try
+                {
+                    var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+                    if (_client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                    {
+                        _client.SendDataAsync(bytes, bytes.Length, (c, n) =>
+                        {
+                            // HOW IN THE HELL DO WE CATCH AN EXCEPTION IN SENDING?????
+                            if (n <= 0)
+                            {
+                                Debug.Console(1, Debug.ErrorLogLevel.Warning, "[{0}] Sent zero bytes. Was there an error?", this.Key);
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(0, this, "Error sending text: {1}. Error: {0}", ex.Message, text);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendBytes(byte[] bytes)
+        {
+            if (bytes.Length > 0)
+            {
+                try
+                {
+                    if (_client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                        _client.SendData(bytes, bytes.Length);
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(0, this, "Error sending bytes. Error: {0}", ex.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// SocketStatusChange Callback 
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="clientSocketStatus"></param>
+        void Client_SocketStatusChange(SecureTCPClient client, SocketStatus clientSocketStatus)
+        {
+            if (ProgramIsStopping)
+            {
+                ProgramIsStopping = false;
+                return;
+            }
+            try
+            {
+                Debug.Console(2, this, "Socket status change: {0} ({1})", client.ClientStatus, (ushort)(client.ClientStatus));
+
+                OnConnectionChange();
+                // The client could be null or disposed by this time...
+                if (_client == null || _client.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
+                {
+                    HeartbeatStop();
+                    OnClientReadyForcommunications(false); // socket has gone low
+                    CheckClosedAndTryReconnect();
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Error in socket status change callback. Error: {0}\r\r{1}", ex, ex.InnerException);
+            }
+        }
+
+        /// <summary>
+        /// Helper for ConnectionChange event
+        /// </summary>
+        void OnConnectionChange()
+        {
+            var handler = ConnectionChange;
+            if (handler == null) return;
+
+            handler(this, new GenericSocketStatusChageEventArgs(this));
+        }
+
+        /// <summary>
+        /// Helper to fire ClientReadyForCommunications event
+        /// </summary>
+        void OnClientReadyForcommunications(bool isReady)
+        {
+            IsReadyForCommunication = isReady;
+            if (IsReadyForCommunication) 
+                HeartbeatStart();
+
+            var handler = ClientReadyForCommunications;
+            if (handler == null) return;
+            
+            handler(this, new GenericTcpServerClientReadyForcommunicationsEventArgs(IsReadyForCommunication));
+        }
+        #endregion
+    }
+
+}

src/PepperDash.Core/Comm/GenericSecureTcpIpClient_ForServer.cs

@@ -0,0 +1,909 @@
+/*PepperDash Technology Corp.
+JAG
+Copyright:		2017
+------------------------------------
+***Notice of Ownership and Copyright***
+The material in which this notice appears is the property of PepperDash Technology Corporation, 
+which claims copyright under the laws of the United States of America in the entire body of material 
+and in all parts thereof, regardless of the use to which it is being put.  Any use, in whole or in part, 
+of this material by another party without the express written permission of PepperDash Technology Corporation is prohibited.  
+PepperDash Technology Corporation reserves all rights under applicable laws.
+------------------------------------ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronSockets;
+using PepperDash.Core.Logging;
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// Generic secure TCP/IP client for server
+    /// </summary>
+    public class GenericSecureTcpIpClient_ForServer : Device, IAutoReconnect
+    {
+        /// <summary>
+        /// Band aid delegate for choked server
+        /// </summary>
+        internal delegate void ConnectionHasHungCallbackDelegate();
+
+        #region Events
+
+        //public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+
+        /// <summary>
+        /// Notifies of text received
+        /// </summary>
+        public event EventHandler<GenericTcpServerCommMethodReceiveTextArgs> TextReceived;
+
+        /// <summary>
+        /// Notifies of auto reconnect sequence triggered
+        /// </summary>
+        public event EventHandler AutoReconnectTriggered;
+
+        /// <summary>
+        /// Event for Receiving text. Once subscribed to this event the receive callback will start a thread that dequeues the messages and invokes the event on a new thread. 
+        /// It is not recommended to use both the TextReceived event and the TextReceivedQueueInvoke event. 
+        /// </summary>
+        public event EventHandler<GenericTcpServerCommMethodReceiveTextArgs> TextReceivedQueueInvoke;
+
+        /// <summary>
+        /// Notifies of socket status change
+        /// </summary>
+        public event EventHandler<GenericTcpServerSocketStatusChangeEventArgs> ConnectionChange;
+
+
+        /// <summary>
+        /// This is something of a band-aid callback. If the client times out during the connection process, because the server
+        /// is stuck, this will fire.  It is intended to be used by the Server class monitor client, to help
+        /// keep a watch on the server and reset it if necessary.
+        /// </summary>
+        internal ConnectionHasHungCallbackDelegate ConnectionHasHungCallback;
+
+        /// <summary>
+        /// For a client with a pre shared key, this will fire after the communication is established and the key exchange is complete. If you require
+        /// a key and subscribe to the socket change event and try to send data on a connection the data sent will interfere with the key exchange and disconnect.
+        /// </summary>
+        public event EventHandler<GenericTcpServerClientReadyForcommunicationsEventArgs> ClientReadyForCommunications;
+
+        #endregion
+
+        #region Properties & Variables
+
+        /// <summary>
+        /// Address of server
+        /// </summary>
+        public string Hostname { get; set; }
+
+        /// <summary>
+        /// Port on server
+        /// </summary>
+        public int Port { get; set; }
+
+        /// <summary>
+        /// S+ helper
+        /// </summary>
+        public ushort UPort
+        {
+            get { return Convert.ToUInt16(Port); }
+            set { Port = Convert.ToInt32(value); }
+        }
+
+        /// <summary>
+        /// Bool to show whether the server requires a preshared key. This is used in the DynamicTCPServer class
+        /// </summary>
+        public bool SharedKeyRequired { get; set; }
+
+        /// <summary>
+        /// S+ helper for requires shared key bool
+        /// </summary>
+        public ushort USharedKeyRequired
+        {
+            set
+            {
+                if (value == 1)
+                    SharedKeyRequired = true;
+                else
+                    SharedKeyRequired = false;
+            }
+        }
+
+        /// <summary>
+        /// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module
+        /// </summary>
+        public string SharedKey { get; set; }
+
+        /// <summary>
+        /// flag to show the client is waiting for the server to send the shared key
+        /// </summary>
+        private bool WaitingForSharedKeyResponse { get; set; }
+
+        /// <summary>
+        /// Defaults to 2000
+        /// </summary>
+        public int BufferSize { get; set; }
+
+        /// <summary>
+        /// Semaphore on connect method
+        /// </summary>
+        bool IsTryingToConnect;
+
+        /// <summary>
+        /// Bool showing if socket is connected
+        /// </summary>
+        public bool IsConnected
+        {
+            get
+            {
+                if (Client != null)
+                    return Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED;
+                else
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// S+ helper for IsConnected
+        /// </summary>
+        public ushort UIsConnected
+        {
+            get { return (ushort)(IsConnected ? 1 : 0); }
+        }
+
+        /// <summary>
+        /// Bool showing if socket is ready for communication after shared key exchange
+        /// </summary>
+        public bool IsReadyForCommunication { get; set; }
+
+        /// <summary>
+        /// S+ helper for IsReadyForCommunication
+        /// </summary>
+        public ushort UIsReadyForCommunication
+        {
+            get { return (ushort)(IsReadyForCommunication ? 1 : 0); }
+        }
+
+        /// <summary>
+        /// Client socket status Read only
+        /// </summary>
+        public SocketStatus ClientStatus
+        {
+            get
+            {
+                if (Client != null)
+                    return Client.ClientStatus;
+                else
+                    return SocketStatus.SOCKET_STATUS_NO_CONNECT;
+            }
+        }
+
+        /// <summary>
+        /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
+        /// and IsConnected would be true when this == 2.
+        /// </summary>
+        public ushort UStatus
+        {
+            get { return (ushort)ClientStatus; }
+        }
+
+        /// <summary>
+        /// Status text shows the message associated with socket status
+        /// </summary>
+        public string ClientStatusText { get { return ClientStatus.ToString(); } }
+
+        /// <summary>
+        /// bool to track if auto reconnect should be set on the socket
+        /// </summary>
+        public bool AutoReconnect { get; set; }
+
+        /// <summary>
+        /// S+ helper for AutoReconnect
+        /// </summary>
+        public ushort UAutoReconnect
+        {
+            get { return (ushort)(AutoReconnect ? 1 : 0); }
+            set { AutoReconnect = value == 1; }
+        }
+        /// <summary>
+        /// Milliseconds to wait before attempting to reconnect. Defaults to 5000
+        /// </summary>
+        public int AutoReconnectIntervalMs { get; set; }
+
+        /// <summary>
+        /// Flag Set only when the disconnect method is called.
+        /// </summary>
+        bool DisconnectCalledByUser;
+
+        /// <summary>
+        /// private Timer for auto reconnect
+        /// </summary>
+        CTimer RetryTimer;
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool HeartbeatEnabled { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public ushort UHeartbeatEnabled
+        {
+            get { return (ushort)(HeartbeatEnabled ? 1 : 0); }
+            set { HeartbeatEnabled = value == 1; }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string HeartbeatString { get; set; }
+        //public int HeartbeatInterval = 50000;
+
+        /// <summary>
+        /// Milliseconds before server expects another heartbeat. Set by property HeartbeatRequiredIntervalInSeconds which is driven from S+
+        /// </summary>
+        public int HeartbeatInterval { get; set; }
+
+        /// <summary>
+        /// Simpl+ Heartbeat Analog value in seconds
+        /// </summary>
+        public ushort HeartbeatRequiredIntervalInSeconds { set { HeartbeatInterval = (value * 1000); } }
+
+        CTimer HeartbeatSendTimer;
+        CTimer HeartbeatAckTimer;
+        /// <summary>
+        /// Used to force disconnection on a dead connect attempt
+        /// </summary>
+        CTimer ConnectFailTimer;
+        CTimer WaitForSharedKey;
+        private int ConnectionCount;
+        /// <summary>
+        /// Internal secure client
+        /// </summary>
+        SecureTCPClient Client;
+
+        bool ProgramIsStopping;
+
+        /// <summary>
+        /// Queue lock
+        /// </summary>
+        CCriticalSection DequeueLock = new CCriticalSection();
+
+        /// <summary>
+        /// Receive Queue size. Defaults to 20. Will set to 20 if QueueSize property is less than 20. Use constructor or set queue size property before
+        /// calling initialize. 
+        /// </summary>
+        public int ReceiveQueueSize { get; set; }
+
+        /// <summary>
+        /// Queue to temporarily store received messages with the source IP and Port info. Defaults to size 20. Use constructor or set queue size property before
+        /// calling initialize. 
+        /// </summary>
+        private CrestronQueue<GenericTcpServerCommMethodReceiveTextArgs> MessageQueue;
+
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="address"></param>
+        /// <param name="port"></param>
+        /// <param name="bufferSize"></param>
+        public GenericSecureTcpIpClient_ForServer(string key, string address, int port, int bufferSize)
+            : base(key)
+        {
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            Hostname = address;
+            Port = port;
+            BufferSize = bufferSize;
+            AutoReconnectIntervalMs = 5000;
+
+        }
+
+        /// <summary>
+        /// Constructor for S+
+        /// </summary>
+        public GenericSecureTcpIpClient_ForServer()
+            : base("Uninitialized Secure Tcp Client For Server")
+        {
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            AutoReconnectIntervalMs = 5000;
+            BufferSize = 2000;
+        }
+
+        /// <summary>
+        /// Contstructor that sets all properties by calling the initialize method with a config object. 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="clientConfigObject"></param>
+        public GenericSecureTcpIpClient_ForServer(string key, TcpClientConfigObject clientConfigObject)
+            : base(key)
+        {
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            Initialize(clientConfigObject);
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Just to help S+ set the key
+        /// </summary>
+        public void Initialize(string key)
+        {
+            Key = key;
+        }
+
+        /// <summary>
+        /// Initialize called by the constructor that accepts a client config object. Can be called later to reset properties of client. 
+        /// </summary>
+        /// <param name="clientConfigObject"></param>
+        public void Initialize(TcpClientConfigObject clientConfigObject)
+        {
+            try
+            {
+                if (clientConfigObject != null)
+                {
+                    var TcpSshProperties = clientConfigObject.Control.TcpSshProperties;
+                    Hostname = TcpSshProperties.Address;
+                    AutoReconnect = TcpSshProperties.AutoReconnect;
+                    AutoReconnectIntervalMs = TcpSshProperties.AutoReconnectIntervalMs > 1000 ?
+                        TcpSshProperties.AutoReconnectIntervalMs : 5000;
+                    SharedKey = clientConfigObject.SharedKey;
+                    SharedKeyRequired = clientConfigObject.SharedKeyRequired;
+                    HeartbeatEnabled = clientConfigObject.HeartbeatRequired;
+                    HeartbeatRequiredIntervalInSeconds = clientConfigObject.HeartbeatRequiredIntervalInSeconds > 0 ? 
+                        clientConfigObject.HeartbeatRequiredIntervalInSeconds : (ushort)15;
+                    HeartbeatString = string.IsNullOrEmpty(clientConfigObject.HeartbeatStringToMatch) ? "heartbeat" : clientConfigObject.HeartbeatStringToMatch;
+                    Port = TcpSshProperties.Port;
+                    BufferSize = TcpSshProperties.BufferSize > 2000 ? TcpSshProperties.BufferSize : 2000;
+                    ReceiveQueueSize = clientConfigObject.ReceiveQueueSize > 20 ? clientConfigObject.ReceiveQueueSize : 20;
+                    MessageQueue = new CrestronQueue<GenericTcpServerCommMethodReceiveTextArgs>(ReceiveQueueSize);
+                }
+                else
+                {
+                    ErrorLog.Error("Could not initialize client with key: {0}", Key);
+                }
+            }
+            catch
+            {
+                ErrorLog.Error("Could not initialize client with key: {0}", Key);
+            }
+        }
+
+        /// <summary>
+        /// Handles closing this up when the program shuts down
+        /// </summary>
+        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        {
+            if (programEventType == eProgramStatusEventType.Stopping || programEventType == eProgramStatusEventType.Paused)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Program stopping. Closing Client connection");
+                ProgramIsStopping = true;
+                Disconnect();
+            }
+
+        }
+
+        /// <summary>
+        /// Connect Method. Will return if already connected. Will write errors if missing address, port, or unique key/name.
+        /// </summary>
+        public void Connect()
+        {
+            ConnectionCount++;
+            Debug.Console(2, this, "Attempting connect Count:{0}", ConnectionCount);
+
+
+            if (IsConnected)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Already connected. Ignoring.");
+                return;
+            }
+            if (IsTryingToConnect)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Already trying to connect. Ignoring.");
+                return;
+            }
+            try
+            {
+                IsTryingToConnect = true;
+                if (RetryTimer != null)
+                {
+                    RetryTimer.Stop();
+                    RetryTimer = null;
+                }
+                if (string.IsNullOrEmpty(Hostname))
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "DynamicTcpClient: No address set");
+                    return;
+                }
+                if (Port < 1 || Port > 65535)
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "DynamicTcpClient: Invalid port");
+                    return;
+                }
+                if (string.IsNullOrEmpty(SharedKey) && SharedKeyRequired)
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "DynamicTcpClient: No Shared Key set");
+                    return;
+                }
+
+                // clean up previous client
+                if (Client != null)
+                {
+                    Cleanup();
+                }
+                DisconnectCalledByUser = false;
+
+                Client = new SecureTCPClient(Hostname, Port, BufferSize);
+                Client.SocketStatusChange += Client_SocketStatusChange;
+                if (HeartbeatEnabled)
+                    Client.SocketSendOrReceiveTimeOutInMs = (HeartbeatInterval * 5);
+                Client.AddressClientConnectedTo = Hostname;
+                Client.PortNumber = Port;
+                // SecureClient = c;
+
+                //var timeOfConnect = DateTime.Now.ToString("HH:mm:ss.fff");
+
+                ConnectFailTimer = new CTimer(o =>
+                {
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Connect attempt has not finished after 30sec Count:{0}", ConnectionCount);
+                    if (IsTryingToConnect)
+                    {
+                        IsTryingToConnect = false;
+
+                        //if (ConnectionHasHungCallback != null)
+                        //{
+                        //    ConnectionHasHungCallback();
+                        //}		
+                        //SecureClient.DisconnectFromServer();
+                        //CheckClosedAndTryReconnect();
+                    }
+                }, 30000);
+
+                Debug.Console(2, this, "Making Connection Count:{0}", ConnectionCount);
+                Client.ConnectToServerAsync(o =>
+                {
+                    Debug.Console(2, this, "ConnectToServerAsync Count:{0} Ran!", ConnectionCount);
+
+                    if (ConnectFailTimer != null)
+                    {
+                        ConnectFailTimer.Stop();
+                    }
+                    IsTryingToConnect = false;
+
+                    if (o.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                    {
+                        Debug.Console(2, this, "Client connected to {0} on port {1}", o.AddressClientConnectedTo, o.LocalPortNumberOfClient);
+                        o.ReceiveDataAsync(Receive);
+
+                        if (SharedKeyRequired)
+                        {
+                            WaitingForSharedKeyResponse = true;
+                            WaitForSharedKey = new CTimer(timer =>
+                            {
+
+                                Debug.Console(1, this, Debug.ErrorLogLevel.Warning, "Shared key exchange timer expired. IsReadyForCommunication={0}", IsReadyForCommunication);
+                                // Debug.Console(1, this, "Connect attempt failed {0}", c.ClientStatus);
+                                // This is the only case where we should call DisconectFromServer...Event handeler will trigger the cleanup 
+                                o.DisconnectFromServer();
+                                //CheckClosedAndTryReconnect();
+                                //OnClientReadyForcommunications(false); // Should send false event
+                            }, 15000);
+                        }
+                        else
+                        {
+                            //CLient connected and shared key is not required so just raise the ready for communication event. if Shared key 
+                            //required this is called by the shared key being negotiated
+                            if (IsReadyForCommunication == false)
+                            {
+                                OnClientReadyForcommunications(true); // Key not required
+                            }
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(1, this, "Connect attempt failed {0}", o.ClientStatus);
+                        CheckClosedAndTryReconnect();
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Client connection exception: {0}", ex.Message);
+                IsTryingToConnect = false;
+                CheckClosedAndTryReconnect();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Disconnect()
+        {
+            this.LogVerbose("Disconnect Called");
+
+            DisconnectCalledByUser = true;
+            if (IsConnected)
+            {
+                Client.DisconnectFromServer();
+
+            }
+            if (RetryTimer != null)
+            {
+                RetryTimer.Stop();
+                RetryTimer = null;
+            }
+            Cleanup();
+        }
+
+        /// <summary>
+        ///  Internal call to close up client. ALWAYS use this when disconnecting.
+        /// </summary>
+        void Cleanup()
+        {
+            IsTryingToConnect = false;
+
+            if (Client != null)
+            {
+                //SecureClient.DisconnectFromServer();
+                Debug.Console(2, this, "Disconnecting Client {0}", DisconnectCalledByUser ? ", Called by user" : "");
+                Client.SocketStatusChange -= Client_SocketStatusChange;
+                Client.Dispose();
+                Client = null;
+            }
+            if (ConnectFailTimer != null)
+            {
+                ConnectFailTimer.Stop();
+                ConnectFailTimer.Dispose();
+                ConnectFailTimer = null;
+            }
+        }
+
+
+        /// <summary>ff
+        /// Called from Connect failure or Socket Status change if 
+        /// auto reconnect and socket disconnected (Not disconnected by user)
+        /// </summary>
+        void CheckClosedAndTryReconnect()
+        {
+            if (Client != null)
+            {
+                Debug.Console(2, this, "Cleaning up remotely closed/failed connection.");
+                Cleanup();
+            }
+            if (!DisconnectCalledByUser && AutoReconnect)
+            {
+                var halfInterval = AutoReconnectIntervalMs / 2;
+                var rndTime = new Random().Next(-halfInterval, halfInterval) + AutoReconnectIntervalMs;
+                Debug.Console(2, this, "Attempting reconnect in {0} ms, randomized", rndTime);
+                if (RetryTimer != null)
+                {
+                    RetryTimer.Stop();
+                    RetryTimer = null;
+                }
+                if(AutoReconnectTriggered != null)
+                    AutoReconnectTriggered(this, new EventArgs());
+                RetryTimer = new CTimer(o => Connect(), rndTime);
+            }
+        }
+
+        /// <summary>
+        /// Receive callback
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="numBytes"></param>
+        void Receive(SecureTCPClient client, int numBytes)
+        {
+            if (numBytes > 0)
+            {
+                string str = string.Empty;
+                var handler = TextReceivedQueueInvoke;
+                try
+                {
+                    var bytes = client.IncomingDataBuffer.Take(numBytes).ToArray();
+                    str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+                    Debug.Console(2, this, "Client Received:\r--------\r{0}\r--------", str);
+                    if (!string.IsNullOrEmpty(checkHeartbeat(str)))
+                    {
+
+                        if (SharedKeyRequired && str == "SharedKey:")
+                        {
+                            Debug.Console(2, this, "Server asking for shared key, sending");
+                            SendText(SharedKey + "\n");
+                        }
+                        else if (SharedKeyRequired && str == "Shared Key Match")
+                        {
+                            StopWaitForSharedKeyTimer();
+
+
+                            Debug.Console(2, this, "Shared key confirmed. Ready for communication");
+                            OnClientReadyForcommunications(true); // Successful key exchange
+                        }
+                        else
+                        {
+                            //var bytesHandler = BytesReceived;
+                            //if (bytesHandler != null)
+                            //    bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+                            var textHandler = TextReceived;
+                            if (textHandler != null)
+                                textHandler(this, new GenericTcpServerCommMethodReceiveTextArgs(str));
+                            if (handler != null)
+                            {
+                                MessageQueue.TryToEnqueue(new GenericTcpServerCommMethodReceiveTextArgs(str));
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(1, this, "Error receiving data: {1}. Error: {0}", ex.Message, str);
+                }
+                if (client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                    client.ReceiveDataAsync(Receive);
+
+                //Check to see if there is a subscription to the TextReceivedQueueInvoke event. If there is start the dequeue thread. 
+                if (handler != null)
+                {
+                    var gotLock = DequeueLock.TryEnter();
+                    if (gotLock)
+                        CrestronInvoke.BeginInvoke((o) => DequeueEvent());
+                }
+            }
+            else //JAG added this as I believe the error return is 0 bytes like the server. See help when hover on ReceiveAsync
+            {
+                client.DisconnectFromServer();
+            }
+        }
+
+        /// <summary>
+        /// This method gets spooled up in its own thread an protected by a CCriticalSection to prevent multiple threads from running concurrently.
+        /// It will dequeue items as they are enqueued automatically.
+        /// </summary>
+        void DequeueEvent()
+        {
+            try
+            {
+                while (true)
+                {
+                    // Pull from Queue and fire an event. Block indefinitely until an item can be removed, similar to a Gather.
+                    var message = MessageQueue.Dequeue();
+                    var handler = TextReceivedQueueInvoke;
+                    if (handler != null)
+                    {
+                        handler(this, message);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                this.LogException(e, "DequeueEvent error");
+            }
+            // Make sure to leave the CCritical section in case an exception above stops this thread, or we won't be able to restart it.
+            if (DequeueLock != null)
+            {
+                DequeueLock.Leave();
+            }
+        }
+
+        void HeartbeatStart()
+        {
+            if (HeartbeatEnabled)
+            {
+                Debug.Console(2, this, "Starting Heartbeat");
+                if (HeartbeatSendTimer == null)
+                {
+
+                    HeartbeatSendTimer = new CTimer(this.SendHeartbeat, null, HeartbeatInterval, HeartbeatInterval);
+                }
+                if (HeartbeatAckTimer == null)
+                {
+                    HeartbeatAckTimer = new CTimer(HeartbeatAckTimerFail, null, (HeartbeatInterval * 2), (HeartbeatInterval * 2));
+                }
+            }
+
+        }
+        void HeartbeatStop()
+        {
+
+            if (HeartbeatSendTimer != null)
+            {
+                Debug.Console(2, this, "Stoping Heartbeat Send");
+                HeartbeatSendTimer.Stop();
+                HeartbeatSendTimer = null;
+            }
+            if (HeartbeatAckTimer != null)
+            {
+                Debug.Console(2, this, "Stoping Heartbeat Ack");
+                HeartbeatAckTimer.Stop();
+                HeartbeatAckTimer = null;
+            }
+
+        }
+        void SendHeartbeat(object notused)
+        {
+            this.SendText(HeartbeatString);
+            Debug.Console(2, this, "Sending Heartbeat");
+
+        }
+
+        //private method to check heartbeat requirements and start or reset timer
+        string checkHeartbeat(string received)
+        {
+            try
+            {
+                if (HeartbeatEnabled)
+                {
+                    if (!string.IsNullOrEmpty(HeartbeatString))
+                    {
+                        var remainingText = received.Replace(HeartbeatString, "");
+                        var noDelimiter = received.Trim(new char[] { '\r', '\n' });
+                        if (noDelimiter.Contains(HeartbeatString))
+                        {
+                            if (HeartbeatAckTimer != null)
+                            {
+                                HeartbeatAckTimer.Reset(HeartbeatInterval * 2);
+                            }
+                            else
+                            {
+                                HeartbeatAckTimer = new CTimer(HeartbeatAckTimerFail, null, (HeartbeatInterval * 2), (HeartbeatInterval * 2));
+                            }
+                            Debug.Console(2, this, "Heartbeat Received: {0}, from Server", HeartbeatString);
+                            return remainingText;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(1, this, "Error checking heartbeat: {0}", ex.Message);
+            }
+            return received;
+        }
+
+
+
+        void HeartbeatAckTimerFail(object o)
+        {
+            try
+            {
+
+                if (IsConnected)
+                {
+                    Debug.Console(1, Debug.ErrorLogLevel.Warning, "Heartbeat not received from Server...DISCONNECTING BECAUSE HEARTBEAT REQUIRED IS TRUE");
+                    SendText("Heartbeat not received by server, closing connection");
+                    CheckClosedAndTryReconnect();
+                }
+
+            }
+            catch (Exception ex)
+            {
+                ErrorLog.Error("Heartbeat timeout Error on Client: {0}, {1}", Key, ex);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void StopWaitForSharedKeyTimer()
+        {
+            if (WaitForSharedKey != null)
+            {
+                WaitForSharedKey.Stop();
+                WaitForSharedKey = null;
+            }
+        }
+
+        /// <summary>
+        /// General send method
+        /// </summary>
+        public void SendText(string text)
+        {
+            if (!string.IsNullOrEmpty(text))
+            {
+                try
+                {
+                    var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+                    if (Client != null && Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                    {
+                        Client.SendDataAsync(bytes, bytes.Length, (c, n) =>
+                        {
+                            // HOW IN THE HELL DO WE CATCH AN EXCEPTION IN SENDING?????
+                            if (n <= 0)
+                            {
+                                Debug.Console(1, Debug.ErrorLogLevel.Warning, "[{0}] Sent zero bytes. Was there an error?", this.Key);
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(0, this, "Error sending text: {1}. Error: {0}", ex.Message, text);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendBytes(byte[] bytes)
+        {
+            if (bytes.Length > 0)
+            {
+                try
+                {
+                    if (Client != null && Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                        Client.SendData(bytes, bytes.Length);
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(0, this, "Error sending bytes. Error: {0}", ex.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// SocketStatusChange Callback 
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="clientSocketStatus"></param>
+        void Client_SocketStatusChange(SecureTCPClient client, SocketStatus clientSocketStatus)
+        {
+            if (ProgramIsStopping)
+            {
+                ProgramIsStopping = false;
+                return;
+            }
+            try
+            {
+                Debug.Console(2, this, "Socket status change: {0} ({1})", client.ClientStatus, (ushort)(client.ClientStatus));
+
+                OnConnectionChange();
+                // The client could be null or disposed by this time...
+                if (Client == null || Client.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
+                {
+                    HeartbeatStop();
+                    OnClientReadyForcommunications(false); // socket has gone low
+                    CheckClosedAndTryReconnect();
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Error in socket status change callback. Error: {0}\r\r{1}", ex, ex.InnerException);
+            }
+        }
+
+        /// <summary>
+        /// Helper for ConnectionChange event
+        /// </summary>
+        void OnConnectionChange()
+        {
+            var handler = ConnectionChange;
+            if (handler != null)
+                ConnectionChange(this, new GenericTcpServerSocketStatusChangeEventArgs(this, Client.ClientStatus));
+        }
+
+        /// <summary>
+        /// Helper to fire ClientReadyForCommunications event
+        /// </summary>
+        void OnClientReadyForcommunications(bool isReady)
+        {
+            IsReadyForCommunication = isReady;
+            if (this.IsReadyForCommunication) { HeartbeatStart(); }
+            var handler = ClientReadyForCommunications;
+            if (handler != null)
+                handler(this, new GenericTcpServerClientReadyForcommunicationsEventArgs(IsReadyForCommunication));
+        }
+        #endregion
+    }
+
+}

src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -0,0 +1,592 @@
+using System;
+using System.Text;
+using System.Threading;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronSockets;
+using Org.BouncyCastle.Utilities;
+using PepperDash.Core.Logging;
+using Renci.SshNet;
+using Renci.SshNet.Common;
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class GenericSshClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
+    {
+        private const string SPlusKey = "Uninitialized SshClient";
+        /// <summary>
+        /// Object to enable stream debugging
+        /// </summary>
+        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+
+        /// <summary>
+        /// Event that fires when data is received.  Delivers args with byte array
+        /// </summary>
+        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+
+        /// <summary>
+        /// Event that fires when data is received.  Delivered as text.
+        /// </summary>
+        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+        /// <summary>
+        /// Event when the connection status changes.
+        /// </summary>
+        public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+
+        ///// <summary>
+        ///// 
+        ///// </summary>
+        //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
+
+        /// <summary>
+        /// Address of server
+        /// </summary>
+        public string Hostname { get; set; }
+
+        /// <summary>
+        /// Port on server
+        /// </summary>
+        public int Port { get; set; }
+
+        /// <summary>
+        /// Username for server
+        /// </summary>
+        public string Username { get; set; }
+
+        /// <summary>
+        /// And... Password for server.  That was worth documenting!
+        /// </summary>
+        public string Password { get; set; }
+
+        /// <summary>
+        /// True when the server is connected - when status == 2.
+        /// </summary>
+        public bool IsConnected
+        {
+            // returns false if no client or not connected
+            get { return Client != null && ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+        }
+
+        /// <summary>
+        /// S+ helper for IsConnected
+        /// </summary>
+        public ushort UIsConnected
+        {
+            get { return (ushort)(IsConnected ? 1 : 0); }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public SocketStatus ClientStatus
+        {
+            get { return _ClientStatus; }
+            private set
+            {
+                if (_ClientStatus == value)
+                    return;
+                _ClientStatus = value;
+                OnConnectionChange();
+            }
+        }
+        SocketStatus _ClientStatus;
+
+        /// <summary>
+        /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
+        /// and IsConnected with be true when this == 2.
+        /// </summary>
+        public ushort UStatus
+        {
+            get { return (ushort)_ClientStatus; }
+        }
+
+        /// <summary>
+        /// Determines whether client will attempt reconnection on failure. Default is true
+        /// </summary>
+        public bool AutoReconnect { get; set; }
+
+        /// <summary>
+        /// Will be set and unset by connect and disconnect only
+        /// </summary>
+        public bool ConnectEnabled { get; private set; }
+
+        /// <summary>
+        /// S+ helper for AutoReconnect
+        /// </summary>
+        public ushort UAutoReconnect
+        {
+            get { return (ushort)(AutoReconnect ? 1 : 0); }
+            set { AutoReconnect = value == 1; }
+        }
+
+        /// <summary>
+        /// Millisecond value, determines the timeout period in between reconnect attempts.
+        /// Set to 5000 by default
+        /// </summary>
+        public int AutoReconnectIntervalMs { get; set; }
+
+        SshClient Client;
+
+        ShellStream TheStream;
+
+        CTimer ReconnectTimer;
+
+        //Lock object to prevent simulatneous connect/disconnect operations
+        //private CCriticalSection connectLock = new CCriticalSection();
+        private SemaphoreSlim connectLock = new SemaphoreSlim(1);
+
+        private bool DisconnectLogged = false;
+
+        /// <summary>
+        /// Typical constructor.
+        /// </summary>
+        public GenericSshClient(string key, string hostname, int port, string username, string password) :
+            base(key)
+        {
+            StreamDebugging = new CommunicationStreamDebugging(key);
+			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+			Key = key;
+			Hostname = hostname;
+			Port = port;
+			Username = username;
+			Password = password; 
+			AutoReconnectIntervalMs = 5000;
+
+            ReconnectTimer = new CTimer(o =>
+	            {
+                    if (ConnectEnabled)
+                    {
+                        Connect();
+                    }
+	            }, System.Threading.Timeout.Infinite);
+		}
+
+		/// <summary>
+		/// S+ Constructor - Must set all properties before calling Connect
+		/// </summary>
+		public GenericSshClient()
+			: base(SPlusKey)
+		{
+			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+			AutoReconnectIntervalMs = 5000;
+
+            ReconnectTimer = new CTimer(o =>
+            {
+                if (ConnectEnabled)
+                {
+                    Connect();
+                }
+            }, System.Threading.Timeout.Infinite);
+		}
+
+		/// <summary>
+		/// Handles closing this up when the program shuts down
+		/// </summary>
+		void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+		{
+			if (programEventType == eProgramStatusEventType.Stopping)
+			{
+				if (Client != null)
+				{
+					this.LogDebug("Program stopping. Closing connection");
+                    Disconnect();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Connect to the server, using the provided properties.
+        /// </summary>
+        public void Connect()
+        {
+            // Don't go unless everything is here
+            if (string.IsNullOrEmpty(Hostname) || Port < 1 || Port > 65535
+                || Username == null || Password == null)
+            {
+                this.LogError("Connect failed.  Check hostname, port, username and password are set or not null");
+                return;
+            }
+
+            ConnectEnabled = true;
+
+            try
+            {
+                connectLock.Wait();
+                if (IsConnected)
+                {
+                    this.LogDebug("Connection already connected.  Exiting Connect");
+                }
+                else
+                {
+                    this.LogDebug("Attempting connect");
+
+                    // Cancel reconnect if running.
+					if (ReconnectTimer != null)
+					{
+						ReconnectTimer.Stop();
+					}
+
+                    // Cleanup the old client if it already exists
+                    if (Client != null)
+                    {
+                        this.LogDebug("Cleaning up disconnected client");
+                        KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
+                    }
+
+                    // This handles both password and keyboard-interactive (like on OS-X, 'nixes)
+                    KeyboardInteractiveAuthenticationMethod kauth = new KeyboardInteractiveAuthenticationMethod(Username);
+                    kauth.AuthenticationPrompt += new EventHandler<AuthenticationPromptEventArgs>(kauth_AuthenticationPrompt);
+                    PasswordAuthenticationMethod pauth = new PasswordAuthenticationMethod(Username, Password);
+
+                    this.LogDebug("Creating new SshClient");
+                    ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
+                    Client = new SshClient(connectionInfo);
+                    Client.ErrorOccurred += Client_ErrorOccurred;
+
+                    //Attempt to connect
+                    ClientStatus = SocketStatus.SOCKET_STATUS_WAITING;
+                    try
+                    {
+                        Client.Connect();
+                        TheStream = Client.CreateShellStream("PDTShell", 0, 0, 0, 0, 65534);
+                        if (TheStream.DataAvailable)
+                        {
+                            // empty the buffer if there is data
+                            string str = TheStream.Read();
+                        }
+                        TheStream.DataReceived += Stream_DataReceived;
+                        this.LogInformation("Connected");
+                        ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
+                        DisconnectLogged = false;
+                    }
+                    catch (SshConnectionException e)
+                    {
+                        var ie = e.InnerException; // The details are inside!!
+                        var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
+
+                        if (ie is SocketException)
+                        {
+                            this.LogException(ie, "CONNECTION failure: Cannot reach host");                            
+                        }
+
+                        if (ie is System.Net.Sockets.SocketException socketException)
+                        {
+                            this.LogException(ie, "Connection failure: Cannot reach {host} on {port}",
+                                Hostname, Port);
+                        }
+                        if (ie is SshAuthenticationException)
+                        {
+                            this.LogException(ie, "Authentication failure for username {userName}", Username);
+                        }
+                        else
+                            this.LogException(ie, "Error on connect");
+
+                        DisconnectLogged = true;
+                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                        if (AutoReconnect)
+                        {
+                            this.LogDebug("Checking autoreconnect: {autoReconnect}, {autoReconnectInterval}ms", AutoReconnect, AutoReconnectIntervalMs);
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                        }
+                    }
+                    catch(SshOperationTimeoutException ex)
+                    {
+                        this.LogWarning("Connection attempt timed out: {message}", ex.Message);
+
+                        DisconnectLogged = true;
+                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                        if (AutoReconnect)
+                        {
+                            this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
+                        this.LogException(e, "Unhandled exception on connect");
+                        DisconnectLogged = true;
+                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                        if (AutoReconnect)
+                        {
+                            this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
+                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                connectLock.Release();
+            }
+        }
+
+		/// <summary>
+		/// Disconnect the clients and put away it's resources.
+		/// </summary>
+		public void Disconnect()
+		{
+			ConnectEnabled = false;
+			// Stop trying reconnects, if we are
+			if (ReconnectTimer != null)
+			{
+				ReconnectTimer.Stop();
+				// ReconnectTimer = null;
+			}
+
+            KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
+        }
+
+        /// <summary>
+        /// Kills the stream, cleans up the client and sets it to null
+        /// </summary>
+        private void KillClient(SocketStatus status)
+        {
+            KillStream();
+
+            try
+            {
+                if (Client != null)
+                {
+                    Client.ErrorOccurred -= Client_ErrorOccurred;
+                    Client.Disconnect();
+                    Client.Dispose();
+                    Client = null;
+                    ClientStatus = status;
+                    this.LogDebug("Disconnected");
+                }
+            }
+            catch (Exception ex)
+            {
+               this.LogException(ex,"Exception in Kill Client");
+            }
+        }
+
+        /// <summary>
+        /// Kills the stream
+        /// </summary>
+		void KillStream()
+		{
+            try
+            {
+                if (TheStream != null)
+                {
+                    TheStream.DataReceived -= Stream_DataReceived;
+                    TheStream.Close();
+                    TheStream.Dispose();
+                    TheStream = null;
+                    this.LogDebug("Disconnected stream");
+                }
+            }
+            catch (Exception ex)
+            {
+                this.LogException(ex, "Exception in Kill Stream:{0}");
+            }
+		}
+
+		/// <summary>
+		/// Handles the keyboard interactive authentication, should it be required.
+		/// </summary>
+		void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
+		{
+			foreach (AuthenticationPrompt prompt in e.Prompts)
+				if (prompt.Request.IndexOf("Password:", StringComparison.InvariantCultureIgnoreCase) != -1)
+					prompt.Response = Password;
+		}
+	
+		/// <summary>
+		/// Handler for data receive on ShellStream.  Passes data across to queue for line parsing.
+		/// </summary>
+		void Stream_DataReceived(object sender, ShellDataEventArgs e)
+		{
+            if (((ShellStream)sender).Length <= 0L)
+            {
+                return;
+            }
+            var response = ((ShellStream)sender).Read(); 
+ 
+			var bytesHandler = BytesReceived;
+            
+		    if (bytesHandler != null)
+		    {
+                var bytes = Encoding.UTF8.GetBytes(response);
+		        if (StreamDebugging.RxStreamDebuggingIsEnabled)
+		        {
+		            this.LogInformation("Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+		        }
+                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+		    }
+				
+			var textHandler = TextReceived;
+			if (textHandler != null)
+			{
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    this.LogInformation("Received: '{0}'", ComTextHelper.GetDebugText(response));
+
+                textHandler(this, new GenericCommMethodReceiveTextArgs(response));
+            }
+			
+		}
+
+
+		/// <summary>
+		/// Error event handler for client events - disconnect, etc.  Will forward those events via ConnectionChange
+		/// event
+		/// </summary>
+		void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
+		{
+            CrestronInvoke.BeginInvoke(o =>
+            {
+                if (e.Exception is SshConnectionException || e.Exception is System.Net.Sockets.SocketException)
+                    this.LogError("Disconnected by remote");
+                else
+                    this.LogException(e.Exception, "Unhandled SSH client error");
+                try
+                {
+                    connectLock.Wait();
+                    KillClient(SocketStatus.SOCKET_STATUS_BROKEN_REMOTELY);
+                }
+                finally
+                {
+                    connectLock.Release();
+                }
+                if (AutoReconnect && ConnectEnabled)
+                {
+                    this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
+                    ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                }
+            });
+        }
+
+        /// <summary>
+        /// Helper for ConnectionChange event
+        /// </summary>
+        void OnConnectionChange()
+        {
+            if (ConnectionChange != null)
+                ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
+        }
+
+        #region IBasicCommunication Members
+
+		/// <summary>
+		/// Sends text to the server
+		/// </summary>
+		/// <param name="text"></param>
+		public void SendText(string text)
+		{
+		    try
+		    {
+		        if (Client != null && TheStream != null && IsConnected)
+		        {
+		            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+		                this.LogInformation(
+		                              "Sending {length} characters of text: '{text}'",
+		                              text.Length,
+		                              ComTextHelper.GetDebugText(text));
+
+		            TheStream.Write(text);
+		            TheStream.Flush();
+		        }
+		        else
+		        {
+		            this.LogDebug("Client is null or disconnected.  Cannot Send Text");
+		        }
+		    }
+		    catch (ObjectDisposedException)
+            {
+                this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());                
+
+                KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                ReconnectTimer.Reset();
+		    }
+			catch (Exception ex)
+			{
+                this.LogException(ex, "Exception sending text: '{message}'", text);
+			}
+		}
+
+        /// <summary>
+        /// Sends Bytes to the server
+        /// </summary>
+        /// <param name="bytes"></param>
+		public void SendBytes(byte[] bytes)
+		{
+            try
+            {
+                if (Client != null && TheStream != null && IsConnected)
+                {
+                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                        this.LogInformation("Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+
+                    TheStream.Write(bytes, 0, bytes.Length);
+                    TheStream.Flush();
+                }
+                else
+                {
+                    this.LogDebug("Client is null or disconnected.  Cannot Send Bytes");
+                }
+            }
+            catch (ObjectDisposedException ex)
+            {
+                this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
+
+                KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                ReconnectTimer.Reset();
+            }
+            catch (Exception ex)
+            {
+                this.LogException(ex, "Exception sending {message}", ComTextHelper.GetEscapedText(bytes));
+            }           
+		}
+    #endregion
+
+}
+
+//*****************************************************************************************************
+//*****************************************************************************************************
+/// <summary>
+/// Fired when connection changes
+/// </summary>
+public class SshConnectionChangeEventArgs : EventArgs
+	{
+        /// <summary>
+        /// Connection State
+        /// </summary>
+		public bool IsConnected { get; private set; }
+
+        /// <summary>
+        /// Connection Status represented as a ushort
+        /// </summary>
+		public ushort UIsConnected { get { return (ushort)(Client.IsConnected ? 1 : 0); } }
+
+        /// <summary>
+        /// The client
+        /// </summary>
+		public GenericSshClient Client { get; private set; }
+
+        /// <summary>
+        /// Socket Status as represented by
+        /// </summary>
+		public ushort Status { get { return Client.UStatus; } }
+
+        /// <summary>
+        ///  S+ Constructor
+        /// </summary>
+        public SshConnectionChangeEventArgs() { }
+
+        /// <summary>
+        /// EventArgs class
+        /// </summary>
+        /// <param name="isConnected">Connection State</param>
+        /// <param name="client">The Client</param>
+		public SshConnectionChangeEventArgs(bool isConnected, GenericSshClient client)
+        {
+            IsConnected = isConnected;
+            Client = client;
+        }
+    }
+}

src/PepperDash.Core/Comm/GenericTcpIpClient.cs

@@ -0,0 +1,566 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronSockets;
+using Newtonsoft.Json;
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// A class to handle basic TCP/IP communications with a server
+    /// </summary>
+	public class GenericTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
+    {
+        private const string SplusKey = "Uninitialized TcpIpClient";
+        /// <summary>
+        /// Object to enable stream debugging
+        /// </summary>
+        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+
+		/// <summary>
+		/// Fires when data is received from the server and returns it as a Byte array
+		/// </summary>
+		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+
+		/// <summary>
+		/// Fires when data is received from the server and returns it as text
+		/// </summary>
+		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		//public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
+		public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+
+
+		private string _hostname;
+
+        /// <summary>
+        /// Address of server
+        /// </summary>
+        public string Hostname
+        {
+			get
+			{
+				return _hostname;
+			}
+
+			set
+			{
+			 _hostname = value;
+				if (_client != null)
+				{
+					_client.AddressClientConnectedTo = _hostname;
+				}
+			}
+		}
+
+        /// <summary>
+        /// Port on server
+        /// </summary>
+        public int Port { get; set; }
+
+        /// <summary>
+        /// Another damn S+ helper because S+ seems to treat large port nums as signed ints
+        /// which screws up things
+        /// </summary>
+        public ushort UPort
+        {
+            get { return Convert.ToUInt16(Port); }
+            set { Port = Convert.ToInt32(value); }
+        }
+
+        /// <summary>
+        /// Defaults to 2000
+        /// </summary>
+        public int BufferSize { get; set; }
+
+		/// <summary>
+		/// The actual client class
+		/// </summary>
+		private TCPClient _client;
+
+		/// <summary>
+		/// Bool showing if socket is connected
+		/// </summary>
+		public bool IsConnected 
+        { 
+            get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } 
+        }
+        
+        /// <summary>
+        /// S+ helper for IsConnected
+        /// </summary>
+        public ushort UIsConnected
+        {
+            get { return (ushort)(IsConnected ? 1 : 0); }
+        }
+
+		/// <summary>
+		/// _client socket status Read only
+		/// </summary>
+		public SocketStatus ClientStatus 
+        { 
+            get 
+            {
+                return _client == null ? SocketStatus.SOCKET_STATUS_NO_CONNECT : _client.ClientStatus; 
+            } 
+        }
+
+        /// <summary>
+        /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
+        /// and IsConnected would be true when this == 2.
+        /// </summary>
+        public ushort UStatus
+        {
+            get { return (ushort)ClientStatus; }
+        }
+
+		/// <summary>
+        /// Status text shows the message associated with socket status
+		/// </summary>
+		public string ClientStatusText { get { return ClientStatus.ToString(); } }
+
+		/// <summary>
+		/// Ushort representation of client status
+		/// </summary>
+        [Obsolete]
+		public ushort UClientStatus { get { return (ushort)ClientStatus; } }
+
+		/// <summary>
+		/// Connection failure reason
+		/// </summary>
+		public string ConnectionFailure { get { return ClientStatus.ToString(); } }
+
+		/// <summary>
+		/// bool to track if auto reconnect should be set on the socket
+		/// </summary>
+		public bool AutoReconnect { get; set; }
+
+        /// <summary>
+        /// S+ helper for AutoReconnect
+        /// </summary>
+        public ushort UAutoReconnect
+        {
+            get { return (ushort)(AutoReconnect ? 1 : 0); }
+            set { AutoReconnect = value == 1; }
+        }
+
+		/// <summary>
+		/// Milliseconds to wait before attempting to reconnect. Defaults to 5000
+		/// </summary>
+		public int AutoReconnectIntervalMs { get; set; }
+
+		/// <summary>
+		/// Set only when the disconnect method is called
+		/// </summary>
+		bool DisconnectCalledByUser;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public bool Connected
+		{
+			get { return _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+		}
+
+        //Lock object to prevent simulatneous connect/disconnect operations
+        private CCriticalSection connectLock = new CCriticalSection();
+
+        // private Timer for auto reconnect
+		private CTimer RetryTimer;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key">unique string to differentiate between instances</param>
+        /// <param name="address"></param>
+        /// <param name="port"></param>
+        /// <param name="bufferSize"></param>
+		public GenericTcpIpClient(string key, string address, int port, int bufferSize)
+			: base(key)
+		{
+            StreamDebugging = new CommunicationStreamDebugging(key);
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            AutoReconnectIntervalMs = 5000;
+            Hostname = address;
+            Port = port;
+            BufferSize = bufferSize;
+
+            RetryTimer = new CTimer(o =>
+            {
+                Reconnect();
+            }, Timeout.Infinite);
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        public GenericTcpIpClient(string key)
+            : base(key)
+        {
+            StreamDebugging = new CommunicationStreamDebugging(key);
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            AutoReconnectIntervalMs = 5000;
+            BufferSize = 2000;
+
+            RetryTimer = new CTimer(o =>
+            {
+                Reconnect();
+            }, Timeout.Infinite);
+        }
+
+        /// <summary>
+        /// Default constructor for S+
+        /// </summary>
+        public GenericTcpIpClient()
+			: base(SplusKey)
+        {
+            StreamDebugging = new CommunicationStreamDebugging(SplusKey);
+			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+			AutoReconnectIntervalMs = 5000;
+            BufferSize = 2000;
+
+            RetryTimer = new CTimer(o =>
+            {
+                Reconnect();
+            }, Timeout.Infinite);
+		}
+
+        /// <summary>
+        /// Just to help S+ set the key
+        /// </summary>
+        public void Initialize(string key)
+        {
+            Key = key;
+        }
+
+        /// <summary>
+        /// Handles closing this up when the program shuts down
+        /// </summary>
+        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        {
+            if (programEventType == eProgramStatusEventType.Stopping)
+            {
+                Debug.Console(1, this, "Program stopping. Closing connection");
+                Deactivate();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+		public override bool Deactivate()
+		{
+            RetryTimer.Stop();
+            RetryTimer.Dispose();
+            if (_client != null)
+            {
+             _client.SocketStatusChange -= this.Client_SocketStatusChange;
+                DisconnectClient();
+            }
+			return true;
+		}
+
+        /// <summary>
+        /// Attempts to connect to the server
+        /// </summary>
+		public void Connect()
+		{
+            if (string.IsNullOrEmpty(Hostname))
+            {
+                Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': No address set", Key);
+                return;
+            }
+            if (Port < 1 || Port > 65535)
+            {
+                {
+                    Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': Invalid port", Key);
+                    return;
+                }
+            }
+
+            try
+            {
+                connectLock.Enter();
+                if (IsConnected)
+                {
+                    Debug.Console(1, this, "Connection already connected. Exiting Connect()");
+                }
+                else
+                {
+                    //Stop retry timer if running
+                    RetryTimer.Stop();
+                    _client = new TCPClient(Hostname, Port, BufferSize);
+                    _client.SocketStatusChange -= Client_SocketStatusChange;
+                    _client.SocketStatusChange += Client_SocketStatusChange;
+                    DisconnectCalledByUser = false;
+                    _client.ConnectToServerAsync(ConnectToServerCallback);
+                }
+            }
+            finally
+            {
+                connectLock.Leave();
+            }
+		}
+
+        private void Reconnect()
+        {
+            if (_client == null)
+            {
+                return;
+            }
+            try
+            {
+                connectLock.Enter();
+                if (IsConnected || DisconnectCalledByUser == true)
+                {
+                    Debug.Console(1, this, "Reconnect no longer needed. Exiting Reconnect()");
+                }
+                else
+                {
+                    Debug.Console(1, this, "Attempting reconnect now");
+                    _client.ConnectToServerAsync(ConnectToServerCallback);
+                }
+            }
+            finally
+            {
+                connectLock.Leave();
+            }
+        }
+
+        /// <summary>
+        /// Attempts to disconnect the client
+        /// </summary>
+		public void Disconnect()
+		{
+            try
+            {
+                connectLock.Enter();
+                DisconnectCalledByUser = true;
+
+                // Stop trying reconnects, if we are
+                RetryTimer.Stop();
+                DisconnectClient();
+            }
+            finally
+            {
+                connectLock.Leave();
+            }
+		}
+
+        /// <summary>
+        /// Does the actual disconnect business
+        /// </summary>
+        public void DisconnectClient()
+        {
+            if (_client != null)
+            {
+                Debug.Console(1, this, "Disconnecting client");
+                if (IsConnected)
+                    _client.DisconnectFromServer();
+            }
+        }
+
+        /// <summary>
+        /// Callback method for connection attempt
+        /// </summary>
+        /// <param name="c"></param>
+		void ConnectToServerCallback(TCPClient c)
+		{
+            if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
+            {
+                Debug.Console(0, this, "Server connection result: {0}", c.ClientStatus);
+                WaitAndTryReconnect();
+            }
+            else
+            {
+                Debug.Console(1, this, "Server connection result: {0}", c.ClientStatus);
+            }
+		}
+
+        /// <summary>
+        /// Disconnects, waits and attemtps to connect again
+        /// </summary>
+		void WaitAndTryReconnect()
+		{
+            CrestronInvoke.BeginInvoke(o =>
+            {
+                try
+                {
+                    connectLock.Enter();
+                    if (!IsConnected && AutoReconnect && !DisconnectCalledByUser && _client != null)
+                    {
+                        DisconnectClient();
+                        Debug.Console(1, this, "Attempting reconnect, status={0}", _client.ClientStatus);
+                        RetryTimer.Reset(AutoReconnectIntervalMs);
+                    }
+                }
+                finally
+                {
+                    connectLock.Leave();
+                }
+            });
+		}
+
+        /// <summary>
+        /// Recieves incoming data
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="numBytes"></param>
+		void Receive(TCPClient client, int numBytes)
+		{
+            if (client != null)
+            {
+                if (numBytes > 0)
+                {
+                    var bytes = client.IncomingDataBuffer.Take(numBytes).ToArray();
+                    var bytesHandler = BytesReceived;
+                    if (bytesHandler != null)
+                    {
+                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        {
+                            Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                        }
+                        bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+                    }
+                    var textHandler = TextReceived;
+                    if (textHandler != null)
+                    {
+                        var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+
+                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        {
+                            Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
+                        }
+
+                        textHandler(this, new GenericCommMethodReceiveTextArgs(str));
+                    }                    
+                }
+                client.ReceiveDataAsync(Receive);
+            }
+		}
+
+		/// <summary>
+		/// General send method
+		/// </summary>
+		public void SendText(string text)
+		{
+			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+			// Check debug level before processing byte array
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
+            if (_client != null)
+			    _client.SendData(bytes, bytes.Length);
+		}
+
+		/// <summary>
+		/// This is useful from console and...?
+		/// </summary>
+		public void SendEscapedText(string text)
+		{
+			var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
+				{
+					var hex = s.Groups[1].Value;
+					return ((char)Convert.ToByte(hex, 16)).ToString();
+				});
+			SendText(unescapedText);
+		}
+
+        /// <summary>
+        /// Sends Bytes to the server
+        /// </summary>
+        /// <param name="bytes"></param>
+		public void SendBytes(byte[] bytes)
+		{
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+            if (_client != null)
+			    _client.SendData(bytes, bytes.Length);
+		}
+
+        /// <summary>
+        /// Socket Status Change Handler
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="clientSocketStatus"></param>
+		void Client_SocketStatusChange(TCPClient client, SocketStatus clientSocketStatus)
+		{
+            if (clientSocketStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
+            {
+                Debug.Console(0, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
+                WaitAndTryReconnect();
+            }
+            else
+            {
+                Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
+			    _client.ReceiveDataAsync(Receive);
+            }
+
+			var handler = ConnectionChange;
+			if (handler != null)
+				ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
+		}
+	}
+
+    /// <summary>
+    /// Configuration properties for TCP/SSH Connections
+    /// </summary>
+	public class TcpSshPropertiesConfig
+	{
+        /// <summary>
+        /// Address to connect to
+        /// </summary>
+		[JsonProperty(Required = Required.Always)]
+		public string Address { get; set; }
+		
+        /// <summary>
+        /// Port to connect to
+        /// </summary>
+		[JsonProperty(Required = Required.Always)]
+		public int Port { get; set; }
+		
+        /// <summary>
+        /// Username credential
+        /// </summary>
+		public string Username { get; set; }
+        /// <summary>
+        /// Passord credential
+        /// </summary>
+		public string Password { get; set; }
+
+		/// <summary>
+		/// Defaults to 32768
+		/// </summary>
+		public int BufferSize { get; set; }
+
+		/// <summary>
+		/// Defaults to true
+		/// </summary>
+		public bool AutoReconnect { get; set; }
+
+		/// <summary>
+		/// Defaults to 5000ms
+		/// </summary>
+		public int AutoReconnectIntervalMs { get; set; }
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+		public TcpSshPropertiesConfig()
+		{
+			BufferSize = 32768;
+			AutoReconnect = true;
+			AutoReconnectIntervalMs = 5000;
+            Username = "";
+            Password = "";
+		}
+
+	}
+
+}

src/PepperDash.Core/Comm/GenericTcpIpClient_ForServer.cs

@@ -0,0 +1,775 @@
+/*PepperDash Technology Corp.
+JAG
+Copyright:		2017
+------------------------------------
+***Notice of Ownership and Copyright***
+The material in which this notice appears is the property of PepperDash Technology Corporation, 
+which claims copyright under the laws of the United States of America in the entire body of material 
+and in all parts thereof, regardless of the use to which it is being put.  Any use, in whole or in part, 
+of this material by another party without the express written permission of PepperDash Technology Corporation is prohibited.  
+PepperDash Technology Corporation reserves all rights under applicable laws.
+------------------------------------ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronSockets;
+using PepperDash.Core.Logging;
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// Generic TCP/IP client for server
+    /// </summary>
+    public class GenericTcpIpClient_ForServer : Device, IAutoReconnect
+    {
+        /// <summary>
+        /// Band aid delegate for choked server
+        /// </summary>
+        internal delegate void ConnectionHasHungCallbackDelegate();
+
+        #region Events
+
+        //public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+
+        /// <summary>
+        /// Notifies of text received
+        /// </summary>
+        public event EventHandler<GenericTcpServerCommMethodReceiveTextArgs> TextReceived;
+
+        /// <summary>
+        /// Notifies of socket status change
+        /// </summary>
+        public event EventHandler<GenericTcpServerSocketStatusChangeEventArgs> ConnectionChange;
+
+
+        /// <summary>
+        /// This is something of a band-aid callback. If the client times out during the connection process, because the server
+        /// is stuck, this will fire.  It is intended to be used by the Server class monitor client, to help
+        /// keep a watch on the server and reset it if necessary.
+        /// </summary>
+        internal ConnectionHasHungCallbackDelegate ConnectionHasHungCallback;
+
+        /// <summary>
+        /// For a client with a pre shared key, this will fire after the communication is established and the key exchange is complete. If you require
+        /// a key and subscribe to the socket change event and try to send data on a connection the data sent will interfere with the key exchange and disconnect.
+        /// </summary>
+        public event EventHandler<GenericTcpServerClientReadyForcommunicationsEventArgs> ClientReadyForCommunications;
+
+        #endregion
+
+        #region Properties & Variables
+
+        /// <summary>
+        /// Address of server
+        /// </summary>
+        public string Hostname { get; set; }
+
+        /// <summary>
+        /// Port on server
+        /// </summary>
+        public int Port { get; set; }
+
+        /// <summary>
+        /// S+ helper
+        /// </summary>
+        public ushort UPort
+        {
+            get { return Convert.ToUInt16(Port); }
+            set { Port = Convert.ToInt32(value); }
+        }
+
+        /// <summary>
+        /// Bool to show whether the server requires a preshared key. This is used in the DynamicTCPServer class
+        /// </summary>
+        public bool SharedKeyRequired { get; set; }
+
+        /// <summary>
+        /// S+ helper for requires shared key bool
+        /// </summary>
+        public ushort USharedKeyRequired
+        {
+            set
+            {
+                if (value == 1)
+                    SharedKeyRequired = true;
+                else
+                    SharedKeyRequired = false;
+            }
+        }
+
+        /// <summary>
+        /// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module
+        /// </summary>
+        public string SharedKey { get; set; }
+
+        /// <summary>
+        /// flag to show the client is waiting for the server to send the shared key
+        /// </summary>
+        private bool WaitingForSharedKeyResponse { get; set; }
+
+        /// <summary>
+        /// Defaults to 2000
+        /// </summary>
+        public int BufferSize { get; set; }
+
+        /// <summary>
+        /// Semaphore on connect method
+        /// </summary>
+        bool IsTryingToConnect;
+
+        /// <summary>
+        /// Bool showing if socket is connected
+        /// </summary>
+        public bool IsConnected
+        {
+            get
+            {
+                if (Client != null)
+                    return Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED;
+                else
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// S+ helper for IsConnected
+        /// </summary>
+        public ushort UIsConnected
+        {
+            get { return (ushort)(IsConnected ? 1 : 0); }
+        }
+
+        /// <summary>
+        /// Bool showing if socket is ready for communication after shared key exchange
+        /// </summary>
+        public bool IsReadyForCommunication { get; set; }
+
+        /// <summary>
+        /// S+ helper for IsReadyForCommunication
+        /// </summary>
+        public ushort UIsReadyForCommunication
+        {
+            get { return (ushort)(IsReadyForCommunication ? 1 : 0); }
+        }
+
+        /// <summary>
+        /// Client socket status Read only
+        /// </summary>
+        public SocketStatus ClientStatus
+        {
+            get
+            {
+                if (Client != null)
+                    return Client.ClientStatus;
+                else
+                    return SocketStatus.SOCKET_STATUS_NO_CONNECT;
+            }
+        }
+
+        /// <summary>
+        /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
+        /// and IsConnected would be true when this == 2.
+        /// </summary>
+        public ushort UStatus
+        {
+            get { return (ushort)ClientStatus; }
+        }
+
+        /// <summary>
+        /// Status text shows the message associated with socket status
+        /// </summary>
+        public string ClientStatusText { get { return ClientStatus.ToString(); } }
+
+        /// <summary>
+        /// bool to track if auto reconnect should be set on the socket
+        /// </summary>
+        public bool AutoReconnect { get; set; }
+
+        /// <summary>
+        /// S+ helper for AutoReconnect
+        /// </summary>
+        public ushort UAutoReconnect
+        {
+            get { return (ushort)(AutoReconnect ? 1 : 0); }
+            set { AutoReconnect = value == 1; }
+        }
+        /// <summary>
+        /// Milliseconds to wait before attempting to reconnect. Defaults to 5000
+        /// </summary>
+        public int AutoReconnectIntervalMs { get; set; }
+
+        /// <summary>
+        /// Flag Set only when the disconnect method is called.
+        /// </summary>
+        bool DisconnectCalledByUser;
+
+        /// <summary>
+        /// private Timer for auto reconnect
+        /// </summary>
+        CTimer RetryTimer;
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool HeartbeatEnabled { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public ushort UHeartbeatEnabled
+        {
+            get { return (ushort)(HeartbeatEnabled ? 1 : 0); }
+            set { HeartbeatEnabled = value == 1; }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string HeartbeatString = "heartbeat";
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HeartbeatInterval = 50000;
+
+        CTimer HeartbeatSendTimer;
+        CTimer HeartbeatAckTimer;
+        /// <summary>
+        /// Used to force disconnection on a dead connect attempt
+        /// </summary>
+        CTimer ConnectFailTimer;
+        CTimer WaitForSharedKey;
+        private int ConnectionCount;
+        /// <summary>
+        /// Internal secure client
+        /// </summary>
+        TCPClient Client;
+
+        bool ProgramIsStopping;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="address"></param>
+        /// <param name="port"></param>
+        /// <param name="bufferSize"></param>
+        public GenericTcpIpClient_ForServer(string key, string address, int port, int bufferSize)
+            : base(key)
+        {
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            Hostname = address;
+            Port = port;
+            BufferSize = bufferSize;
+            AutoReconnectIntervalMs = 5000;
+
+        }
+
+        /// <summary>
+        /// Constructor for S+
+        /// </summary>
+        public GenericTcpIpClient_ForServer()
+            : base("Uninitialized DynamicTcpClient")
+        {
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            AutoReconnectIntervalMs = 5000;
+            BufferSize = 2000;
+        }
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Just to help S+ set the key
+        /// </summary>
+        public void Initialize(string key)
+        {
+            Key = key;
+        }
+
+        /// <summary>
+        /// Handles closing this up when the program shuts down
+        /// </summary>
+        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        {
+            if (programEventType == eProgramStatusEventType.Stopping || programEventType == eProgramStatusEventType.Paused)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Program stopping. Closing Client connection");
+                ProgramIsStopping = true;
+                Disconnect();
+            }
+
+        }
+
+        /// <summary>
+        /// Connect Method. Will return if already connected. Will write errors if missing address, port, or unique key/name.
+        /// </summary>
+        public void Connect()
+        {
+            ConnectionCount++;
+            Debug.Console(2, this, "Attempting connect Count:{0}", ConnectionCount);
+
+
+            if (IsConnected)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Already connected. Ignoring.");
+                return;
+            }
+            if (IsTryingToConnect)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Already trying to connect. Ignoring.");
+                return;
+            }
+            try
+            {
+                IsTryingToConnect = true;
+                if (RetryTimer != null)
+                {
+                    RetryTimer.Stop();
+                    RetryTimer = null;
+                }
+                if (string.IsNullOrEmpty(Hostname))
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "DynamicTcpClient: No address set");
+                    return;
+                }
+                if (Port < 1 || Port > 65535)
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "DynamicTcpClient: Invalid port");
+                    return;
+                }
+                if (string.IsNullOrEmpty(SharedKey) && SharedKeyRequired)
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "DynamicTcpClient: No Shared Key set");
+                    return;
+                }
+
+                // clean up previous client
+                if (Client != null)
+                {
+                    Cleanup();
+                }
+                DisconnectCalledByUser = false;
+
+                Client = new TCPClient(Hostname, Port, BufferSize);
+                Client.SocketStatusChange += Client_SocketStatusChange;
+                if(HeartbeatEnabled)
+                    Client.SocketSendOrReceiveTimeOutInMs = (HeartbeatInterval * 5);
+                Client.AddressClientConnectedTo = Hostname;
+                Client.PortNumber = Port;
+                // SecureClient = c;
+
+                //var timeOfConnect = DateTime.Now.ToString("HH:mm:ss.fff");
+
+                ConnectFailTimer = new CTimer(o =>
+                {
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Connect attempt has not finished after 30sec Count:{0}", ConnectionCount);
+                    if (IsTryingToConnect)
+                    {
+                        IsTryingToConnect = false;
+
+                        //if (ConnectionHasHungCallback != null)
+                        //{
+                        //    ConnectionHasHungCallback();
+                        //}		
+                        //SecureClient.DisconnectFromServer();
+                        //CheckClosedAndTryReconnect();
+                    }
+                }, 30000);
+
+                Debug.Console(2, this,  "Making Connection Count:{0}", ConnectionCount);
+                Client.ConnectToServerAsync(o =>
+                {
+                    Debug.Console(2, this, "ConnectToServerAsync Count:{0} Ran!", ConnectionCount);
+
+                    if (ConnectFailTimer != null)
+                    {
+                        ConnectFailTimer.Stop();
+                    }
+                    IsTryingToConnect = false;
+
+                    if (o.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                    {
+                        Debug.Console(2, this, "Client connected to {0} on port {1}", o.AddressClientConnectedTo, o.LocalPortNumberOfClient);
+                        o.ReceiveDataAsync(Receive);
+
+                        if (SharedKeyRequired)
+                        {
+                            WaitingForSharedKeyResponse = true;
+                            WaitForSharedKey = new CTimer(timer =>
+                            {
+
+                                Debug.Console(1, this, Debug.ErrorLogLevel.Warning, "Shared key exchange timer expired. IsReadyForCommunication={0}", IsReadyForCommunication);
+                                // Debug.Console(1, this, "Connect attempt failed {0}", c.ClientStatus);
+                                // This is the only case where we should call DisconectFromServer...Event handeler will trigger the cleanup 
+                                o.DisconnectFromServer();
+                                //CheckClosedAndTryReconnect();
+                                //OnClientReadyForcommunications(false); // Should send false event
+                            }, 15000);
+                        }
+                        else
+                        {
+                            //CLient connected and shared key is not required so just raise the ready for communication event. if Shared key 
+                            //required this is called by the shared key being negotiated
+                            if (IsReadyForCommunication == false)
+                            {
+                                OnClientReadyForcommunications(true); // Key not required
+                            }
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(1, this, "Connect attempt failed {0}", o.ClientStatus);
+                        CheckClosedAndTryReconnect();
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Client connection exception: {0}", ex.Message);
+                IsTryingToConnect = false;
+                CheckClosedAndTryReconnect();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Disconnect()
+        {
+            this.LogVerbose("Disconnect Called");
+
+            DisconnectCalledByUser = true;
+            if (IsConnected)
+            {
+                Client.DisconnectFromServer();
+
+            }
+            if (RetryTimer != null)
+            {
+                RetryTimer.Stop();
+                RetryTimer = null;
+            }
+            Cleanup();
+        }
+
+        /// <summary>
+        ///  Internal call to close up client. ALWAYS use this when disconnecting.
+        /// </summary>
+        void Cleanup()
+        {
+            IsTryingToConnect = false;
+
+            if (Client != null)
+            {
+                //SecureClient.DisconnectFromServer();
+                Debug.Console(2, this, "Disconnecting Client {0}", DisconnectCalledByUser ? ", Called by user" : "");
+                Client.SocketStatusChange -= Client_SocketStatusChange;
+                Client.Dispose();
+                Client = null;
+            }
+            if (ConnectFailTimer != null)
+            {
+                ConnectFailTimer.Stop();
+                ConnectFailTimer.Dispose();
+                ConnectFailTimer = null;
+            }
+        }
+
+
+        /// <summary>ff
+        /// Called from Connect failure or Socket Status change if 
+        /// auto reconnect and socket disconnected (Not disconnected by user)
+        /// </summary>
+        void CheckClosedAndTryReconnect()
+        {
+            if (Client != null)
+            {
+                Debug.Console(2, this, "Cleaning up remotely closed/failed connection.");
+                Cleanup();
+            }
+            if (!DisconnectCalledByUser && AutoReconnect)
+            {
+                var halfInterval = AutoReconnectIntervalMs / 2;
+                var rndTime = new Random().Next(-halfInterval, halfInterval) + AutoReconnectIntervalMs;
+                Debug.Console(2, this, "Attempting reconnect in {0} ms, randomized", rndTime);
+                if (RetryTimer != null)
+                {
+                    RetryTimer.Stop();
+                    RetryTimer = null;
+                }
+                RetryTimer = new CTimer(o => Connect(), rndTime);
+            }
+        }
+
+        /// <summary>
+        /// Receive callback
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="numBytes"></param>
+        void Receive(TCPClient client, int numBytes)
+        {
+            if (numBytes > 0)
+            {
+                string str = string.Empty;
+
+                try
+                {
+                    var bytes = client.IncomingDataBuffer.Take(numBytes).ToArray();
+                    str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+                    Debug.Console(2, this, "Client Received:\r--------\r{0}\r--------", str);
+                    if (!string.IsNullOrEmpty(checkHeartbeat(str)))
+                    {
+                        if (SharedKeyRequired && str == "SharedKey:")
+                        {
+                            Debug.Console(2, this, "Server asking for shared key, sending");
+                            SendText(SharedKey + "\n");
+                        }
+                        else if (SharedKeyRequired && str == "Shared Key Match")
+                        {
+                            StopWaitForSharedKeyTimer();
+                            Debug.Console(2, this, "Shared key confirmed. Ready for communication");
+                            OnClientReadyForcommunications(true); // Successful key exchange
+                        }
+                        else
+                        {
+                            //var bytesHandler = BytesReceived;
+                            //if (bytesHandler != null)
+                            //    bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+                            var textHandler = TextReceived;
+                            if (textHandler != null)
+                                textHandler(this, new GenericTcpServerCommMethodReceiveTextArgs(str));
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(1, this, "Error receiving data: {1}. Error: {0}", ex.Message, str);
+                }
+            }
+            if (client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                client.ReceiveDataAsync(Receive);
+        }
+
+        void HeartbeatStart()
+        {
+            if (HeartbeatEnabled)
+            {
+                Debug.Console(2, this,  "Starting Heartbeat");
+                if (HeartbeatSendTimer == null)
+                {
+
+                    HeartbeatSendTimer = new CTimer(this.SendHeartbeat, null, HeartbeatInterval, HeartbeatInterval);
+                }
+                if (HeartbeatAckTimer == null)
+                {
+                    HeartbeatAckTimer = new CTimer(HeartbeatAckTimerFail, null, (HeartbeatInterval * 2), (HeartbeatInterval * 2));
+                }
+            }
+
+        }
+        void HeartbeatStop()
+        {
+
+            if (HeartbeatSendTimer != null)
+            {
+                Debug.Console(2, this,  "Stoping Heartbeat Send");
+                HeartbeatSendTimer.Stop();
+                HeartbeatSendTimer = null;
+            }
+            if (HeartbeatAckTimer != null)
+            {
+                Debug.Console(2, this, "Stoping Heartbeat Ack");
+                HeartbeatAckTimer.Stop();
+                HeartbeatAckTimer = null;
+            }
+
+        }
+        void SendHeartbeat(object notused)
+        {
+            this.SendText(HeartbeatString);
+            Debug.Console(2, this, "Sending Heartbeat");
+
+        }
+
+        //private method to check heartbeat requirements and start or reset timer
+        string checkHeartbeat(string received)
+        {
+            try
+            {
+                if (HeartbeatEnabled)
+                {
+                    if (!string.IsNullOrEmpty(HeartbeatString))
+                    {
+                        var remainingText = received.Replace(HeartbeatString, "");
+                        var noDelimiter = received.Trim(new char[] { '\r', '\n' });
+                        if (noDelimiter.Contains(HeartbeatString))
+                        {
+                            if (HeartbeatAckTimer != null)
+                            {
+                                HeartbeatAckTimer.Reset(HeartbeatInterval * 2);
+                            }
+                            else
+                            {
+                                HeartbeatAckTimer = new CTimer(HeartbeatAckTimerFail, null, (HeartbeatInterval * 2), (HeartbeatInterval * 2));
+                            }
+                            Debug.Console(2, this, "Heartbeat Received: {0}, from Server", HeartbeatString);
+                            return remainingText;
+                        }
+                    }                    
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(1, this, "Error checking heartbeat: {0}", ex.Message);
+            }
+            return received;
+        }
+
+
+
+        void HeartbeatAckTimerFail(object o)
+        {
+            try
+            {
+
+                if (IsConnected)
+                {
+                    Debug.Console(1, Debug.ErrorLogLevel.Warning, "Heartbeat not received from Server...DISCONNECTING BECAUSE HEARTBEAT REQUIRED IS TRUE");
+                    SendText("Heartbeat not received by server, closing connection");
+                    CheckClosedAndTryReconnect();
+                }
+
+            }
+            catch (Exception ex)
+            {
+                ErrorLog.Error("Heartbeat timeout Error on Client: {0}, {1}", Key, ex);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void StopWaitForSharedKeyTimer()
+        {
+            if (WaitForSharedKey != null)
+            {
+                WaitForSharedKey.Stop();
+                WaitForSharedKey = null;
+            }
+        }
+
+        /// <summary>
+        /// General send method
+        /// </summary>
+        public void SendText(string text)
+        {
+            if (!string.IsNullOrEmpty(text))
+            {
+                try
+                {
+                    var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+                    if (Client != null && Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                    {
+                        Client.SendDataAsync(bytes, bytes.Length, (c, n) =>
+                        {
+                            // HOW IN THE HELL DO WE CATCH AN EXCEPTION IN SENDING?????
+                            if (n <= 0)
+                            {
+                                Debug.Console(1, Debug.ErrorLogLevel.Warning, "[{0}] Sent zero bytes. Was there an error?", this.Key);
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(0, this, "Error sending text: {1}. Error: {0}", ex.Message, text);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendBytes(byte[] bytes)
+        {
+            if (bytes.Length > 0)
+            {
+                try
+                {
+                    if (Client != null && Client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED)
+                        Client.SendData(bytes, bytes.Length);
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(0, this, "Error sending bytes. Error: {0}", ex.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// SocketStatusChange Callback 
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="clientSocketStatus"></param>
+        void Client_SocketStatusChange(TCPClient client, SocketStatus clientSocketStatus)
+        {
+            if (ProgramIsStopping)
+            {
+                ProgramIsStopping = false;
+                return;
+            }
+            try
+            {
+                Debug.Console(2, this, "Socket status change: {0} ({1})", client.ClientStatus, (ushort)(client.ClientStatus));
+
+                OnConnectionChange();
+                
+                // The client could be null or disposed by this time...
+                if (Client == null || Client.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
+                {
+                    HeartbeatStop();
+                    OnClientReadyForcommunications(false); // socket has gone low
+                    CheckClosedAndTryReconnect();
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Error in socket status change callback. Error: {0}\r\r{1}", ex, ex.InnerException);
+            }
+        }
+
+        /// <summary>
+        /// Helper for ConnectionChange event
+        /// </summary>
+        void OnConnectionChange()
+        {
+            var handler = ConnectionChange;
+            if (handler != null)
+                ConnectionChange(this, new GenericTcpServerSocketStatusChangeEventArgs(this, Client.ClientStatus));
+        }
+
+        /// <summary>
+        /// Helper to fire ClientReadyForCommunications event
+        /// </summary>
+        void OnClientReadyForcommunications(bool isReady)
+        {
+            IsReadyForCommunication = isReady;
+            if (this.IsReadyForCommunication) { HeartbeatStart(); }
+            var handler = ClientReadyForCommunications;
+            if (handler != null)
+                handler(this, new GenericTcpServerClientReadyForcommunicationsEventArgs(IsReadyForCommunication));
+        }
+        #endregion
+    }
+    
+}

src/PepperDash.Core/Comm/GenericUdpServer.cs

@@ -0,0 +1,396 @@
+
+using System;
+using System.Linq;
+using System.Text;
+
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronSockets;
+using Newtonsoft.Json;
+using PepperDash.Core.Logging;
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// Generic UDP Server device
+    /// </summary>
+    public class GenericUdpServer : Device, ISocketStatusWithStreamDebugging
+    {
+        private const string SplusKey = "Uninitialized Udp Server";
+        /// <summary>
+        /// Object to enable stream debugging
+        /// </summary>
+        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+        /// <summary>
+        /// This event will fire when a message is dequeued that includes the source IP and Port info if needed to determine the source of the received data.
+        /// </summary>
+		public event EventHandler<GenericUdpReceiveTextExtraArgs> DataRecievedExtra;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public event EventHandler<GenericUdpConnectedEventArgs> UpdateConnectionStatus;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public SocketStatus ClientStatus
+        {
+            get
+            {
+                return Server.ServerStatus;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public ushort UStatus
+        {
+            get { return (ushort)Server.ServerStatus; }
+        }
+
+        /// <summary>
+        /// Address of server
+        /// </summary>
+        public string Hostname { get; set; }
+
+
+        /// <summary>
+        /// Port on server
+        /// </summary>
+        public int Port { get; set; }
+
+        /// <summary>
+        /// Another damn S+ helper because S+ seems to treat large port nums as signed ints
+        /// which screws up things
+        /// </summary>
+        public ushort UPort
+        {
+            get { return Convert.ToUInt16(Port); }
+            set { Port = Convert.ToInt32(value); }
+        }
+
+        /// <summary>
+        /// Indicates that the UDP Server is enabled
+        /// </summary>
+        public bool IsConnected
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Numeric value indicating 
+        /// </summary>
+        public ushort UIsConnected
+        {
+            get { return IsConnected ? (ushort)1 : (ushort)0; }
+        }
+
+        /// <summary>
+        /// Defaults to 2000
+        /// </summary>
+        public int BufferSize { get; set; }
+
+        /// <summary>
+        /// The server
+        /// </summary>
+        public UDPServer Server { get; private set; }
+
+        /// <summary>
+        /// Constructor for S+. Make sure to set key, address, port, and buffersize using init method
+        /// </summary>
+        public GenericUdpServer()
+            : base(SplusKey)
+        {
+            StreamDebugging = new CommunicationStreamDebugging(SplusKey);
+            BufferSize = 5000;
+
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
+        }
+       
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="address"></param>
+        /// <param name="port"></param>
+        /// <param name="buffefSize"></param>
+        public GenericUdpServer(string key, string address, int port, int buffefSize)
+            : base(key)
+        {
+            StreamDebugging = new CommunicationStreamDebugging(key); 
+            Hostname = address;
+            Port = port;
+            BufferSize = buffefSize;
+
+            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+            CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
+        }
+
+        /// <summary>
+        /// Call from S+ to initialize values
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="address"></param>
+        /// <param name="port"></param>
+        public void Initialize(string key, string address, ushort port)
+        {
+            Key = key;
+            Hostname = address;
+            UPort = port;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ethernetEventArgs"></param>
+        void CrestronEnvironment_EthernetEventHandler(EthernetEventArgs ethernetEventArgs)
+        {
+            // Re-enable the server if the link comes back up and the status should be connected
+            if (ethernetEventArgs.EthernetEventType == eEthernetEventType.LinkUp
+                && IsConnected)
+            {
+                Connect();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="programEventType"></param>
+        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        {
+            if (programEventType != eProgramStatusEventType.Stopping) 
+                return;
+
+            Debug.Console(1, this, "Program stopping. Disabling Server");
+            Disconnect();
+        }
+
+        /// <summary>
+        /// Enables the UDP Server
+        /// </summary>
+        public void Connect()
+        {
+            if (Server == null)
+            {
+                Server = new UDPServer();
+            }
+
+            if (string.IsNullOrEmpty(Hostname))
+            {
+                Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericUdpServer '{0}': No address set", Key);
+                return;
+            }
+            if (Port < 1 || Port > 65535)
+            {
+                {
+                    Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericUdpServer '{0}': Invalid port", Key);
+                    return;
+                }
+            }
+
+            var status = Server.EnableUDPServer(Hostname, Port);
+
+            Debug.Console(2, this, "SocketErrorCode: {0}", status);
+            if (status == SocketErrorCodes.SOCKET_OK)
+                IsConnected = true;
+
+            var handler = UpdateConnectionStatus;
+            if (handler != null)
+                handler(this, new GenericUdpConnectedEventArgs(UIsConnected));
+
+            // Start receiving data
+            Server.ReceiveDataAsync(Receive);
+        }
+
+        /// <summary>
+        /// Disabled the UDP Server
+        /// </summary>
+        public void Disconnect()
+        {
+            if(Server != null)
+                Server.DisableUDPServer();
+
+            IsConnected = false;
+
+            var handler = UpdateConnectionStatus;
+            if (handler != null)
+                handler(this, new GenericUdpConnectedEventArgs(UIsConnected));
+        }
+
+
+        /// <summary>
+        /// Recursive method to receive data
+        /// </summary>
+        /// <param name="server"></param>
+        /// <param name="numBytes"></param>
+        void Receive(UDPServer server, int numBytes)
+        {
+            Debug.Console(2, this, "Received {0} bytes", numBytes);
+
+            try
+            {
+                if (numBytes <= 0) 
+                    return;
+
+                var sourceIp = Server.IPAddressLastMessageReceivedFrom;
+                var sourcePort = Server.IPPortLastMessageReceivedFrom;
+                var bytes = server.IncomingDataBuffer.Take(numBytes).ToArray();
+                var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+
+                var dataRecivedExtra = DataRecievedExtra;
+                if (dataRecivedExtra != null)
+                    dataRecivedExtra(this, new GenericUdpReceiveTextExtraArgs(str, sourceIp, sourcePort, bytes));
+
+                Debug.Console(2, this, "Bytes: {0}", bytes.ToString());
+                var bytesHandler = BytesReceived;
+                if (bytesHandler != null)
+                {
+                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    {
+                        Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                    }
+                    bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+                }
+                var textHandler = TextReceived;
+                if (textHandler != null)
+                {
+                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                        Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
+                    textHandler(this, new GenericCommMethodReceiveTextArgs(str));
+                }
+            }
+            catch (Exception ex)
+            {
+                this.LogException(ex, "GenericUdpServer Receive error");
+            }
+            finally
+            {
+                server.ReceiveDataAsync(Receive);
+            }
+        }
+
+        /// <summary>
+        /// General send method
+        /// </summary>
+        /// <param name="text"></param>
+        public void SendText(string text)
+        {
+            var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+
+            if (IsConnected && Server != null)
+            {
+                if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                    Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
+
+                Server.SendData(bytes, bytes.Length);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="bytes"></param>
+        public void SendBytes(byte[] bytes)
+        {
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+
+            if (IsConnected && Server != null)
+                Server.SendData(bytes, bytes.Length);
+        }
+
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+	public class GenericUdpReceiveTextExtraArgs : EventArgs
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public string Text { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string IpAddress { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public int	Port { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public byte[] Bytes { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="ipAddress"></param>
+        /// <param name="port"></param>
+        /// <param name="bytes"></param>
+		public GenericUdpReceiveTextExtraArgs(string text, string ipAddress, int port, byte[] bytes)
+		{
+			Text = text;
+			IpAddress = ipAddress;
+			Port = port;
+			Bytes = bytes;
+		}
+
+		/// <summary>
+		/// Stupid S+ Constructor
+		/// </summary>
+		public GenericUdpReceiveTextExtraArgs() { }
+	}
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class UdpServerPropertiesConfig
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public int Port { get; set; }
+
+        /// <summary>
+        /// Defaults to 32768
+        /// </summary>
+        public int BufferSize { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public UdpServerPropertiesConfig()
+        {
+            BufferSize = 32768;
+        }
+    }
+}

src/PepperDash.Core/Comm/TcpClientConfigObject.cs

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

src/PepperDash.Core/Comm/TcpServerConfigObject.cs

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

src/PepperDash.Core/Comm/eControlMethods.cs

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

src/PepperDash.Core/CommunicationExtras.cs

@@ -0,0 +1,247 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronSockets;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// An incoming communication stream
+    /// </summary>
+    public interface ICommunicationReceiver : IKeyed
+    {
+        /// <summary>
+        /// Notifies of bytes received
+        /// </summary>
+        event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+        /// <summary>
+        /// Notifies of text received
+        /// </summary>
+        event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+        /// <summary>
+        /// Indicates connection status
+        /// </summary>
+        [JsonProperty("isConnected")]
+        bool IsConnected { get; }
+        /// <summary>
+        /// Connect to the device
+        /// </summary>
+        void Connect();
+        /// <summary>
+        /// Disconnect from the device
+        /// </summary>
+        void Disconnect();
+    }
+
+	/// <summary>
+	/// Represents a device that uses basic connection
+	/// </summary>
+    public interface IBasicCommunication : ICommunicationReceiver
+	{
+        /// <summary>
+        /// Send text to the device
+        /// </summary>
+        /// <param name="text"></param>
+		void SendText(string text);
+
+        /// <summary>
+        /// Send bytes to the device
+        /// </summary>
+        /// <param name="bytes"></param>
+		void SendBytes(byte[] bytes);
+	}
+
+    /// <summary>
+    /// Represents a device that implements IBasicCommunication and IStreamDebugging
+    /// </summary>
+    public interface IBasicCommunicationWithStreamDebugging : IBasicCommunication, IStreamDebugging
+    {
+
+    }
+
+    /// <summary>
+    /// Represents a device with stream debugging capablities
+    /// </summary>
+    public interface IStreamDebugging
+    {
+        /// <summary>
+        /// Object to enable stream debugging
+        /// </summary>
+        [JsonProperty("streamDebugging")]
+        CommunicationStreamDebugging StreamDebugging { get; }
+    }
+
+	/// <summary>
+	/// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
+	/// GenericTcpIpClient
+	/// </summary>
+	public interface ISocketStatus : IBasicCommunication
+	{
+        /// <summary>
+        /// Notifies of socket status changes
+        /// </summary>
+		event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+
+        /// <summary>
+        /// The current socket status of the client
+        /// </summary>
+        [JsonProperty("clientStatus")]
+        [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
+        SocketStatus ClientStatus { get; }
+	}
+
+    /// <summary>
+    /// Describes a device that implements ISocketStatus and IStreamDebugging
+    /// </summary>
+    public interface ISocketStatusWithStreamDebugging : ISocketStatus, IStreamDebugging
+    {
+
+    }
+
+    /// <summary>
+    /// Describes a device that can automatically attempt to reconnect
+    /// </summary>
+	public interface IAutoReconnect
+	{
+        /// <summary>
+        /// Enable automatic recconnect
+        /// </summary>
+        [JsonProperty("autoReconnect")]
+		bool AutoReconnect { get; set; }
+        /// <summary>
+        /// Interval in ms to attempt automatic recconnections
+        /// </summary>
+        [JsonProperty("autoReconnectIntervalMs")]
+		int AutoReconnectIntervalMs { get; set; }
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public enum eGenericCommMethodStatusChangeType
+	{
+        /// <summary>
+        /// Connected
+        /// </summary>
+		Connected,
+        /// <summary>
+        /// Disconnected
+        /// </summary>
+        Disconnected
+	}
+
+	/// <summary>
+	/// This delegate defines handler for IBasicCommunication status changes
+	/// </summary>
+	/// <param name="comm">Device firing the status change</param>
+	/// <param name="status"></param>
+	public delegate void GenericCommMethodStatusHandler(IBasicCommunication comm, eGenericCommMethodStatusChangeType status);
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class GenericCommMethodReceiveBytesArgs : EventArgs
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public byte[] Bytes { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="bytes"></param>
+		public GenericCommMethodReceiveBytesArgs(byte[] bytes)
+		{
+			Bytes = bytes;
+		}
+
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericCommMethodReceiveBytesArgs() { }
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class GenericCommMethodReceiveTextArgs : EventArgs
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public string Text { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Delimiter { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="text"></param>
+		public GenericCommMethodReceiveTextArgs(string text)
+		{
+			Text = text;
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="delimiter"></param>
+        public GenericCommMethodReceiveTextArgs(string text, string delimiter)
+            :this(text)
+        {
+            Delimiter = delimiter;
+        }
+
+		/// <summary>
+		/// S+ Constructor
+		/// </summary>
+		public GenericCommMethodReceiveTextArgs() { }
+	}
+
+
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class ComTextHelper
+	{
+        /// <summary>
+        /// Gets escaped text for a byte array
+        /// </summary>
+        /// <param name="bytes"></param>
+        /// <returns></returns>
+		public static string GetEscapedText(byte[] bytes)
+		{
+			return String.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
+		}
+
+        /// <summary>
+        /// Gets escaped text for a string
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+		public static string GetEscapedText(string text)
+		{
+			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+			return String.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
+		}
+
+        /// <summary>
+        /// Gets debug text for a string
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        public static string GetDebugText(string text)
+        {
+            return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
+        }
+	}
+}

src/PepperDash.Core/Config/PortalConfigReader.cs

@@ -0,0 +1,235 @@
+using System;
+using System.Linq;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using Serilog.Events;
+
+namespace PepperDash.Core.Config
+{
+    /// <summary>
+    /// Reads a Portal formatted config file
+    /// </summary>
+	public class PortalConfigReader
+	{
+		/// <summary>
+		/// Reads the config file, checks if it needs a merge, merges and saves, then returns the merged Object.
+		/// </summary>
+		/// <returns>JObject of config file</returns>
+		public static void ReadAndMergeFileIfNecessary(string filePath, string savePath)
+		{
+			try
+			{
+				if (!File.Exists(filePath))
+				{
+					Debug.Console(1, Debug.ErrorLogLevel.Error,
+						"ERROR: Configuration file not present. Please load file to {0} and reset program", filePath);
+				}
+
+				using (StreamReader fs = new StreamReader(filePath))
+				{
+					var jsonObj = JObject.Parse(fs.ReadToEnd());
+					if(jsonObj["template"] != null && jsonObj["system"] != null)
+					{
+						// it's a double-config, merge it.
+						var merged = MergeConfigs(jsonObj);
+						if (jsonObj["system_url"] != null)
+						{
+							merged["systemUrl"] = jsonObj["system_url"].Value<string>();
+						}
+
+						if (jsonObj["template_url"] != null)
+						{
+							merged["templateUrl"] = jsonObj["template_url"].Value<string>();
+						}
+
+						jsonObj = merged;
+					}
+
+					using (StreamWriter fw = new StreamWriter(savePath))
+					{
+						fw.Write(jsonObj.ToString(Formatting.Indented));
+						Debug.LogMessage(LogEventLevel.Debug, "JSON config merged and saved to {0}", savePath);
+					}
+
+				}
+			}
+			catch (Exception e)
+			{
+				Debug.LogMessage(e, "ERROR: Config load failed");
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="doubleConfig"></param>
+		/// <returns></returns>
+		public static JObject MergeConfigs(JObject doubleConfig)
+		{
+			var system = JObject.FromObject(doubleConfig["system"]);
+			var template = JObject.FromObject(doubleConfig["template"]);
+			var merged = new JObject();
+
+			// Put together top-level objects
+			if (system["info"] != null)
+				merged.Add("info", Merge(template["info"], system["info"], "infO"));
+			else
+				merged.Add("info", template["info"]);
+
+			merged.Add("devices", MergeArraysOnTopLevelProperty(template["devices"] as JArray,
+				system["devices"] as JArray, "key", "devices"));
+
+			if (system["rooms"] == null)
+				merged.Add("rooms", template["rooms"]);
+			else
+				merged.Add("rooms", MergeArraysOnTopLevelProperty(template["rooms"] as JArray,
+					system["rooms"] as JArray, "key", "rooms"));
+
+			if (system["sourceLists"] == null)
+				merged.Add("sourceLists", template["sourceLists"]);
+			else
+				merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"], "sourceLists"));
+
+		    if (system["destinationLists"] == null)
+		        merged.Add("destinationLists", template["destinationLists"]);
+		    else
+		        merged.Add("destinationLists",
+		            Merge(template["destinationLists"], system["destinationLists"], "destinationLists"));
+
+
+            if (system["cameraLists"] == null)
+                merged.Add("cameraLists", template["cameraLists"]);
+            else
+                merged.Add("cameraLists", Merge(template["cameraLists"], system["cameraLists"], "cameraLists"));
+
+            if (system["audioControlPointLists"] == null)
+                merged.Add("audioControlPointLists", template["audioControlPointLists"]);
+            else
+                merged.Add("audioControlPointLists",
+                    Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists"));
+
+
+            // Template tie lines take precedence.  Config tool doesn't do them at system
+            // level anyway...
+            if (template["tieLines"] != null)
+				merged.Add("tieLines", template["tieLines"]);
+			else if (system["tieLines"] != null)
+				merged.Add("tieLines", system["tieLines"]);
+			else
+				merged.Add("tieLines", new JArray());
+
+            if (template["joinMaps"] != null)
+                merged.Add("joinMaps", template["joinMaps"]);
+            else
+                merged.Add("joinMaps", new JObject());
+
+			if (system["global"] != null)
+				merged.Add("global", Merge(template["global"], system["global"], "global"));
+			else
+				merged.Add("global", template["global"]);
+
+			//Debug.Console(2, "MERGED CONFIG RESULT: \x0d\x0a{0}", merged);
+			return merged;
+		}
+
+		/// <summary>
+		/// Merges the contents of a base and a delta array, matching the entries on a top-level property
+		/// given by propertyName.  Returns a merge of them. Items in the delta array that do not have
+		/// a matched item in base array will not be merged. Non keyed system items will replace the template items.
+		/// </summary>
+		static JArray MergeArraysOnTopLevelProperty(JArray a1, JArray a2, string propertyName, string path)
+		{
+			var result = new JArray();
+			if (a2 == null || a2.Count == 0) // If the system array is null or empty, return the template array
+				return a1;
+			else if (a1 != null)
+			{
+                if (a2[0]["key"] == null) // If the first item in the system array has no key, overwrite the template array
+                {                                                       // with the system array
+                    return a2;
+                }
+                else    // The arrays are keyed, merge them by key
+                {
+                    for (int i = 0; i < a1.Count(); i++)
+                    {
+                        var a1Dev = a1[i];
+                        // Try to get a system device and if found, merge it onto template
+                        var a2Match = a2.FirstOrDefault(t => t[propertyName].Equals(a1Dev[propertyName]));// t.Value<int>("uid") == tmplDev.Value<int>("uid"));
+                        if (a2Match != null)
+                        {
+                            var mergedItem = Merge(a1Dev, a2Match, string.Format("{0}[{1}].", path, i));// Merge(JObject.FromObject(a1Dev), JObject.FromObject(a2Match));
+                            result.Add(mergedItem);
+                        }
+                        else
+                            result.Add(a1Dev);
+                    }
+                }
+			}
+			return result;
+		}
+
+
+		/// <summary>
+		/// Helper for using with JTokens.  Converts to JObject 
+		/// </summary>
+		static JObject Merge(JToken t1, JToken t2, string path)
+		{
+			return Merge(JObject.FromObject(t1), JObject.FromObject(t2), path);
+		}
+
+		/// <summary>
+		/// Merge o2 onto o1
+		/// </summary>
+        /// <param name="o1"></param>
+        /// <param name="o2"></param>
+        /// <param name="path"></param>
+		static JObject Merge(JObject o1, JObject o2, string path)
+		{
+			foreach (var o2Prop in o2)
+			{
+				var propKey = o2Prop.Key;
+				var o1Value = o1[propKey];
+				var o2Value = o2[propKey];
+
+				// if the property doesn't exist on o1, then add it.
+				if (o1Value == null)
+				{
+					o1.Add(propKey, o2Value);
+				}
+				// otherwise merge them
+				else
+				{	
+					// Drill down
+					var propPath = String.Format("{0}.{1}", path, propKey);
+					try
+					{
+
+						if (o1Value is JArray)
+						{
+							if (o2Value is JArray)
+							{
+								o1Value.Replace(MergeArraysOnTopLevelProperty(o1Value as JArray, o2Value as JArray, "key", propPath));
+							}
+						}
+						else if (o2Prop.Value.HasValues && o1Value.HasValues)
+						{
+							o1Value.Replace(Merge(JObject.FromObject(o1Value), JObject.FromObject(o2Value), propPath));
+						}
+						else
+						{
+							o1Value.Replace(o2Prop.Value);
+						}
+					}
+					catch (Exception e)
+					{
+						Debug.Console(1, Debug.ErrorLogLevel.Warning, "Cannot merge items at path {0}: \r{1}", propPath, e);
+					}
+				}
+			}
+			return o1;
+		}
+	}
+}

src/PepperDash.Core/Conversion/Convert.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Core
+{
+    public class EncodingHelper
+    {
+        public static string ConvertUtf8ToAscii(string utf8String)
+        {
+            return Encoding.ASCII.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
+        }
+
+        public static string ConvertUtf8ToUtf16(string utf8String)
+        {
+            return Encoding.Unicode.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
+        }
+
+    }
+}

src/PepperDash.Core/CoreInterfaces.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Serilog;
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// Unique key interface to require a unique key for the class
+    /// </summary>
+	public interface IKeyed
+	{
+        /// <summary>
+        /// Unique Key
+        /// </summary>
+        [JsonProperty("key")]
+		string Key { get; }
+    }
+
+    /// <summary>
+    /// Named Keyed device interface. Forces the device to have a Unique Key and a name. 
+    /// </summary>
+	public interface IKeyName : IKeyed
+    {
+        /// <summary>
+        /// Isn't it obvious :)
+        /// </summary>
+        [JsonProperty("name")]
+		string Name { get; }
+    }
+
+}

src/PepperDash.Core/Device.cs

@@ -0,0 +1,179 @@
+using System;
+using System.Collections.Generic;
+using Serilog.Events;
+
+namespace PepperDash.Core
+{
+	//*********************************************************************************************************
+	/// <summary>
+	/// The core event and status-bearing class that most if not all device and connectors can derive from.
+	/// </summary>
+	public class Device : IKeyName
+	{
+
+        /// <summary>
+        /// Unique Key
+        /// </summary>
+		public string Key { get; protected set; }
+		/// <summary>
+		/// Name of the devie
+		/// </summary>
+        public string Name { get; protected set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public bool Enabled { get; protected set; }
+
+        ///// <summary>
+        ///// A place to store reference to the original config object, if any. These values should 
+        ///// NOT be used as properties on the device as they are all publicly-settable values.
+        ///// </summary>
+        //public DeviceConfig Config { get; private set; }
+        ///// <summary>
+        ///// Helper method to check if Config exists
+        ///// </summary>
+        //public bool HasConfig { get { return Config != null; } }
+
+		List<Action> _PreActivationActions;
+		List<Action> _PostActivationActions;
+
+        /// <summary>
+        /// 
+        /// </summary>
+		public static Device DefaultDevice { get { return _DefaultDevice; } }
+		static Device _DefaultDevice = new Device("Default", "Default");
+
+		/// <summary>
+		/// Base constructor for all Devices.
+		/// </summary>
+		/// <param name="key"></param>
+		public Device(string key)
+		{
+			Key = key;
+			if (key.Contains(".")) Debug.LogMessage(LogEventLevel.Information, "WARNING: Device key should not include '.'", this);
+			Name = "";
+		}
+
+        /// <summary>
+        /// Constructor with key and name
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="name"></param>
+		public Device(string key, string name) : this(key)
+		{
+			Name = name;
+
+		}
+
+        //public Device(DeviceConfig config)
+        //    : this(config.Key, config.Name)
+        //{
+        //    Config = config;
+        //}
+
+        /// <summary>
+        /// Adds a pre activation action
+        /// </summary>
+        /// <param name="act"></param>
+		public void AddPreActivationAction(Action act)
+		{
+			if (_PreActivationActions == null)
+				_PreActivationActions = new List<Action>();
+			_PreActivationActions.Add(act);
+		}
+
+        /// <summary>
+        /// Adds a post activation action
+        /// </summary>
+        /// <param name="act"></param>
+		public void AddPostActivationAction(Action act)
+		{
+			if (_PostActivationActions == null)
+				_PostActivationActions = new List<Action>();
+			_PostActivationActions.Add(act);
+		}
+
+        /// <summary>
+        /// Executes the preactivation actions
+        /// </summary>
+        public void PreActivate()
+        {
+            if (_PreActivationActions != null)
+                _PreActivationActions.ForEach(a => {
+					try
+					{
+						a.Invoke();
+					} catch (Exception e)
+					{ 
+						Debug.LogMessage(e, "Error in PreActivationAction: " + e.Message, this);
+					}
+            });
+        }
+
+		/// <summary>
+		/// Gets this device ready to be used in the system. Runs any added pre-activation items, and
+		/// all post-activation at end. Classes needing additional logic to 
+		/// run should override CustomActivate()
+		/// </summary>
+		public bool Activate() 
+		{
+            //if (_PreActivationActions != null)
+            //    _PreActivationActions.ForEach(a => a.Invoke());
+			var result = CustomActivate();
+            //if(result && _PostActivationActions != null)
+            //    _PostActivationActions.ForEach(a => a.Invoke());
+			return result; 	
+		}
+
+        /// <summary>
+        /// Executes the postactivation actions
+        /// </summary>
+        public void PostActivate()
+        {
+            if (_PostActivationActions != null)
+                _PostActivationActions.ForEach(a => {
+                    try
+                    {
+                        a.Invoke();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.LogMessage(e, "Error in PostActivationAction: " + e.Message, this);
+                    }
+                });
+        }
+
+		/// <summary>
+		/// Called in between Pre and PostActivationActions when Activate() is called. 
+		/// Override to provide addtitional setup when calling activation.  Overriding classes 
+		/// do not need to call base.CustomActivate()
+		/// </summary>
+		/// <returns>true if device activated successfully.</returns>
+		public virtual bool CustomActivate() { return true; }
+
+		/// <summary>
+		/// Call to deactivate device - unlink events, etc.  Overriding classes do not
+		/// need to call base.Deactivate()
+		/// </summary>
+		/// <returns></returns>
+		public virtual bool Deactivate() { return true; }
+
+        /// <summary>
+        /// Call this method to start communications with a device. Overriding classes do not need to call base.Initialize()
+        /// </summary>
+	    public virtual void Initialize()
+	    {
+	    }
+
+	    /// <summary>
+		/// Helper method to check object for bool value false and fire an Action method
+		/// </summary>
+		/// <param name="o">Should be of type bool, others will be ignored</param>
+		/// <param name="a">Action to be run when o is false</param>
+		public void OnFalse(object o, Action a)
+		{
+			if (o is bool && !(bool)o) a();
+		}
+
+	}
+}

src/PepperDash.Core/EthernetHelper.cs

@@ -0,0 +1,117 @@
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Serilog.Events;
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// Class to help with accessing values from the CrestronEthernetHelper class 
+    /// </summary>
+	public class EthernetHelper
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		public static EthernetHelper LanHelper
+		{
+			get
+			{
+				if (_LanHelper == null) _LanHelper = new EthernetHelper(0);
+				return _LanHelper;
+			}
+		}
+		static EthernetHelper _LanHelper;
+
+		// ADD OTHER HELPERS HERE
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public int PortNumber { get; private set; }
+
+		private EthernetHelper(int portNumber)
+		{
+			PortNumber = portNumber;
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		[JsonProperty("linkActive")]
+		public bool LinkActive
+		{
+			get
+			{
+				var status = CrestronEthernetHelper.GetEthernetParameter(
+					CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_LINK_STATUS, 0);
+				Debug.LogMessage(LogEventLevel.Information, "LinkActive = {0}", status);
+				return status == "";
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		[JsonProperty("dchpActive")]
+		public bool DhcpActive
+		{
+			get
+			{
+				return CrestronEthernetHelper.GetEthernetParameter(
+					CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE, 0) == "ON";
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		[JsonProperty("hostname")]
+		public string Hostname
+		{
+			get
+			{
+				return CrestronEthernetHelper.GetEthernetParameter(
+					CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, 0);
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		[JsonProperty("ipAddress")]
+		public string IPAddress
+		{
+			get
+			{
+				return CrestronEthernetHelper.GetEthernetParameter(
+					CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		[JsonProperty("subnetMask")]
+		public string SubnetMask
+		{
+			get
+			{
+				return CrestronEthernetHelper.GetEthernetParameter(
+					CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, 0);
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		[JsonProperty("defaultGateway")]
+		public string DefaultGateway
+		{
+			get
+			{
+				return CrestronEthernetHelper.GetEthernetParameter(
+					CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, 0);
+			}
+		}
+	}
+}

src/PepperDash.Core/EventArgs.cs

@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Core
+{
+	/// <summary>
+	/// Bool change event args
+	/// </summary>
+	public class BoolChangeEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Boolean state property
+		/// </summary>
+		public bool State { get; set; }
+		
+		/// <summary>
+		/// Boolean ushort value property
+		/// </summary>
+		public ushort IntValue { get { return (ushort)(State ? 1 : 0); } }
+		
+		/// <summary>
+		/// Boolean change event args type
+		/// </summary>
+		public ushort Type { get; set; }
+		
+		/// <summary>
+		/// Boolean change event args index
+		/// </summary>
+		public ushort Index { get; set; }
+		
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public BoolChangeEventArgs()
+		{
+
+		}
+		
+		/// <summary>
+		/// Constructor overload
+		/// </summary>
+		/// <param name="state"></param>
+		/// <param name="type"></param>
+		public BoolChangeEventArgs(bool state, ushort type)
+		{
+			State = state;
+			Type = type;
+		}
+		
+		/// <summary>
+		/// Constructor overload
+		/// </summary>
+		/// <param name="state"></param>
+		/// <param name="type"></param>
+		/// <param name="index"></param>
+		public BoolChangeEventArgs(bool state, ushort type, ushort index)
+		{
+			State = state;
+			Type = type;
+			Index = index;
+		}
+	}
+
+	/// <summary>
+	/// Ushort change event args
+	/// </summary>
+	public class UshrtChangeEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Ushort change event args integer value
+		/// </summary>
+		public ushort IntValue { get; set; }
+		
+		/// <summary>
+		/// Ushort change event args type
+		/// </summary>
+		public ushort Type { get; set; }
+		
+		/// <summary>
+		/// Ushort change event args index
+		/// </summary>
+		public ushort Index { get; set; }
+		
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public UshrtChangeEventArgs()
+		{
+
+		}
+
+		/// <summary>
+		/// Constructor overload
+		/// </summary>
+		/// <param name="intValue"></param>
+		/// <param name="type"></param>
+		public UshrtChangeEventArgs(ushort intValue, ushort type)
+		{
+			IntValue = intValue;
+			Type = type;
+		}
+
+		/// <summary>
+		/// Constructor overload
+		/// </summary>
+		/// <param name="intValue"></param>
+		/// <param name="type"></param>
+		/// <param name="index"></param>
+		public UshrtChangeEventArgs(ushort intValue, ushort type, ushort index)
+		{
+			IntValue = intValue;
+			Type = type;
+			Index = index;
+		}
+	}
+
+	/// <summary>
+	/// String change event args
+	/// </summary>
+	public class StringChangeEventArgs : EventArgs
+	{
+		/// <summary>
+		/// String change event args value
+		/// </summary>
+		public string StringValue { get; set; }
+
+		/// <summary>
+		/// String change event args type
+		/// </summary>
+		public ushort Type { get; set; }
+
+		/// <summary>
+		/// string change event args index
+		/// </summary>
+		public ushort Index { get; set; }
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public StringChangeEventArgs()
+		{
+
+		}
+
+		/// <summary>
+		/// Constructor overload
+		/// </summary>
+		/// <param name="stringValue"></param>
+		/// <param name="type"></param>
+		public StringChangeEventArgs(string stringValue, ushort type)
+		{
+			StringValue = stringValue;
+			Type = type;
+		}
+
+		/// <summary>
+		/// Constructor overload
+		/// </summary>
+		/// <param name="stringValue"></param>
+		/// <param name="type"></param>
+		/// <param name="index"></param>
+		public StringChangeEventArgs(string stringValue, ushort type, ushort index)
+		{
+			StringValue = stringValue;
+			Type = type;
+			Index = index;
+		}
+	}	
+}

src/PepperDash.Core/GenericRESTfulCommunications/Constants.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Core.GenericRESTfulCommunications
+{
+	/// <summary>
+	/// Constants
+	/// </summary>
+    public class GenericRESTfulConstants
+    {
+		/// <summary>
+		/// Generic boolean change
+		/// </summary>
+		public const ushort BoolValueChange = 1;
+		/// <summary>
+		/// Generic Ushort change
+		/// </summary>
+		public const ushort UshrtValueChange = 101;
+		/// <summary>
+		/// Response Code Ushort change
+		/// </summary>
+		public const ushort ResponseCodeChange = 102;
+		/// <summary>
+		/// Generic String chagne 
+		/// </summary>
+		public const ushort StringValueChange = 201;
+		/// <summary>
+		/// Response string change
+		/// </summary>
+		public const ushort ResponseStringChange = 202;
+		/// <summary>
+		/// Error string change
+		/// </summary>
+		public const ushort ErrorStringChange = 203;
+    }
+}

src/PepperDash.Core/GenericRESTfulCommunications/GenericRESTfulClient.cs

@@ -0,0 +1,256 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.Net.Http;
+using Crestron.SimplSharp.Net.Https;
+
+namespace PepperDash.Core.GenericRESTfulCommunications
+{
+	/// <summary>
+	/// Generic RESTful communication class
+	/// </summary>
+	public class GenericRESTfulClient
+	{
+		/// <summary>
+		/// Boolean event handler
+		/// </summary>
+		public event EventHandler<BoolChangeEventArgs> BoolChange;
+		/// <summary>
+		/// Ushort event handler
+		/// </summary>
+		public event EventHandler<UshrtChangeEventArgs> UshrtChange;
+		/// <summary>
+		/// String event handler
+		/// </summary>
+		public event EventHandler<StringChangeEventArgs> StringChange;
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public GenericRESTfulClient()
+		{
+
+		}
+
+		/// <summary>
+		/// Generic RESTful submit request
+		/// </summary>
+		/// <param name="url"></param>
+		/// <param name="port"></param>
+		/// <param name="requestType"></param>
+		/// <param name="username"></param>
+		/// <param name="password"></param>
+        /// <param name="contentType"></param>
+		public void SubmitRequest(string url, ushort port, ushort requestType, string contentType, string username, string password)
+		{
+			if (url.StartsWith("https:", StringComparison.OrdinalIgnoreCase))
+			{
+				SubmitRequestHttps(url, port, requestType, contentType, username, password);
+			}
+			else if (url.StartsWith("http:", StringComparison.OrdinalIgnoreCase))
+			{
+				SubmitRequestHttp(url, port, requestType, contentType, username, password);
+			}
+			else
+			{
+				OnStringChange(string.Format("Invalid URL {0}", url), 0, GenericRESTfulConstants.ErrorStringChange);
+			}
+		}
+
+			/// <summary>
+		/// Private HTTP submit request
+		/// </summary>
+		/// <param name="url"></param>
+		/// <param name="port"></param>
+		/// <param name="requestType"></param>
+        /// <param name="contentType"></param>
+		/// <param name="username"></param>
+		/// <param name="password"></param>
+		private void SubmitRequestHttp(string url, ushort port, ushort requestType, string contentType, string username, string password)
+		{
+			try
+			{
+				HttpClient client = new HttpClient();
+				HttpClientRequest request = new HttpClientRequest();
+				HttpClientResponse response;
+
+				client.KeepAlive = false;
+				
+				if(port >= 1 || port <= 65535)
+					client.Port = port;
+				else
+					client.Port = 80;
+
+				var authorization = "";
+				if (!string.IsNullOrEmpty(username))
+					authorization = EncodeBase64(username, password);
+
+				if (!string.IsNullOrEmpty(authorization))
+					request.Header.SetHeaderValue("Authorization", authorization);
+
+				if (!string.IsNullOrEmpty(contentType))
+					request.Header.ContentType = contentType;
+
+				request.Url.Parse(url);
+				request.RequestType = (Crestron.SimplSharp.Net.Http.RequestType)requestType;
+				
+				response = client.Dispatch(request);
+
+				CrestronConsole.PrintLine(string.Format("SubmitRequestHttp Response[{0}]: {1}", response.Code, response.ContentString.ToString()));				
+
+				if (!string.IsNullOrEmpty(response.ContentString.ToString()))
+					OnStringChange(response.ContentString.ToString(), 0, GenericRESTfulConstants.ResponseStringChange);
+
+				if (response.Code > 0)
+					OnUshrtChange((ushort)response.Code, 0, GenericRESTfulConstants.ResponseCodeChange);
+			}
+			catch (Exception e)
+			{
+				//var msg = string.Format("SubmitRequestHttp({0}, {1}, {2}) failed:{3}", url, port, requestType, e.Message);
+				//CrestronConsole.PrintLine(msg);
+				//ErrorLog.Error(msg);
+
+				CrestronConsole.PrintLine(e.Message);
+				OnStringChange(e.Message, 0, GenericRESTfulConstants.ErrorStringChange);				
+			}
+		}
+
+		/// <summary>
+		/// Private HTTPS submit request
+		/// </summary>
+		/// <param name="url"></param>
+		/// <param name="port"></param>
+		/// <param name="requestType"></param>
+        /// <param name="contentType"></param>
+		/// <param name="username"></param>
+		/// <param name="password"></param>
+		private void SubmitRequestHttps(string url, ushort port, ushort requestType, string contentType, string username, string password)
+		{
+			try
+			{
+				HttpsClient client = new HttpsClient();
+				HttpsClientRequest request = new HttpsClientRequest();
+				HttpsClientResponse response;
+
+				client.KeepAlive = false;
+				client.HostVerification = false;
+				client.PeerVerification = false;				
+
+				var authorization = "";
+				if (!string.IsNullOrEmpty(username))
+					authorization = EncodeBase64(username, password);
+
+				if (!string.IsNullOrEmpty(authorization))
+					request.Header.SetHeaderValue("Authorization", authorization);
+
+				if (!string.IsNullOrEmpty(contentType))
+					request.Header.ContentType = contentType;
+
+				request.Url.Parse(url);
+				request.RequestType = (Crestron.SimplSharp.Net.Https.RequestType)requestType;
+				
+				response = client.Dispatch(request);
+
+				CrestronConsole.PrintLine(string.Format("SubmitRequestHttp Response[{0}]: {1}", response.Code, response.ContentString.ToString()));
+
+				if(!string.IsNullOrEmpty(response.ContentString.ToString()))
+					OnStringChange(response.ContentString.ToString(), 0, GenericRESTfulConstants.ResponseStringChange);
+
+				if(response.Code > 0)
+					OnUshrtChange((ushort)response.Code, 0, GenericRESTfulConstants.ResponseCodeChange);
+				
+			}
+			catch (Exception e)
+			{
+				//var msg = string.Format("SubmitRequestHttps({0}, {1}, {2}, {3}, {4}) failed:{5}", url, port, requestType, username, password, e.Message);
+				//CrestronConsole.PrintLine(msg);
+				//ErrorLog.Error(msg);
+
+				CrestronConsole.PrintLine(e.Message);
+				OnStringChange(e.Message, 0, GenericRESTfulConstants.ErrorStringChange);
+			}
+		}
+
+		/// <summary>
+		/// Private method to encode username and password to Base64 string
+		/// </summary>
+		/// <param name="username"></param>
+		/// <param name="password"></param>
+		/// <returns>authorization</returns>
+		private string EncodeBase64(string username, string password)
+		{
+			var authorization = "";
+
+			try
+			{
+				if (!string.IsNullOrEmpty(username))
+				{
+					string base64String = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(string.Format("{0}:{1}", username, password)));
+					authorization = string.Format("Basic {0}", base64String);
+				}
+			}
+			catch (Exception e)
+			{
+				var msg = string.Format("EncodeBase64({0}, {1}) failed:\r{2}", username, password, e);
+				CrestronConsole.PrintLine(msg);
+				ErrorLog.Error(msg);
+				return "" ;
+			}
+
+			return authorization;
+		}
+
+		/// <summary>
+		/// Protected method to handle boolean change events
+		/// </summary>
+		/// <param name="state"></param>
+		/// <param name="index"></param>
+		/// <param name="type"></param>
+		protected void OnBoolChange(bool state, ushort index, ushort type)
+		{
+			var handler = BoolChange;
+			if (handler != null)
+			{
+				var args = new BoolChangeEventArgs(state, type);
+				args.Index = index;
+				BoolChange(this, args);
+			}
+		}
+
+		/// <summary>
+		/// Protected mehtod to handle ushort change events
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="index"></param>
+		/// <param name="type"></param>
+		protected void OnUshrtChange(ushort value, ushort index, ushort type)
+		{
+			var handler = UshrtChange;
+			if (handler != null)
+			{
+				var args = new UshrtChangeEventArgs(value, type);
+				args.Index = index;
+				UshrtChange(this, args);
+			}
+		}
+
+		/// <summary>
+		/// Protected method to handle string change events
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="index"></param>
+		/// <param name="type"></param>
+		protected void OnStringChange(string value, ushort index, ushort type)
+		{
+			var handler = StringChange;
+			if (handler != null)
+			{
+				var args = new StringChangeEventArgs(value, type);
+				args.Index = index;
+				StringChange(this, args);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Core.JsonStandardObjects
+{
+	/// <summary>
+	/// Constants for simpl modules
+	/// </summary>
+	public class JsonStandardDeviceConstants
+	{
+		/// <summary>
+		/// Json object evaluated constant
+		/// </summary>
+		public const ushort JsonObjectEvaluated = 2;
+
+		/// <summary>
+		/// Json object changed constant
+		/// </summary>
+		public const ushort JsonObjectChanged = 104;
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class DeviceChangeEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Device change event args object
+		/// </summary>
+		public DeviceConfig Device { get; set; }
+
+		/// <summary>
+		/// Device change event args type
+		/// </summary>
+		public ushort Type { get; set; }
+
+		/// <summary>
+		/// Device change event args index
+		/// </summary>
+		public ushort Index { get; set; }
+
+		/// <summary>
+		/// Default constructor
+		/// </summary>
+		public DeviceChangeEventArgs()
+		{
+
+		}
+
+		/// <summary>
+		/// Constructor overload
+		/// </summary>
+		/// <param name="device"></param>
+		/// <param name="type"></param>
+		public DeviceChangeEventArgs(DeviceConfig device, ushort type)
+		{
+			Device = device;
+			Type = type;
+		}
+
+		/// <summary>
+		/// Constructor overload
+		/// </summary>
+		/// <param name="device"></param>
+		/// <param name="type"></param>
+		/// <param name="index"></param>
+		public DeviceChangeEventArgs(DeviceConfig device, ushort type, ushort index)
+		{
+			Device = device;
+			Type = type;
+			Index = index;
+		}
+	}
+}

src/PepperDash.Core/JsonStandardObjects/JsonToSimplDevice.cs

@@ -0,0 +1,183 @@
+using System;
+using System.Linq;
+using Crestron.SimplSharp;
+using PepperDash.Core.JsonToSimpl;
+using Serilog.Events;
+
+namespace PepperDash.Core.JsonStandardObjects
+{
+	/// <summary>
+	/// Device class
+	/// </summary>
+	public class DeviceConfig
+	{		
+		/// <summary>
+		/// JSON config key property
+		/// </summary>
+		public string key { get; set; }
+		/// <summary>
+		/// JSON config name property
+		/// </summary>
+		public string name { get; set; }
+		/// <summary>
+		/// JSON config type property
+		/// </summary>
+		public string type { get; set; }
+		/// <summary>
+		/// JSON config properties 
+		/// </summary>
+		public PropertiesConfig properties { get; set; }
+
+		/// <summary>
+		/// Bool change event handler
+		/// </summary>
+		public event EventHandler<BoolChangeEventArgs> BoolChange;
+		/// <summary>
+		/// Ushort change event handler
+		/// </summary>
+		public event EventHandler<UshrtChangeEventArgs> UshrtChange;
+		/// <summary>
+		/// String change event handler
+		/// </summary>
+		public event EventHandler<StringChangeEventArgs> StringChange;
+		/// <summary>
+		/// Object change event handler
+		/// </summary>
+		public event EventHandler<DeviceChangeEventArgs> DeviceChange;
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public DeviceConfig()
+		{
+			properties = new PropertiesConfig();
+		}
+
+		/// <summary>
+		/// Initialize method
+		/// </summary>
+		/// <param name="uniqueID"></param>
+		/// <param name="deviceKey"></param>
+		public void Initialize(string uniqueID, string deviceKey)
+		{
+			// S+ set EvaluateFb low
+			OnBoolChange(false, 0, JsonStandardDeviceConstants.JsonObjectEvaluated);
+			// validate parameters
+			if (string.IsNullOrEmpty(uniqueID) || string.IsNullOrEmpty(deviceKey))
+			{
+				Debug.LogMessage(LogEventLevel.Debug, "UniqueID ({0} or key ({1} is null or empty", uniqueID, deviceKey);
+				// S+ set EvaluteFb high
+				OnBoolChange(true, 0, JsonStandardDeviceConstants.JsonObjectEvaluated);
+				return;
+			}
+
+			key = deviceKey;
+
+			try
+			{
+				// get the file using the unique ID
+				JsonToSimplMaster jsonMaster = J2SGlobal.GetMasterByFile(uniqueID);
+				if (jsonMaster == null)
+				{
+					Debug.LogMessage(LogEventLevel.Debug, "Could not find JSON file with uniqueID {0}", uniqueID);
+					return;
+				}
+
+				// get the device configuration using the key
+				var devices = jsonMaster.JsonObject.ToObject<RootObject>().devices;
+				var device = devices.FirstOrDefault(d => d.key.Equals(key));
+				if (device == null)
+				{
+					Debug.LogMessage(LogEventLevel.Debug, "Could not find device with key {0}", key);
+					return;
+				}
+				OnObjectChange(device, 0, JsonStandardDeviceConstants.JsonObjectChanged);
+
+				var index = devices.IndexOf(device);
+				OnStringChange(string.Format("devices[{0}]", index), 0, JsonToSimplConstants.FullPathToArrayChange);
+			}
+			catch (Exception e)
+			{
+				var msg = string.Format("Device {0} lookup failed:\r{1}", key, e);
+				CrestronConsole.PrintLine(msg);
+				ErrorLog.Error(msg);
+			}
+			finally
+			{
+				// S+ set EvaluteFb high
+				OnBoolChange(true, 0, JsonStandardDeviceConstants.JsonObjectEvaluated);
+			}
+		}
+
+		#region EventHandler Helpers
+
+		/// <summary>
+		/// BoolChange event handler helper
+		/// </summary>
+		/// <param name="state"></param>
+		/// <param name="index"></param>
+		/// <param name="type"></param>
+		protected void OnBoolChange(bool state, ushort index, ushort type)
+		{
+			var handler = BoolChange;
+			if (handler != null)
+			{
+				var args = new BoolChangeEventArgs(state, type);
+				args.Index = index;
+				BoolChange(this, args);
+			}
+		}
+
+		/// <summary>
+		/// UshrtChange event handler helper
+		/// </summary>
+		/// <param name="state"></param>
+		/// <param name="index"></param>
+		/// <param name="type"></param>
+		protected void OnUshrtChange(ushort state, ushort index, ushort type)
+		{
+			var handler = UshrtChange;
+			if (handler != null)
+			{
+				var args = new UshrtChangeEventArgs(state, type);
+				args.Index = index;
+				UshrtChange(this, args);
+			}
+		}
+
+		/// <summary>
+		/// StringChange event handler helper
+		/// </summary>
+		/// <param name="value"></param>
+		/// <param name="index"></param>
+		/// <param name="type"></param>
+		protected void OnStringChange(string value, ushort index, ushort type)
+		{
+			var handler = StringChange;
+			if (handler != null)
+			{
+				var args = new StringChangeEventArgs(value, type);
+				args.Index = index;
+				StringChange(this, args);
+			}
+		}
+
+		/// <summary>
+		/// ObjectChange event handler helper
+		/// </summary>
+		/// <param name="device"></param>
+		/// <param name="index"></param>
+		/// <param name="type"></param>
+		protected void OnObjectChange(DeviceConfig device, ushort index, ushort type)
+		{
+			if (DeviceChange != null)
+			{
+				var args = new DeviceChangeEventArgs(device, type);
+				args.Index = index;
+				DeviceChange(this, args);
+			}
+		}
+
+		#endregion EventHandler Helpers
+	}
+}

src/PepperDash.Core/JsonStandardObjects/JsonToSimplDeviceConfig.cs

@@ -0,0 +1,257 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Core.JsonStandardObjects
+{
+	/*
+	Convert JSON snippt to C#: http://json2csharp.com/#
+	
+	JSON Snippet:
+	{
+		"devices": [
+			{
+				"key": "deviceKey",
+				"name": "deviceName",
+				"type": "deviceType",
+				"properties": {
+					"deviceId": 1,
+					"enabled": true,
+					"control": {
+						"method": "methodName",
+						"controlPortDevKey": "deviceControlPortDevKey",
+						"controlPortNumber": 1,
+						"comParams": {
+							"baudRate": 9600,
+							"dataBits": 8,
+							"stopBits": 1,
+							"parity": "None",
+							"protocol": "RS232",
+							"hardwareHandshake": "None",
+							"softwareHandshake": "None",
+							"pacing": 0
+						},
+						"tcpSshProperties": {
+							"address": "172.22.1.101",
+							"port": 23,
+							"username": "user01",
+							"password": "password01",
+							"autoReconnect": false,
+							"autoReconnectIntervalMs": 10000
+						}
+					}
+				}
+			}
+		]
+	}
+	*/
+	/// <summary>
+	/// Device communication parameter class
+	/// </summary>
+	public class ComParamsConfig
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public int baudRate { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public int dataBits { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public int stopBits { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string parity { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string protocol { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string hardwareHandshake { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string softwareHandshake { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public int pacing { get; set; }
+
+		// convert properties for simpl
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplBaudRate { get { return Convert.ToUInt16(baudRate); } }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplDataBits { get { return Convert.ToUInt16(dataBits); } }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplStopBits { get { return Convert.ToUInt16(stopBits); } }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplPacing { get { return Convert.ToUInt16(pacing); } }
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public ComParamsConfig()
+		{
+
+		}
+	}
+
+	/// <summary>
+	/// Device TCP/SSH properties class
+	/// </summary>
+	public class TcpSshPropertiesConfig
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public string address { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public int port { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string username { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string password { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public bool autoReconnect { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public int autoReconnectIntervalMs { get; set; }
+
+		// convert properties for simpl
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplPort { get { return Convert.ToUInt16(port); } }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplAutoReconnect { get { return (ushort)(autoReconnect ? 1 : 0); } }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplAutoReconnectIntervalMs { get { return Convert.ToUInt16(autoReconnectIntervalMs); } }
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public TcpSshPropertiesConfig()
+		{
+
+		}
+	}
+
+	/// <summary>
+	/// Device control class
+	/// </summary>
+	public class ControlConfig
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public string method { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string controlPortDevKey { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public int controlPortNumber { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ComParamsConfig comParams { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public TcpSshPropertiesConfig tcpSshProperties { get; set; }
+
+		// convert properties for simpl
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplControlPortNumber { get { return Convert.ToUInt16(controlPortNumber); } }
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public ControlConfig()
+		{
+			comParams = new ComParamsConfig();
+			tcpSshProperties = new TcpSshPropertiesConfig();
+		}
+	}
+
+	/// <summary>
+	/// Device properties class
+	/// </summary>
+	public class PropertiesConfig
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public int deviceId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public bool enabled { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ControlConfig control { get; set; }
+
+		// convert properties for simpl
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplDeviceId { get { return Convert.ToUInt16(deviceId); } }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort simplEnabled { get { return (ushort)(enabled ? 1 : 0); } }
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		public PropertiesConfig()
+		{
+			control = new ControlConfig();
+		}
+	}
+
+	/// <summary>
+	/// Root device class
+	/// </summary>
+	public class RootObject
+	{
+        /// <summary>
+        /// The collection of devices
+        /// </summary>
+		public List<DeviceConfig> devices { get; set; }
+	}
+}

src/PepperDash.Core/JsonToSimpl/Constants.cs

@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Core.JsonToSimpl
+{
+	/// <summary>
+	/// Constants for Simpl modules
+	/// </summary>
+	public class JsonToSimplConstants
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public const ushort BoolValueChange = 1;
+        /// <summary>
+        /// 
+        /// </summary>
+		public const ushort JsonIsValidBoolChange = 2;
+
+        /// <summary>
+        /// Reports the if the device is 3-series compatible
+        /// </summary>
+        public const ushort ProgramCompatibility3SeriesChange = 3;
+
+        /// <summary>
+        /// Reports the if the device is 4-series compatible
+        /// </summary>
+        public const ushort ProgramCompatibility4SeriesChange = 4;
+
+        /// <summary>
+        /// Reports the device platform enum value
+        /// </summary>
+        public const ushort DevicePlatformValueChange = 5;
+
+        /// <summary>
+        /// 
+        /// </summary>
+		public const ushort UshortValueChange = 101;        
+		
+        /// <summary>
+        /// 
+        /// </summary>
+		public const ushort StringValueChange = 201;
+        /// <summary>
+        /// 
+        /// </summary>
+		public const ushort FullPathToArrayChange = 202;
+        /// <summary>
+        /// 
+        /// </summary>
+		public const ushort ActualFilePathChange = 203;
+
+        /// <summary>
+        /// 
+        /// </summary>
+		public const ushort FilenameResolvedChange = 204;
+        /// <summary>
+        /// 
+        /// </summary>
+		public const ushort FilePathResolvedChange = 205;
+
+        /// <summary>
+        /// Reports the root directory change
+        /// </summary>
+        public const ushort RootDirectoryChange = 206;
+
+        /// <summary>
+        /// Reports the room ID change
+        /// </summary>
+        public const ushort RoomIdChange = 207;
+
+        /// <summary>
+        /// Reports the room name change
+        /// </summary>
+        public const ushort RoomNameChange = 208;
+	}
+
+	/// <summary>
+	/// S+ values delegate
+	/// </summary>
+	public delegate void SPlusValuesDelegate();
+
+	/// <summary>
+	/// S+ values wrapper
+	/// </summary>
+	public class SPlusValueWrapper
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public SPlusType ValueType { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort Index { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public ushort BoolUShortValue { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string StringValue { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+		public SPlusValueWrapper() {}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="index"></param>
+		public SPlusValueWrapper(SPlusType type, ushort index)
+		{
+			ValueType = type;
+			Index = index;
+		}
+	}
+
+	/// <summary>
+	/// S+ types enum
+	/// </summary>
+	public enum SPlusType
+	{
+        /// <summary>
+        /// Digital
+        /// </summary>
+		Digital, 
+        /// <summary>
+        /// Analog
+        /// </summary>
+        Analog, 
+        /// <summary>
+        /// String
+        /// </summary>
+        String
+	}
+}

src/PepperDash.Core/JsonToSimpl/Global.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Serilog.Events;
+
+//using PepperDash.Core;
+
+namespace PepperDash.Core.JsonToSimpl
+{
+    /// <summary>
+    /// The global class to manage all the instances of JsonToSimplMaster 
+    /// </summary>
+	public class J2SGlobal
+	{
+		static List<JsonToSimplMaster> Masters = new List<JsonToSimplMaster>();
+
+
+		/// <summary>
+		/// Adds a file master.  If the master's key or filename is equivalent to any existing 
+		/// master, this will fail
+		/// </summary>
+		/// <param name="master">New master to add</param>
+        /// 
+		public static void AddMaster(JsonToSimplMaster master)
+		{
+			if (master == null)
+				throw new ArgumentNullException("master");
+
+			if (string.IsNullOrEmpty(master.UniqueID))
+				throw new InvalidOperationException("JSON Master cannot be added with a null UniqueId");
+			
+			Debug.LogMessage(LogEventLevel.Debug, "JSON Global adding master {0}", master.UniqueID);
+
+			if (Masters.Contains(master)) return;
+
+			var existing = Masters.FirstOrDefault(m =>
+				m.UniqueID.Equals(master.UniqueID, StringComparison.OrdinalIgnoreCase));
+			if (existing == null)
+			{
+				Masters.Add(master);
+			}
+			else
+			{
+				var msg = string.Format("Cannot add JSON Master with unique ID '{0}'.\rID is already in use on another master.", master.UniqueID);
+				CrestronConsole.PrintLine(msg);
+				ErrorLog.Warn(msg);
+			}
+		}
+
+		/// <summary>
+		/// Gets a master by its key.  Case-insensitive
+		/// </summary>
+		public static JsonToSimplMaster GetMasterByFile(string file)
+		{
+			return Masters.FirstOrDefault(m => m.UniqueID.Equals(file, StringComparison.OrdinalIgnoreCase));
+		}
+	}
+}

src/PepperDash.Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs

@@ -0,0 +1,162 @@
+using System;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+using Serilog.Events;
+
+namespace PepperDash.Core.JsonToSimpl
+{
+    /// <summary>
+    /// Used to interact with an array of values with the S+ modules
+    /// </summary>
+	public class JsonToSimplArrayLookupChild : JsonToSimplChildObjectBase
+	{
+        /// <summary>
+        /// 
+        /// </summary>
+		public string SearchPropertyName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+		public string SearchPropertyValue { get; set; }
+
+		int ArrayIndex;
+
+		/// <summary>
+		/// For gt2.4.1 array lookups
+		/// </summary>
+		/// <param name="file"></param>
+		/// <param name="key"></param>
+		/// <param name="pathPrefix"></param>
+		/// <param name="pathSuffix"></param>
+		/// <param name="searchPropertyName"></param>
+		/// <param name="searchPropertyValue"></param>
+		public void Initialize(string file, string key, string pathPrefix, string pathSuffix,
+			string searchPropertyName, string searchPropertyValue)
+		{
+			base.Initialize(file, key, pathPrefix, pathSuffix);
+			SearchPropertyName = searchPropertyName;
+			SearchPropertyValue = searchPropertyValue;
+		}
+
+
+		/// <summary>
+		/// For newer >=2.4.1 array lookups. 
+		/// </summary>
+		/// <param name="file"></param>
+		/// <param name="key"></param>
+		/// <param name="pathPrefix"></param>
+		/// <param name="pathAppend"></param>
+		/// <param name="pathSuffix"></param>
+		/// <param name="searchPropertyName"></param>
+		/// <param name="searchPropertyValue"></param>
+		public void InitializeWithAppend(string file, string key, string pathPrefix, string pathAppend,
+			string pathSuffix, string searchPropertyName, string searchPropertyValue)
+		{
+			string pathPrefixWithAppend = (pathPrefix != null ? pathPrefix : "") + GetPathAppend(pathAppend);
+			base.Initialize(file, key, pathPrefixWithAppend, pathSuffix);
+
+			SearchPropertyName = searchPropertyName;
+			SearchPropertyValue = searchPropertyValue;
+		}
+
+
+
+		//PathPrefix+ArrayName+[x]+path+PathSuffix
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="path"></param>
+		/// <returns></returns>
+		protected override string GetFullPath(string path)
+		{
+			return string.Format("{0}[{1}].{2}{3}",
+				PathPrefix == null ? "" : PathPrefix,
+				ArrayIndex,
+				path,
+				PathSuffix == null ? "" : PathSuffix);
+		}
+
+        /// <summary>
+        /// Process all values
+        /// </summary>
+		public override void ProcessAll()
+		{
+			if (FindInArray())
+				base.ProcessAll();
+		}
+
+		/// <summary>
+		/// Provides the path append for GetFullPath
+		/// </summary>
+		/// <returns></returns>
+		string GetPathAppend(string a)
+		{
+			if (string.IsNullOrEmpty(a))
+			{
+				return "";
+			}
+			if (a.StartsWith("."))
+			{
+				return a;
+			}
+			else
+			{
+				return "." + a;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <returns></returns>
+		bool FindInArray()
+		{
+			if (Master == null)
+				throw new InvalidOperationException("Cannot do operations before master is linked");
+			if (Master.JsonObject == null)
+				throw new InvalidOperationException("Cannot do operations before master JSON has read");
+			if (PathPrefix == null)
+				throw new InvalidOperationException("Cannot do operations before PathPrefix is set");
+
+
+			var token = Master.JsonObject.SelectToken(PathPrefix);
+			if (token is JArray)
+			{
+				var array = token as JArray;
+				try
+				{
+					var item = array.FirstOrDefault(o =>
+					{
+						var prop = o[SearchPropertyName];
+						return prop != null && prop.Value<string>()
+						.Equals(SearchPropertyValue, StringComparison.OrdinalIgnoreCase);
+					});
+					if (item == null)
+					{
+						Debug.LogMessage(LogEventLevel.Debug,"JSON Child[{0}] Array '{1}' '{2}={3}' not found: ", Key,
+							PathPrefix, SearchPropertyName, SearchPropertyValue);
+						this.LinkedToObject = false;
+						return false;
+					}
+
+					this.LinkedToObject = true;
+					ArrayIndex = array.IndexOf(item);
+					OnStringChange(string.Format("{0}[{1}]", PathPrefix, ArrayIndex), 0, JsonToSimplConstants.FullPathToArrayChange);
+					Debug.LogMessage(LogEventLevel.Debug, "JSON Child[{0}] Found array match at index {1}", Key, ArrayIndex);
+					return true;
+				}
+				catch (Exception e)
+				{
+					Debug.LogMessage(e, "JSON Child[{key}] Array '{pathPrefix}' lookup error: '{searchPropertyName}={searchPropertyValue}'", null, Key,
+						PathPrefix, SearchPropertyName, SearchPropertyValue, e);
+				}
+			}
+			else
+			{
+				Debug.LogMessage(LogEventLevel.Debug, "JSON Child[{0}] Path '{1}' is not an array", Key, PathPrefix);
+			}
+
+			return false;
+		}
+	}
+}

src/PepperDash.Core/JsonToSimpl/JsonToSimplChildObjectBase.cs

@@ -0,0 +1,404 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+
+namespace PepperDash.Core.JsonToSimpl
+{
+    /// <summary>
+    /// Base class for JSON objects
+    /// </summary>
+	public abstract class JsonToSimplChildObjectBase : IKeyed
+	{
+        /// <summary>
+        /// Notifies of bool change
+        /// </summary>
+		public event EventHandler<BoolChangeEventArgs> BoolChange;
+        /// <summary>
+        /// Notifies of ushort change
+        /// </summary>
+		public event EventHandler<UshrtChangeEventArgs> UShortChange;
+        /// <summary>
+        /// Notifies of string change
+        /// </summary>
+		public event EventHandler<StringChangeEventArgs> StringChange;
+
+        /// <summary>
+        /// Delegate to get all values
+        /// </summary>
+		public SPlusValuesDelegate GetAllValuesDelegate { get; set; }
+
+		/// <summary>
+		/// Use a callback to reduce task switch/threading
+		/// </summary>
+		public SPlusValuesDelegate SetAllPathsDelegate { get; set; }
+
+        /// <summary>
+        /// Unique identifier for instance
+        /// </summary>
+		public string Key { get; protected set; }
+
+		/// <summary>
+		/// This will be prepended to all paths to allow path swapping or for more organized
+		/// sub-paths
+		/// </summary>
+		public string PathPrefix { get; protected set; }
+
+		/// <summary>
+		/// This is added to the end of all paths
+		/// </summary>
+		public string PathSuffix { get; protected set; }
+
+        /// <summary>
+        /// Indicates if the instance is linked to an object
+        /// </summary>
+		public bool LinkedToObject { get; protected set; }
+
+        /// <summary>
+        /// Reference to Master instance
+        /// </summary>
+		protected JsonToSimplMaster Master;
+
+        /// <summary>
+        /// Paths to boolean values in JSON structure
+        /// </summary>
+        protected Dictionary<ushort, string> BoolPaths = new Dictionary<ushort, string>();
+        /// <summary>
+        /// Paths to numeric values in JSON structure
+        /// </summary>
+		protected Dictionary<ushort, string> UshortPaths = new Dictionary<ushort, string>();
+        /// <summary>
+        /// Paths to string values in JSON structure
+        /// </summary>
+		protected Dictionary<ushort, string> StringPaths = new Dictionary<ushort, string>();
+
+		/// <summary>
+		/// Call this before doing anything else
+		/// </summary>
+        /// <param name="masterUniqueId"></param>
+		/// <param name="key"></param>
+		/// <param name="pathPrefix"></param>
+		/// <param name="pathSuffix"></param>
+		public void Initialize(string masterUniqueId, string key, string pathPrefix, string pathSuffix)
+		{
+			Key = key;
+			PathPrefix = pathPrefix;
+			PathSuffix = pathSuffix;
+
+			Master = J2SGlobal.GetMasterByFile(masterUniqueId);
+			if (Master != null)
+				Master.AddChild(this);
+			else
+				Debug.Console(1, "JSON Child [{0}] cannot link to master {1}", key, masterUniqueId);
+		}
+
+        /// <summary>
+        /// Sets the path prefix for the object
+        /// </summary>
+        /// <param name="pathPrefix"></param>
+		public void SetPathPrefix(string pathPrefix)
+		{
+			PathPrefix = pathPrefix;
+		}
+		/// <summary>
+		/// Set the JPath to evaluate for a given bool out index.
+		/// </summary>
+		public void SetBoolPath(ushort index, string path)
+		{
+			Debug.Console(1, "JSON Child[{0}] SetBoolPath {1}={2}", Key, index, path);
+			if (path == null || path.Trim() == string.Empty) return;
+			BoolPaths[index] = path;
+		}
+
+		/// <summary>
+		/// Set the JPath for a ushort out index.
+		/// </summary>
+		public void SetUshortPath(ushort index, string path)
+		{
+			Debug.Console(1, "JSON Child[{0}] SetUshortPath {1}={2}", Key, index, path);
+			if (path == null || path.Trim() == string.Empty) return;
+			UshortPaths[index] = path;
+		}
+
+		/// <summary>
+		/// Set the JPath for a string output index. 
+		/// </summary>
+		public void SetStringPath(ushort index, string path)
+		{
+			Debug.Console(1, "JSON Child[{0}] SetStringPath {1}={2}", Key, index, path);
+			if (path == null || path.Trim() == string.Empty) return;
+			StringPaths[index] = path;
+		}
+
+		/// <summary>
+		/// Evalutates all outputs with defined paths. called by S+ when paths are ready to process
+		/// and by Master when file is read.
+		/// </summary>
+		public virtual void ProcessAll()
+		{
+			if (!LinkedToObject)
+			{
+				Debug.Console(1, this, "Not linked to object in file.  Skipping");
+				return;
+			}
+
+			if (SetAllPathsDelegate == null)
+			{
+				Debug.Console(1, this, "No SetAllPathsDelegate set. Ignoring ProcessAll");
+				return;
+			}
+			SetAllPathsDelegate();
+			foreach (var kvp in BoolPaths)
+				ProcessBoolPath(kvp.Key);
+			foreach (var kvp in UshortPaths)
+				ProcessUshortPath(kvp.Key);
+			foreach (var kvp in StringPaths)
+				ProcessStringPath(kvp.Key);
+		}
+
+		/// <summary>
+		/// Processes a bool property, converting to bool, firing off a BoolChange event
+		/// </summary>
+		void ProcessBoolPath(ushort index)
+		{
+			string response;
+			if (Process(BoolPaths[index], out response))
+				OnBoolChange(response.Equals("true", StringComparison.OrdinalIgnoreCase),
+					index, JsonToSimplConstants.BoolValueChange);
+			else { }
+			// OnBoolChange(false, index, JsonToSimplConstants.BoolValueChange);
+		}
+
+		// Processes the path to a ushort, converting to ushort if able, twos complement if necessary, firing off UshrtChange event
+        void ProcessUshortPath(ushort index) {
+            string response;
+            if (Process(UshortPaths[index], out response)) {
+                ushort val;
+                try { val = Convert.ToInt32(response) < 0 ? (ushort)(Convert.ToInt16(response) + 65536) : Convert.ToUInt16(response); }
+                catch { val = 0; }
+
+                OnUShortChange(val, index, JsonToSimplConstants.UshortValueChange);
+            }
+            else { }
+            // OnUShortChange(0, index, JsonToSimplConstants.UshortValueChange);
+        }
+
+		// Processes the path to a string property and fires of a StringChange event.
+		void ProcessStringPath(ushort index)
+		{
+			string response;
+			if (Process(StringPaths[index], out response))
+				OnStringChange(response, index, JsonToSimplConstants.StringValueChange);
+			else { }
+			// OnStringChange("", index, JsonToSimplConstants.StringValueChange);
+		}
+
+		/// <summary>
+		/// Processes the given path. 
+		/// </summary>
+		/// <param name="path">JPath formatted path to the desired property</param>
+		/// <param name="response">The string value of the property, or a default value if it 
+		/// doesn't exist</param>
+		/// <returns> This will return false in the case that EvaulateAllOnJsonChange
+		/// is false and the path does not evaluate to a property in the incoming JSON. </returns>
+		bool Process(string path, out string response)
+		{
+			path = GetFullPath(path);
+			Debug.Console(1, "JSON Child[{0}] Processing {1}", Key, path);
+			response = "";
+			if (Master == null)
+			{
+				Debug.Console(1, "JSONChild[{0}] cannot process without Master attached", Key);
+				return false;
+			}
+
+			if (Master.JsonObject != null && path != string.Empty)
+			{
+				bool isCount = false;
+				path = path.Trim();
+				if (path.EndsWith(".Count"))
+				{
+					path = path.Remove(path.Length - 6, 6);
+					isCount = true;
+				}
+				try // Catch a strange cast error on a bad path
+				{
+					var t = Master.JsonObject.SelectToken(path);
+					if (t != null)
+					{
+						// return the count of children objects - if any
+						if (isCount)
+							response = (t.HasValues ? t.Children().Count() : 0).ToString();
+						else
+							response = t.Value<string>();
+						Debug.Console(1, "   ='{0}'", response);
+						return true;
+					}
+				}
+				catch
+				{
+					response = "";
+				}
+			}
+			// If the path isn't found, return this to determine whether to pass out the non-value or not.
+			return false;
+		}
+
+
+		//************************************************************************************************
+		// Save-related functions
+
+
+		/// <summary>
+		/// Called from Master to read inputs and update their values in master JObject
+		/// Callback should hit one of the following four methods
+		/// </summary>
+		public void UpdateInputsForMaster()
+		{
+			if (!LinkedToObject)
+			{
+				Debug.Console(1, this, "Not linked to object in file.  Skipping");
+				return;
+			}
+
+			if (SetAllPathsDelegate == null)
+			{
+				Debug.Console(1, this, "No SetAllPathsDelegate set. Ignoring UpdateInputsForMaster");
+				return;
+			}
+			SetAllPathsDelegate();
+			var del = GetAllValuesDelegate;
+			if (del != null)
+				GetAllValuesDelegate();
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="theValue"></param>
+		public void USetBoolValue(ushort key, ushort theValue)
+		{
+			SetBoolValue(key, theValue == 1);
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="theValue"></param>
+		public void SetBoolValue(ushort key, bool theValue)
+		{
+			if (BoolPaths.ContainsKey(key))
+				SetValueOnMaster(BoolPaths[key], new JValue(theValue));
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="theValue"></param>
+		public void SetUShortValue(ushort key, ushort theValue)
+		{
+			if (UshortPaths.ContainsKey(key))
+				SetValueOnMaster(UshortPaths[key], new JValue(theValue));
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="theValue"></param>
+		public void SetStringValue(ushort key, string theValue)
+		{
+			if (StringPaths.ContainsKey(key))
+				SetValueOnMaster(StringPaths[key], new JValue(theValue));
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="keyPath"></param>
+        /// <param name="valueToSave"></param>
+		public void SetValueOnMaster(string keyPath, JValue valueToSave)
+		{
+			var path = GetFullPath(keyPath);
+			try
+			{
+				Debug.Console(1, "JSON Child[{0}] Queueing value on master {1}='{2}'", Key, path, valueToSave);
+
+				//var token = Master.JsonObject.SelectToken(path);
+				//if (token != null) // The path exists in the file
+				Master.AddUnsavedValue(path, valueToSave);
+			}
+			catch (Exception e)
+			{
+				Debug.Console(1, "JSON Child[{0}] Failed setting value for path '{1}'\r{2}", Key, path, e);
+			}
+		}
+
+		/// <summary>
+		/// Called during Process(...) to get the path to a given property. By default, 
+		/// returns PathPrefix+path+PathSuffix.  Override to change the way path is built.
+		/// </summary>
+		protected virtual string GetFullPath(string path)
+		{
+			return (PathPrefix != null ? PathPrefix : "") +
+				path + (PathSuffix != null ? PathSuffix : "");
+		}
+
+		// Helpers for events
+		//******************************************************************************************
+        /// <summary>
+        /// Event helper
+        /// </summary>
+        /// <param name="state"></param>
+        /// <param name="index"></param>
+        /// <param name="type"></param>
+		protected void OnBoolChange(bool state, ushort index, ushort type)
+		{
+			var handler = BoolChange;
+			if (handler != null)
+			{
+				var args = new BoolChangeEventArgs(state, type);
+				args.Index = index;
+				BoolChange(this, args);
+			}
+		}
+
+		//******************************************************************************************
+        /// <summary>
+        /// Event helper
+        /// </summary>
+        /// <param name="state"></param>
+        /// <param name="index"></param>
+        /// <param name="type"></param>
+		protected void OnUShortChange(ushort state, ushort index, ushort type)
+		{
+			var handler = UShortChange;
+			if (handler != null)
+			{
+				var args = new UshrtChangeEventArgs(state, type);
+				args.Index = index;
+				UShortChange(this, args);
+			}
+		}
+
+        /// <summary>
+        /// Event helper
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="index"></param>
+        /// <param name="type"></param>
+		protected void OnStringChange(string value, ushort index, ushort type)
+		{
+			var handler = StringChange;
+			if (handler != null)
+			{
+				var args = new StringChangeEventArgs(value, type);
+				args.Index = index;
+				StringChange(this, args);
+			}
+		}
+	}
+}

src/PepperDash.Core/JsonToSimpl/JsonToSimplFileMaster.cs

@@ -0,0 +1,289 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json.Linq;
+
+namespace PepperDash.Core.JsonToSimpl
+{
+    /// <summary>
+    /// Represents a JSON file that can be read and written to
+    /// </summary>
+    public class JsonToSimplFileMaster : JsonToSimplMaster
+    {
+        /// <summary>
+        ///  Sets the filepath as well as registers this with the Global.Masters list
+        /// </summary>
+        public string Filepath { get; private set; }
+
+        /// <summary>
+        /// Filepath to the actual file that will be read (Portal or local)
+        /// </summary>
+        public string ActualFilePath { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Filename { get; private set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string FilePathName { get; private set; }
+
+        /*****************************************************************************************/
+        /** Privates **/
+
+
+        // The JSON file in JObject form
+        // For gathering the incoming data
+        object StringBuilderLock = new object();
+        // To prevent multiple same-file access
+        static object FileLock = new object();
+
+        /*****************************************************************************************/
+
+        /// <summary>
+        /// SIMPL+ default constructor.
+        /// </summary>
+        public JsonToSimplFileMaster()
+        {
+        }
+
+        /// <summary>
+        /// Read, evaluate and udpate status
+        /// </summary>
+        public void EvaluateFile(string filepath)
+        {
+            try
+            {
+                OnBoolChange(false, 0, JsonToSimplConstants.JsonIsValidBoolChange);
+
+                var dirSeparator = Path.DirectorySeparatorChar;
+                var dirSeparatorAlt = Path.AltDirectorySeparatorChar;
+
+                var series = CrestronEnvironment.ProgramCompatibility;
+
+                var is3Series = (eCrestronSeries.Series3 == (series & eCrestronSeries.Series3));
+                OnBoolChange(is3Series, 0,
+                    JsonToSimplConstants.ProgramCompatibility3SeriesChange);
+
+                var is4Series = (eCrestronSeries.Series4 == (series & eCrestronSeries.Series4));
+                OnBoolChange(is4Series, 0,
+                    JsonToSimplConstants.ProgramCompatibility4SeriesChange);
+
+                var isServer = CrestronEnvironment.DevicePlatform == eDevicePlatform.Server;
+                OnBoolChange(isServer, 0,
+                    JsonToSimplConstants.DevicePlatformValueChange);
+
+                // get the roomID
+                var roomId = Crestron.SimplSharp.InitialParametersClass.RoomId;                
+                if (!string.IsNullOrEmpty(roomId))
+                {
+                    OnStringChange(roomId, 0, JsonToSimplConstants.RoomIdChange);
+                }
+
+                // get the roomName
+                var roomName = Crestron.SimplSharp.InitialParametersClass.RoomName;
+                if (!string.IsNullOrEmpty(roomName))
+                {
+                    OnStringChange(roomName, 0, JsonToSimplConstants.RoomNameChange);
+                }
+
+                var rootDirectory = Directory.GetApplicationRootDirectory();
+                OnStringChange(rootDirectory, 0, JsonToSimplConstants.RootDirectoryChange);                
+                
+                var splusPath = string.Empty;
+                if (Regex.IsMatch(filepath, @"user", RegexOptions.IgnoreCase))
+                {
+                    if (is4Series) 
+                        splusPath = Regex.Replace(filepath, "user", "user", RegexOptions.IgnoreCase);
+                    else if (isServer)
+                        splusPath = Regex.Replace(filepath, "user", "User", RegexOptions.IgnoreCase);
+                    else
+                        splusPath = filepath;
+                }
+
+                filepath = splusPath.Replace(dirSeparatorAlt, dirSeparator);
+                
+                Filepath = string.Format("{1}{0}{2}", dirSeparator, rootDirectory,
+                    filepath.TrimStart(dirSeparator, dirSeparatorAlt));
+                
+                OnStringChange(string.Format("Attempting to evaluate {0}", Filepath), 0, JsonToSimplConstants.StringValueChange);
+
+                if (string.IsNullOrEmpty(Filepath))
+                {
+                    OnStringChange(string.Format("Cannot evaluate file. JSON file path not set"), 0, JsonToSimplConstants.StringValueChange);
+                    CrestronConsole.PrintLine("Cannot evaluate file. JSON file path not set");
+                    return;
+                }
+
+                // get file directory and name to search
+                var fileDirectory = Path.GetDirectoryName(Filepath);
+                var fileName = Path.GetFileName(Filepath);
+
+                OnStringChange(string.Format("Checking '{0}' for '{1}'", fileDirectory, fileName), 0, JsonToSimplConstants.StringValueChange);
+                Debug.Console(1, "Checking '{0}' for '{1}'", fileDirectory, fileName);
+
+                if (Directory.Exists(fileDirectory))
+                {
+                    // get the directory info                    
+                    var directoryInfo = new DirectoryInfo(fileDirectory);                                       
+
+                    // get the file to be read
+                    var actualFile = directoryInfo.GetFiles(fileName).FirstOrDefault();                    
+                    if (actualFile == null)
+                    {
+                        var msg = string.Format("JSON file not found: {0}", Filepath);
+                        OnStringChange(msg, 0, JsonToSimplConstants.StringValueChange);
+                        CrestronConsole.PrintLine(msg);
+                        ErrorLog.Error(msg);
+                        return;
+                    }
+
+                    // \xSE\xR\PDT000-Template_Main_Config-Combined_DSP_v00.02.json
+                    // \USER\PDT000-Template_Main_Config-Combined_DSP_v00.02.json
+                    ActualFilePath = actualFile.FullName;                    
+                    OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
+                    OnStringChange(string.Format("Actual JSON file is {0}", ActualFilePath), 0, JsonToSimplConstants.StringValueChange);
+                    Debug.Console(1, "Actual JSON file is {0}", ActualFilePath);
+
+                    Filename = actualFile.Name;
+                    OnStringChange(Filename, 0, JsonToSimplConstants.FilenameResolvedChange);
+                    OnStringChange(string.Format("JSON Filename is {0}", Filename), 0, JsonToSimplConstants.StringValueChange);
+                    Debug.Console(1, "JSON Filename is {0}", Filename);
+
+
+                    FilePathName = string.Format(@"{0}{1}", actualFile.DirectoryName, dirSeparator);
+                    OnStringChange(string.Format(@"{0}", actualFile.DirectoryName), 0, JsonToSimplConstants.FilePathResolvedChange);
+                    OnStringChange(string.Format(@"JSON File Path is {0}", actualFile.DirectoryName), 0, JsonToSimplConstants.StringValueChange);
+                    Debug.Console(1, "JSON File Path is {0}", FilePathName);                    
+
+                    var json = File.ReadToEnd(ActualFilePath, System.Text.Encoding.ASCII);
+
+                    JsonObject = JObject.Parse(json);
+                    foreach (var child in Children)
+                        child.ProcessAll();
+
+                    OnBoolChange(true, 0, JsonToSimplConstants.JsonIsValidBoolChange);
+                }
+                else
+                {
+                    OnStringChange(string.Format("'{0}' not found", fileDirectory), 0, JsonToSimplConstants.StringValueChange);
+                    Debug.Console(1, "'{0}' not found", fileDirectory);
+                }
+            }
+            catch (Exception e)
+            {
+                var msg = string.Format("EvaluateFile Exception: Message\r{0}", e.Message);
+                OnStringChange(msg, 0, JsonToSimplConstants.StringValueChange);
+                CrestronConsole.PrintLine(msg);
+                ErrorLog.Error(msg);
+
+                var stackTrace = string.Format("EvaluateFile: Stack Trace\r{0}", e.StackTrace);
+                OnStringChange(stackTrace, 0, JsonToSimplConstants.StringValueChange);
+                CrestronConsole.PrintLine(stackTrace);
+                ErrorLog.Error(stackTrace);
+            }
+        }
+
+
+        /// <summary>
+        /// Sets the debug level
+        /// </summary>
+        /// <param name="level"></param>
+        public void setDebugLevel(uint level)
+        {
+            Debug.SetDebugLevel(level);
+        }
+
+        /// <summary>
+        /// Saves the values to the file
+        /// </summary>
+        public override void Save()
+        {
+            // this code is duplicated in the other masters!!!!!!!!!!!!!
+            UnsavedValues = new Dictionary<string, JValue>();
+            // Make each child update their values into master object
+            foreach (var child in Children)
+            {
+                Debug.Console(1, "Master [{0}] checking child [{1}] for updates to save", UniqueID, child.Key);
+                child.UpdateInputsForMaster();
+            }
+
+            if (UnsavedValues == null || UnsavedValues.Count == 0)
+            {
+                Debug.Console(1, "Master [{0}] No updated values to save. Skipping", UniqueID);
+                return;
+            }
+            lock (FileLock)
+            {
+                Debug.Console(1, "Saving");
+                foreach (var path in UnsavedValues.Keys)
+                {
+                    var tokenToReplace = JsonObject.SelectToken(path);
+                    if (tokenToReplace != null)
+                    {// It's found
+                        tokenToReplace.Replace(UnsavedValues[path]);
+                        Debug.Console(1, "JSON Master[{0}] Updating '{1}'", UniqueID, path);
+                    }
+                    else // No token.  Let's make one 
+                    {
+                        //http://stackoverflow.com/questions/17455052/how-to-set-the-value-of-a-json-path-using-json-net
+                        Debug.Console(1, "JSON Master[{0}] Cannot write value onto missing property: '{1}'", UniqueID, path);
+
+                        //                        JContainer jpart = JsonObject;
+                        //                        // walk down the path and find where it goes
+                        //#warning Does not handle arrays.
+                        //                        foreach (var part in path.Split('.'))
+                        //                        {
+
+                        //                            var openPos = part.IndexOf('[');
+                        //                            if (openPos > -1)
+                        //                            {
+                        //                                openPos++; // move to number
+                        //                                var closePos = part.IndexOf(']');
+                        //                                var arrayName = part.Substring(0, openPos - 1); // get the name
+                        //                                var index = Convert.ToInt32(part.Substring(openPos, closePos - openPos));
+
+                        //                                // Check if the array itself exists and add the item if so
+                        //                                if (jpart[arrayName] != null)
+                        //                                {
+                        //                                    var arrayObj = jpart[arrayName] as JArray;
+                        //                                    var item = arrayObj[index];
+                        //                                    if (item == null)
+                        //                                        arrayObj.Add(new JObject());
+                        //                                }
+
+                        //                                Debug.Console(0, "IGNORING MISSING ARRAY VALUE FOR NOW");
+                        //                                continue;
+                        //                            }
+                        //                            // Build the 
+                        //                            if (jpart[part] == null)
+                        //                                jpart.Add(new JProperty(part, new JObject()));
+                        //                            jpart = jpart[part] as JContainer;
+                        //                        }
+                        //                        jpart.Replace(UnsavedValues[path]);
+                    }
+                }
+                using (StreamWriter sw = new StreamWriter(ActualFilePath))
+                {
+                    try
+                    {
+                        sw.Write(JsonObject.ToString());
+                        sw.Flush();
+                    }
+                    catch (Exception e)
+                    {
+                        string err = string.Format("Error writing JSON file:\r{0}", e);
+                        Debug.Console(0, err);
+                        ErrorLog.Warn(err);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+}

src/PepperDash.Core/JsonToSimpl/JsonToSimplFixedPathObject.cs

@@ -0,0 +1,18 @@
+
+
+namespace PepperDash.Core.JsonToSimpl
+{
+    /// <summary>
+    /// 
+    /// </summary>
+	public class JsonToSimplFixedPathObject : JsonToSimplChildObjectBase
+	{
+        /// <summary>
+        /// Constructor
+        /// </summary>
+		public JsonToSimplFixedPathObject()
+		{
+			this.LinkedToObject = true;
+		}
+	}
+}

src/PepperDash.Core/JsonToSimpl/JsonToSimplGenericMaster.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharp;
+using Newtonsoft.Json.Linq;
+
+namespace PepperDash.Core.JsonToSimpl
+{
+    /// <summary>
+    /// Generic Master
+    /// </summary>
+	public class JsonToSimplGenericMaster : JsonToSimplMaster
+    {
+		/*****************************************************************************************/
+		/** Privates **/
+
+        
+		// The JSON file in JObject form
+		// For gathering the incoming data
+		object StringBuilderLock = new object();
+		// To prevent multiple same-file access
+		static object WriteLock = new object();
+
+        /// <summary>
+        /// Callback action for saving
+        /// </summary>
+		public Action<string> SaveCallback { get; set; }
+
+		/*****************************************************************************************/
+
+		/// <summary>
+        /// SIMPL+ default constructor.
+        /// </summary>
+		public JsonToSimplGenericMaster()
+        {
+		}
+
+		/// <summary>
+		/// Loads in JSON and triggers evaluation on all children
+		/// </summary>
+		/// <param name="json"></param>
+		public void LoadWithJson(string json)
+		{
+			OnBoolChange(false, 0, JsonToSimplConstants.JsonIsValidBoolChange);
+			try
+			{
+				JsonObject = JObject.Parse(json);
+				foreach (var child in Children)
+					child.ProcessAll();
+				OnBoolChange(true, 0, JsonToSimplConstants.JsonIsValidBoolChange);
+			}
+			catch (Exception e)
+			{
+				var msg = string.Format("JSON parsing failed:\r{0}", e);
+				CrestronConsole.PrintLine(msg);
+				ErrorLog.Error(msg);
+			}
+		}
+
+		/// <summary>
+		/// Loads JSON into JsonObject, but does not trigger evaluation by children
+		/// </summary>
+		/// <param name="json"></param>
+		public void SetJsonWithoutEvaluating(string json)
+		{
+			try
+			{
+				JsonObject = JObject.Parse(json);
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, this, "JSON parsing failed:\r{0}", e);
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public override void Save()
+		{
+			// this code is duplicated in the other masters!!!!!!!!!!!!!
+ 			UnsavedValues = new Dictionary<string, JValue>();
+			// Make each child update their values into master object
+			foreach (var child in Children)
+			{
+				Debug.Console(1, this, "Master. checking child [{0}] for updates to save",  child.Key);
+				child.UpdateInputsForMaster();
+			}
+
+			if (UnsavedValues == null || UnsavedValues.Count == 0)
+			{
+				Debug.Console(1, this, "Master. No updated values to save. Skipping");
+				return;
+			}
+
+			lock (WriteLock)
+			{
+				Debug.Console(1, this, "Saving");
+				foreach (var path in UnsavedValues.Keys)
+				{
+					var tokenToReplace = JsonObject.SelectToken(path);
+					if (tokenToReplace != null)
+					{// It's found
+						tokenToReplace.Replace(UnsavedValues[path]);
+						Debug.Console(1, this, "Master Updating '{0}'", path);
+					}
+					else // No token.  Let's make one 
+					{
+						Debug.Console(1, "Master Cannot write value onto missing property: '{0}'", path);
+					}
+				}
+			}
+			if (SaveCallback != null)
+				SaveCallback(JsonObject.ToString());
+			else
+				Debug.Console(0, this, "WARNING: No save callback defined.");
+		}
+	}
+}

src/PepperDash.Core/JsonToSimpl/JsonToSimplMaster.cs

@@ -0,0 +1,247 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace PepperDash.Core.JsonToSimpl
+{
+    /// <summary>
+    /// Abstract base class for JsonToSimpl interactions
+    /// </summary>
+	public abstract class JsonToSimplMaster : IKeyed
+	{
+        /// <summary>
+        /// Notifies of bool change
+        /// </summary>
+		public event EventHandler<BoolChangeEventArgs> BoolChange;
+        /// <summary>
+        /// Notifies of ushort change
+        /// </summary>
+		public event EventHandler<UshrtChangeEventArgs> UshrtChange;
+        /// <summary>
+        /// Notifies of string change
+        /// </summary>
+		public event EventHandler<StringChangeEventArgs> StringChange;
+
+        /// <summary>
+        /// A collection of associated child modules
+        /// </summary>
+		protected List<JsonToSimplChildObjectBase> Children = new List<JsonToSimplChildObjectBase>();
+
+		/*****************************************************************************************/
+
+		/// <summary>
+		/// Mirrors the Unique ID for now.
+		/// </summary>
+		public string Key { get { return UniqueID; } }
+
+        /// <summary>
+        /// A unique ID
+        /// </summary>
+		public string UniqueID { get; protected set; }
+
+		/// <summary>
+		/// Merely for use in debug messages
+		/// </summary>
+		public string DebugName
+		{
+			get { return _DebugName; }
+			set { if (DebugName == null) _DebugName = ""; else _DebugName = value; }
+		}
+		string _DebugName = "";
+
+		/// <summary>
+		/// This will be prepended to all paths to allow path swapping or for more organized
+		/// sub-paths
+		/// </summary>
+		public string PathPrefix { get; set; }
+
+		/// <summary>
+		/// This is added to the end of all paths
+		/// </summary>
+		public string PathSuffix { get; set; }
+
+		/// <summary>
+		/// Enables debugging output to the console.  Certain error messages will be logged to the 
+		/// system's error log regardless of this setting
+		/// </summary>
+		public bool DebugOn { get; set; }
+
+		/// <summary>
+		/// Ushort helper for Debug property
+		/// </summary>
+		public ushort UDebug
+		{
+			get { return (ushort)(DebugOn ? 1 : 0); }
+			set
+			{
+				DebugOn = (value == 1);
+				CrestronConsole.PrintLine("JsonToSimpl debug={0}", DebugOn);
+			}
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+		public JObject JsonObject { get; protected set; }
+
+		/*****************************************************************************************/
+		/** Privates **/
+
+
+		// The JSON file in JObject form
+		// For gathering the incoming data
+		protected Dictionary<string, JValue> UnsavedValues = new Dictionary<string, JValue>();
+
+		/*****************************************************************************************/
+
+		/// <summary>
+		/// SIMPL+ default constructor.
+		/// </summary>
+		public JsonToSimplMaster()
+		{
+		}
+
+
+		/// <summary>
+		/// Sets up class - overriding methods should always call this.
+		/// </summary>
+		/// <param name="uniqueId"></param>
+		public virtual void Initialize(string uniqueId)
+		{
+			UniqueID = uniqueId;
+			J2SGlobal.AddMaster(this); // Should not re-add
+		}
+
+		/// <summary>
+		/// Adds a child "module" to this master
+		/// </summary>
+		/// <param name="child"></param>
+		public void AddChild(JsonToSimplChildObjectBase child)
+		{
+			if (!Children.Contains(child))
+			{
+				Children.Add(child);
+			}
+		}
+
+		/// <summary>
+		/// Called from the child to add changed or new values for saving
+		/// </summary>
+		public void AddUnsavedValue(string path, JValue value)
+		{
+			if (UnsavedValues.ContainsKey(path))
+			{
+				Debug.Console(0, "Master[{0}] WARNING - Attempt to add duplicate value for path '{1}'.\r Ingoring. Please ensure that path does not exist on multiple modules.", UniqueID, path);
+			}
+			else
+				UnsavedValues.Add(path, value);
+			//Debug.Console(0, "Master[{0}] Unsaved size={1}", UniqueID, UnsavedValues.Count);
+		}
+
+        /// <summary>
+        /// Saves the file
+        /// </summary>
+		public abstract void Save();
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public static class JsonFixes
+		{
+            /// <summary>
+            /// Deserializes a string into a JObject
+            /// </summary>
+            /// <param name="json"></param>
+            /// <returns></returns>
+			public static JObject ParseObject(string json)
+			{
+				#if NET6_0
+                using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
+#else
+                using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json)))
+#endif
+				{
+					var startDepth = reader.Depth;
+					var obj = JObject.Load(reader);
+					if (startDepth != reader.Depth)
+						throw new JsonSerializationException("Unenclosed json found");
+					return obj;
+				}
+			}
+
+            /// <summary>
+            /// Deserializes a string into a JArray
+            /// </summary>
+            /// <param name="json"></param>
+            /// <returns></returns>
+			public static JArray ParseArray(string json)
+			{
+				#if NET6_0
+                using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
+#else
+                using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json)))
+#endif
+				{
+					var startDepth = reader.Depth;
+					var obj = JArray.Load(reader);
+					if (startDepth != reader.Depth)
+						throw new JsonSerializationException("Unenclosed json found");
+					return obj;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Helper event
+		/// </summary>
+		/// <param name="state"></param>
+		/// <param name="index"></param>
+		/// <param name="type"></param>
+		protected void OnBoolChange(bool state, ushort index, ushort type)
+		{
+			if (BoolChange != null)
+			{
+				var args = new BoolChangeEventArgs(state, type);
+				args.Index = index;
+				BoolChange(this, args);
+			}
+		}
+
+		/// <summary>
+		/// Helper event
+		/// </summary>
+		/// <param name="state"></param>
+		/// <param name="index"></param>
+		/// <param name="type"></param>
+		protected void OnUshrtChange(ushort state, ushort index, ushort type)
+		{
+			if (UshrtChange != null)
+			{
+				var args = new UshrtChangeEventArgs(state, type);
+				args.Index = index;
+				UshrtChange(this, args);
+			}
+		}
+
+        /// <summary>
+        /// Helper event
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="index"></param>
+        /// <param name="type"></param>
+		protected void OnStringChange(string value, ushort index, ushort type)
+		{
+			if (StringChange != null)
+			{
+				var args = new StringChangeEventArgs(value, type);
+				args.Index = index;
+				StringChange(this, args);
+			}
+		}
+	}
+}

src/PepperDash.Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs

@@ -0,0 +1,191 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core.Config;
+
+namespace PepperDash.Core.JsonToSimpl
+{
+    /// <summary>
+    /// Portal File Master
+    /// </summary>
+    public class JsonToSimplPortalFileMaster : JsonToSimplMaster
+    {
+		/// <summary>
+		///  Sets the filepath as well as registers this with the Global.Masters list
+		/// </summary>
+		public string PortalFilepath { get; private set; }
+
+        /// <summary>
+        /// File path of the actual file being read (Portal or local)
+        /// </summary>
+        public string ActualFilePath { get; private set; }
+
+		/*****************************************************************************************/
+		/** Privates **/
+
+		// To prevent multiple same-file access
+		object StringBuilderLock = new object();
+		static object FileLock = new object();
+
+		/*****************************************************************************************/
+
+		/// <summary>
+        /// SIMPL+ default constructor.
+        /// </summary>
+		public JsonToSimplPortalFileMaster()
+        {
+		}
+
+		/// <summary>
+		/// Read, evaluate and udpate status
+		/// </summary>
+		public void EvaluateFile(string portalFilepath)
+		{
+			PortalFilepath = portalFilepath;
+
+			OnBoolChange(false, 0, JsonToSimplConstants.JsonIsValidBoolChange);
+			if (string.IsNullOrEmpty(PortalFilepath))
+			{
+				CrestronConsole.PrintLine("Cannot evaluate file. JSON file path not set");
+				return;
+			}
+
+			// Resolve possible wildcarded filename
+
+			// If the portal file is xyz.json, then 
+			// the file we want to check for first will be called xyz.local.json
+			var localFilepath = Path.ChangeExtension(PortalFilepath, "local.json");
+			Debug.Console(0, this, "Checking for local file {0}", localFilepath);
+			var actualLocalFile = GetActualFileInfoFromPath(localFilepath);
+
+			if (actualLocalFile != null)
+			{
+				ActualFilePath = actualLocalFile.FullName;
+                OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
+			}
+			// If the local file does not exist, then read the portal file xyz.json
+			// and create the local.
+			else
+			{
+				Debug.Console(1, this, "Local JSON file not found {0}\rLoading portal JSON file", localFilepath);
+				var actualPortalFile = GetActualFileInfoFromPath(portalFilepath);
+				if (actualPortalFile != null)
+				{
+					var newLocalPath = Path.ChangeExtension(actualPortalFile.FullName, "local.json");
+					// got the portal file, hand off to the merge / save method				
+					PortalConfigReader.ReadAndMergeFileIfNecessary(actualPortalFile.FullName, newLocalPath);
+					ActualFilePath = newLocalPath;
+                    OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
+				}
+				else
+				{
+					var msg = string.Format("Portal JSON file not found: {0}", PortalFilepath);
+					Debug.Console(1, this, msg);
+					ErrorLog.Error(msg);
+					return;
+				}
+			}
+
+			// At this point we should have a local file.  Do it.
+			Debug.Console(1, "Reading local JSON file {0}", ActualFilePath);
+
+			string json = File.ReadToEnd(ActualFilePath, System.Text.Encoding.ASCII);
+
+			try
+			{
+				JsonObject = JObject.Parse(json);
+				foreach (var child in Children)
+					child.ProcessAll();
+				OnBoolChange(true, 0, JsonToSimplConstants.JsonIsValidBoolChange);
+			}
+			catch (Exception e)
+			{
+				var msg = string.Format("JSON parsing failed:\r{0}", e);
+				CrestronConsole.PrintLine(msg);
+				ErrorLog.Error(msg);
+				return;
+			}
+		}
+
+		/// <summary>
+		/// Returns the FileInfo object for a given path, with possible wildcards
+		/// </summary>
+		/// <param name="path"></param>
+		/// <returns></returns>
+		FileInfo GetActualFileInfoFromPath(string path)
+		{
+			var dir = Path.GetDirectoryName(path);
+			var localFilename = Path.GetFileName(path);
+			var directory = new DirectoryInfo(dir);
+			// search the directory for the file w/ wildcards
+			return directory.GetFiles(localFilename).FirstOrDefault();
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="level"></param>
+		public void setDebugLevel(uint level)
+		{
+			Debug.SetDebugLevel(level);
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public override void Save()
+		{
+			// this code is duplicated in the other masters!!!!!!!!!!!!!
+			UnsavedValues = new Dictionary<string, JValue>();
+			// Make each child update their values into master object
+			foreach (var child in Children)
+			{
+				Debug.Console(1, "Master [{0}] checking child [{1}] for updates to save", UniqueID, child.Key);
+				child.UpdateInputsForMaster();
+			}
+
+			if (UnsavedValues == null || UnsavedValues.Count == 0)
+			{
+				Debug.Console(1, "Master [{0}] No updated values to save. Skipping", UniqueID);
+				return;
+			}
+			lock (FileLock)
+			{
+				Debug.Console(1, "Saving");
+				foreach (var path in UnsavedValues.Keys)
+				{
+					var tokenToReplace = JsonObject.SelectToken(path);
+					if (tokenToReplace != null)
+					{// It's found
+						tokenToReplace.Replace(UnsavedValues[path]);
+						Debug.Console(1, "JSON Master[{0}] Updating '{1}'", UniqueID, path);
+					}
+					else // No token.  Let's make one 
+					{
+						//http://stackoverflow.com/questions/17455052/how-to-set-the-value-of-a-json-path-using-json-net
+						Debug.Console(1, "JSON Master[{0}] Cannot write value onto missing property: '{1}'", UniqueID, path);
+						
+					}
+				}
+				using (StreamWriter sw = new StreamWriter(ActualFilePath))
+				{
+					try
+					{
+						sw.Write(JsonObject.ToString());
+						sw.Flush();
+					}
+					catch (Exception e)
+					{
+						string err = string.Format("Error writing JSON file:\r{0}", e);
+						Debug.Console(0, err);
+						ErrorLog.Warn(err);
+						return;
+					}
+				}
+			}
+		}
+	}
+}

src/PepperDash.Core/Logging/CrestronEnricher.cs

@@ -0,0 +1,37 @@
+using Crestron.SimplSharp;
+using Serilog.Core;
+using Serilog.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Core.Logging
+{
+    public class CrestronEnricher : ILogEventEnricher
+    {
+        static readonly string _appName;
+
+        static CrestronEnricher()
+        {
+            switch (CrestronEnvironment.DevicePlatform)
+            {
+                case eDevicePlatform.Appliance:
+                    _appName = $"App {InitialParametersClass.ApplicationNumber}";
+                    break;
+                case eDevicePlatform.Server:
+                    _appName = $"{InitialParametersClass.RoomId}";
+                    break;
+            }
+        }
+            
+
+        public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
+        {
+            var property = propertyFactory.CreateProperty("App", _appName);
+
+            logEvent.AddOrUpdateProperty(property);
+        }
+    }
+}

src/PepperDash.Core/Logging/DebugConsoleSink.cs

@@ -0,0 +1,55 @@
+using Crestron.SimplSharp;
+using Serilog.Configuration;
+using Serilog;
+using Serilog.Core;
+using Serilog.Events;
+using Serilog.Formatting;
+using Serilog.Formatting.Json;
+using System.IO;
+using System.Text;
+
+
+namespace PepperDash.Core
+{
+    public class DebugConsoleSink : ILogEventSink
+    {
+        private readonly ITextFormatter _textFormatter;
+
+        public void Emit(LogEvent logEvent)
+        {
+            if (!Debug.IsRunningOnAppliance) return;            
+
+            /*string message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}]{logEvent.RenderMessage()}";
+
+            if(logEvent.Properties.TryGetValue("Key",out var value) && value is ScalarValue sv && sv.Value is string rawValue)
+            {
+                message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}][{rawValue,3}]: {logEvent.RenderMessage()}";
+            }*/
+
+            var buffer = new StringWriter(new StringBuilder(256));
+
+            _textFormatter.Format(logEvent, buffer);
+
+            var message = buffer.ToString();
+
+            CrestronConsole.PrintLine(message);
+        }
+
+        public DebugConsoleSink(ITextFormatter formatProvider )
+        {
+            _textFormatter = formatProvider ?? new JsonFormatter();
+        }
+
+    }
+
+    public static class DebugConsoleSinkExtensions
+    {
+        public static LoggerConfiguration DebugConsoleSink(
+                             this LoggerSinkConfiguration loggerConfiguration,
+                                              ITextFormatter formatProvider = null)
+        {
+            return loggerConfiguration.Sink(new DebugConsoleSink(formatProvider));
+        }
+    }
+
+}

src/PepperDash.Core/Logging/DebugContext.cs

@@ -0,0 +1,281 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json;
+
+
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// Represents a debugging context
+    /// </summary>
+    public class DebugContext
+    {
+        /// <summary>
+        /// Describes the folder location where a given program stores it's debug level memory. By default, the
+        /// file written will be named appNdebug where N is 1-10.
+        /// </summary>
+        public string Key { get; private set; }
+
+        ///// <summary>
+        ///// The name of the file containing the current debug settings.
+        ///// </summary>
+        //string FileName = string.Format(@"\nvram\debug\app{0}Debug.json", InitialParametersClass.ApplicationNumber);
+
+        DebugContextSaveData SaveData;
+
+        int SaveTimeoutMs = 30000;
+
+        CTimer SaveTimer;
+
+
+        static List<DebugContext> Contexts = new List<DebugContext>();
+
+        /// <summary>
+        /// Creates or gets a debug context
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static DebugContext GetDebugContext(string key)
+        {
+            var context = Contexts.FirstOrDefault(c => c.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
+            if (context == null)
+            {
+                context = new DebugContext(key);
+                Contexts.Add(context);
+            }
+            return context;
+        }
+
+        /// <summary>
+        /// Do not use.  For S+ access.
+        /// </summary>
+        public DebugContext() { }
+
+        DebugContext(string key)
+        {
+            Key = key;
+            if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SimplSharpPro)
+            {
+                // Add command to console
+                CrestronConsole.AddNewConsoleCommand(SetDebugFromConsole, "appdebug",
+                    "appdebug:P [0-2]: Sets the application's console debug message level",
+                    ConsoleAccessLevelEnum.AccessOperator);
+            }
+
+            CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
+
+            LoadMemory();
+        }
+
+        /// <summary>
+        /// Used to save memory when shutting down
+        /// </summary>
+        /// <param name="programEventType"></param>
+        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        {
+            if (programEventType == eProgramStatusEventType.Stopping)
+            {
+                if (SaveTimer != null)
+                {
+                    SaveTimer.Stop();
+                    SaveTimer = null;
+                }
+                Console(0, "Saving debug settings");
+                SaveMemory();
+            }
+        }
+
+        /// <summary>
+        /// Callback for console command
+        /// </summary>
+        /// <param name="levelString"></param>
+        public void SetDebugFromConsole(string levelString)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(levelString.Trim()))
+                {
+                    CrestronConsole.ConsoleCommandResponse("AppDebug level = {0}", SaveData.Level);
+                    return;
+                }
+
+                SetDebugLevel(Convert.ToInt32(levelString));
+            }
+            catch
+            {
+                CrestronConsole.PrintLine("Usage: appdebug:P [0-2]");
+            }
+        }
+
+        /// <summary>
+        /// Sets the debug level
+        /// </summary>
+        /// <param name="level"> Valid values 0 (no debug), 1 (critical), 2 (all messages)</param>
+        public void SetDebugLevel(int level)
+        {
+            if (level <= 2)
+            {
+                SaveData.Level = level;
+                SaveMemoryOnTimeout();
+
+                CrestronConsole.PrintLine("[Application {0}], Debug level set to {1}",
+                    InitialParametersClass.ApplicationNumber, SaveData.Level);
+            }
+        }
+
+        /// <summary>
+        /// Prints message to console if current debug level is equal to or higher than the level of this message.
+        /// Uses CrestronConsole.PrintLine.
+        /// </summary>
+        /// <param name="level"></param>
+        /// <param name="format">Console format string</param>
+        /// <param name="items">Object parameters</param>
+        public void Console(uint level, string format, params object[] items)
+        {
+            if (SaveData.Level >= level)
+                CrestronConsole.PrintLine("App {0}:{1}", InitialParametersClass.ApplicationNumber,
+                    string.Format(format, items));
+        }
+
+        /// <summary>
+        /// Appends a device Key to the beginning of a message
+        /// </summary>
+        public void Console(uint level, IKeyed dev, string format, params object[] items)
+        {
+            if (SaveData.Level >= level)
+                Console(level, "[{0}] {1}", dev.Key, string.Format(format, items));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="level"></param>
+        /// <param name="dev"></param>
+        /// <param name="errorLogLevel"></param>
+        /// <param name="format"></param>
+        /// <param name="items"></param>
+        public void Console(uint level, IKeyed dev, Debug.ErrorLogLevel errorLogLevel,
+            string format, params object[] items)
+        {
+            if (SaveData.Level >= level)
+            {
+                var str = string.Format("[{0}] {1}", dev.Key, string.Format(format, items));
+                Console(level, str);
+                LogError(errorLogLevel, str);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="level"></param>
+        /// <param name="errorLogLevel"></param>
+        /// <param name="format"></param>
+        /// <param name="items"></param>
+        public void Console(uint level, Debug.ErrorLogLevel errorLogLevel,
+            string format, params object[] items)
+        {
+            if (SaveData.Level >= level)
+            {
+                var str = string.Format(format, items);
+                Console(level, str);
+                LogError(errorLogLevel, str);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="errorLogLevel"></param>
+        /// <param name="str"></param>
+        public void LogError(Debug.ErrorLogLevel errorLogLevel, string str)
+        {
+            string msg = string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str);
+            switch (errorLogLevel)
+            {
+                case Debug.ErrorLogLevel.Error:
+                    ErrorLog.Error(msg);
+                    break;
+                case Debug.ErrorLogLevel.Warning:
+                    ErrorLog.Warn(msg);
+                    break;
+                case Debug.ErrorLogLevel.Notice:
+                    ErrorLog.Notice(msg);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Writes the memory object after timeout
+        /// </summary>
+        void SaveMemoryOnTimeout()
+        {
+            if (SaveTimer == null)
+                SaveTimer = new CTimer(o =>
+                {
+                    SaveTimer = null;
+                    SaveMemory();
+                }, SaveTimeoutMs);
+            else
+                SaveTimer.Reset(SaveTimeoutMs);
+        }
+
+        /// <summary>
+        /// Writes the memory - use SaveMemoryOnTimeout
+        /// </summary>
+        void SaveMemory()
+        {
+            using (StreamWriter sw = new StreamWriter(GetMemoryFileName()))
+            {
+                var json = JsonConvert.SerializeObject(SaveData);
+                sw.Write(json);
+                sw.Flush();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void LoadMemory()
+        {
+            var file = GetMemoryFileName();
+            if (File.Exists(file))
+            {
+                using (StreamReader sr = new StreamReader(file))
+                {
+                    var data = JsonConvert.DeserializeObject<DebugContextSaveData>(sr.ReadToEnd());
+                    if (data != null)
+                    {
+                        SaveData = data;
+                        Debug.Console(1, "Debug memory restored from file");
+                        return;
+                    }
+                    else
+                        SaveData = new DebugContextSaveData();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Helper to get the file path for this app's debug memory
+        /// </summary>
+        string GetMemoryFileName()
+        {
+            return string.Format(@"\NVRAM\debugSettings\program{0}-{1}", InitialParametersClass.ApplicationNumber, Key);
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class DebugContextSaveData
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Level { get; set; }
+    }
+}

src/PepperDash.Core/Logging/DebugCrestronLoggerSink.cs

@@ -0,0 +1,29 @@
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronLogger;
+using Serilog.Core;
+using Serilog.Events;
+
+namespace PepperDash.Core.Logging
+{
+    public class DebugCrestronLoggerSink : ILogEventSink
+    {
+        public void Emit(LogEvent logEvent)
+        {
+            if (!Debug.IsRunningOnAppliance) return;
+
+            string message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}]{logEvent.RenderMessage()}";
+
+            if (logEvent.Properties.TryGetValue("Key", out var value) && value is ScalarValue sv && sv.Value is string rawValue)
+            {
+                message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}][{rawValue}]: {logEvent.RenderMessage()}";
+            }
+
+            CrestronLogger.WriteToLog(message, (uint)logEvent.Level);
+        }
+
+        public DebugCrestronLoggerSink()
+        {
+            CrestronLogger.Initialize(1, LoggerModeEnum.RM);
+        }
+    }
+}