diff --git a/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateBridge.cs b/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateBridge.cs
index e26e2d7..92b47d1 100644
--- a/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateBridge.cs
+++ b/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateBridge.cs
@@ -5,6 +5,7 @@ using System.Text;
 
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharp.Reflection;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -51,7 +52,12 @@ namespace EssentialsPluginTemplateEPI
 
 		public override void OffsetJoinNumbers(uint joinStart)
 		{
-            // Offset the joins from joinStart as applicable
+			GetType()
+				.GetCType()
+				.GetProperties()
+				.Where(x => x.PropertyType == typeof(uint))
+				.ToList()
+				.ForEach(prop => prop.SetValue(this, (uint)prop.GetValue(this, null) + joinStart - 1, null));
 		}
 	}
 }
\ No newline at end of file
diff --git a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.csproj b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.csproj
index 5a9ae47..f82a77a 100644
--- a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.csproj
+++ b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.csproj
@@ -46,6 +46,10 @@
     <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Essentials Devices Common, Version=1.4.7335.30139, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\EssentialsBuilds\Essentials Devices Common.dll</HintPath>
+    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDashEssentials, Version=1.4.19.29953, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.suo b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.suo
index ad4bc10..c0a05d0 100644
Binary files a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.suo and b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.suo differ
diff --git a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.projectinfo b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.projectinfo
index acdbdf8..3846a01 100644
Binary files a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.projectinfo and b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.projectinfo differ
diff --git a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.config b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.config
index be17a6d..768bc63 100644
--- a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.config
+++ b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.config
@@ -10,8 +10,8 @@
     <ArchiveName />
   </RequiredInfo>
   <OptionalInfo>
-    <CompiledOn>2020-02-13 3:58:57 PM</CompiledOn>
-    <CompilerRev>1.0.0.28767</CompilerRev>
+    <CompiledOn>3/2/2020 5:19:54 PM</CompiledOn>
+    <CompilerRev>1.0.0.31196</CompilerRev>
   </OptionalInfo>
   <Plugin>
     <Version>Crestron.SIMPLSharp, Version=2.0.58.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>
diff --git a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.cplz b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.cplz
index 1e8161e..58c2aa7 100644
Binary files a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.cplz and b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.cplz differ
diff --git a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.dll b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.dll
index 23b639a..ddd0e4c 100644
Binary files a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.dll and b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.dll differ
diff --git a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.pdb b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.pdb
index e405a11..f9235e1 100644
Binary files a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.pdb and b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/PDT.EssentialsPluginTemplate.EPI.pdb differ
diff --git a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/manifest.info b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/manifest.info
index bf684f8..d2e9cee 100644
--- a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/manifest.info
+++ b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/manifest.info
@@ -1,4 +1,4 @@
-MainAssembly=PDT.EssentialsPluginTemplate.EPI.dll:6808b45c8c5d7c4d3852fe284ea334cf
+MainAssembly=PDT.EssentialsPluginTemplate.EPI.dll:74fe3a77423531efb46a87f7f60b7e0d
 MainAssemblyMinFirmwareVersion=1.009.0029
 MainAssemblyResource=SimplSharpData.dat:820b61c48c8a2cace82957eed4cc377c
 MainAssemblyResource=SimplSharpData.dat.der:bf862965c00f3e6ec535e4e00e82d30c
diff --git a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/manifest.ser b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/manifest.ser
index 18c605b..a1f849c 100644
Binary files a/PDT.EssentialsPluginTemplate.EPI/bin/Debug/manifest.ser and b/PDT.EssentialsPluginTemplate.EPI/bin/Debug/manifest.ser differ
diff --git a/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.csproj.FileListAbsolute.txt b/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.csproj.FileListAbsolute.txt
index 05eec82..701f8b8 100644
--- a/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.csproj.FileListAbsolute.txt
+++ b/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.csproj.FileListAbsolute.txt
@@ -44,3 +44,26 @@ C:\Working Directories\PD\EssentialsPluginTemplate\PDT.EssentialsPluginTemplate.
 C:\Working Directories\PD\EssentialsPluginTemplate\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Essentials Devices Common.dll
 C:\Working Directories\PD\EssentialsPluginTemplate\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.GeneralIO.dll
 C:\Working Directories\PD\EssentialsPluginTemplate\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.DM.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\PDT.EssentialsPluginTemplate.EPI.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\PDT.EssentialsPluginTemplate.EPI.pdb
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\PepperDash_Core.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\PepperDash_Essentials_Core.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\PepperDash_Essentials_DM.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\PepperDashEssentials.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\SimplSharpNewtonsoft.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\SimplSharpReflectionInterface.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.Lighting.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.Gateways.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\SimplSharpSQLHelperInterface.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.Fusion.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.Shades.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.EthernetCommunications.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.DeviceSupport.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.UI.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\SimplSharpTimerEventInterface.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Essentials Devices Common.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.GeneralIO.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\bin\Debug\Crestron.SimplSharpPro.DM.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\obj\Debug\ResolveAssemblyReference.cache
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\obj\Debug\PDT.EssentialsPluginTemplate.EPI.dll
+C:\Users\JTA\Documents\Stash Folder\Frameworks\GithubTemplates\template-essentials_plugin-public\PDT.EssentialsPluginTemplate.EPI\obj\Debug\PDT.EssentialsPluginTemplate.EPI.pdb
diff --git a/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.dll b/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.dll
index 23b639a..ddd0e4c 100644
Binary files a/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.dll and b/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.dll differ
diff --git a/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.pdb b/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.pdb
index d636ac2..cd73e51 100644
Binary files a/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.pdb and b/PDT.EssentialsPluginTemplate.EPI/obj/Debug/PDT.EssentialsPluginTemplate.EPI.pdb differ
diff --git a/PDT.EssentialsPluginTemplate.EPI/obj/Debug/ResolveAssemblyReference.cache b/PDT.EssentialsPluginTemplate.EPI/obj/Debug/ResolveAssemblyReference.cache
index 61ff231..56a1f5b 100644
Binary files a/PDT.EssentialsPluginTemplate.EPI/obj/Debug/ResolveAssemblyReference.cache and b/PDT.EssentialsPluginTemplate.EPI/obj/Debug/ResolveAssemblyReference.cache differ