diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo
index 95872f0..3d59b90 100644
Binary files a/Pepperdash Core/Pepperdash Core.suo and b/Pepperdash Core/Pepperdash Core.suo differ
diff --git a/Pepperdash Core/Pepperdash Core/Comm/DynamicTCPServer.cs b/Pepperdash Core/Pepperdash Core/Comm/DynamicTCPServer.cs
new file mode 100644
index 0000000..cde7194
--- /dev/null
+++ b/Pepperdash Core/Pepperdash Core/Comm/DynamicTCPServer.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash_Core.Comm
+{
+    public class DynamicTCPServer
+    {
+        public bool Secure { get; set; }
+        public ushort uSecure
+        {
+            set
+            {
+                if (value == 1)
+                    Secure = true;
+                else if (value == 0)
+                    Secure = false;
+            }
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpClient.cs
index 829e8b0..076802d 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpClient.cs	
@@ -47,6 +47,19 @@ namespace SecureTCP.SecureTCP.Client
             set { Port = Convert.ToInt32(value); }
         }
 
+        public bool RequiresPresharedKey { get; set; }
+
+        public ushort uRequiresPresharedKey
+        {
+            set
+            {
+                if (value == 1)
+                    RequiresPresharedKey = true;
+                else
+                    RequiresPresharedKey = 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>
@@ -218,7 +231,7 @@ namespace SecureTCP.SecureTCP.Client
                 Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericSecureTcpClient '{0}': Invalid port", Key);
                 return;
             }
-            if (string.IsNullOrEmpty(SharedKey))
+            if (string.IsNullOrEmpty(SharedKey) && RequiresPresharedKey)
             {
                 Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericSecureTcpClient '{0}': No Shared Key set", Key);
                 return;
@@ -230,7 +243,8 @@ namespace SecureTCP.SecureTCP.Client
             try
             {
                 DisconnectCalledByUser = false;
-                WaitingForSharedKeyResponse = true;
+                if(RequiresPresharedKey)
+                    WaitingForSharedKeyResponse = true;
                 SocketErrorCodes error = Client.ConnectToServer();
             }
             catch (Exception ex)
@@ -265,7 +279,7 @@ namespace SecureTCP.SecureTCP.Client
 			{
 				var bytes = client.IncomingDataBuffer.Take(numBytes).ToArray();
                 var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
-                if (WaitingForSharedKeyResponse)
+                if (WaitingForSharedKeyResponse && RequiresPresharedKey)
                 {
                     if (str != (SharedKey + "\n"))
                     {
@@ -308,8 +322,6 @@ namespace SecureTCP.SecureTCP.Client
 
         public void SendBytes(byte[] bytes)
         {
-            //if (Debug.Level == 2)
-            //    Debug.Console(2, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
             Client.SendData(bytes, bytes.Length);
         }
 
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj
index d83069a..2da10ef 100644
--- a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
+++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
@@ -64,6 +64,7 @@
   <ItemGroup>
     <Compile Include="CommunicationExtras.cs" />
     <Compile Include="Comm\ControlPropertiesConfig.cs" />
+    <Compile Include="Comm\DynamicTCPServer.cs" />
     <Compile Include="Comm\eControlMethods.cs" />
     <Compile Include="Comm\FINISH CommStatic.cs" />
     <Compile Include="Comm\CommunicationGather.cs" />
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo
index c1f2b7a..d0bfe36 100644
Binary files a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo and b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz
index 3c11ef7..983cf8d 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config
index 6e9762c..089c686 100644
--- a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config	
+++ b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config	
@@ -10,8 +10,8 @@
     <ArchiveName />
   </RequiredInfo>
   <OptionalInfo>
-    <CompiledOn>3/10/2017 6:22:56 PM</CompiledOn>
-    <CompilerRev>1.0.6278.33087</CompilerRev>
+    <CompiledOn>3/13/2017 5:30:30 PM</CompiledOn>
+    <CompilerRev>1.0.6281.19814</CompilerRev>
   </OptionalInfo>
   <Plugin>
     <Version>Crestron.SIMPLSharp, Version=2.0.52.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll
index 1f7e14a..6fc44b5 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb
index 2dadba9..257469b 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.info b/Pepperdash Core/Pepperdash Core/bin/manifest.info
index d834f12..995d2a7 100644
--- a/Pepperdash Core/Pepperdash Core/bin/manifest.info	
+++ b/Pepperdash Core/Pepperdash Core/bin/manifest.info	
@@ -1,4 +1,4 @@
-MainAssembly=PepperDash_Core.dll:79619d005133babcf49ba6c3bbc3de28
+MainAssembly=PepperDash_Core.dll:bbf10e2b8fa14d4d571eeafc3bffb1a3
 MainAssemblyMinFirmwareVersion=1.007.0017
 MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e
 ü
diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.ser b/Pepperdash Core/Pepperdash Core/bin/manifest.ser
index 218864b..165ed89 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/manifest.ser and b/Pepperdash Core/Pepperdash Core/bin/manifest.ser differ
diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll
index 202c9a4..0190c9f 100644
Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll differ
diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb
index 920491b..869c2d8 100644
Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb differ