diff --git a/IR Drivers/samsung_un_series.ir b/IR Drivers/samsung_un_series.ir
new file mode 100644
index 00000000..cd6401d0
Binary files /dev/null and b/IR Drivers/samsung_un_series.ir differ
diff --git a/PepperDashEssentials/Bridges/DisplayControllerBridge.cs b/PepperDashEssentials/Bridges/DisplayControllerBridge.cs
index 1bf73c46..ba4da8d0 100644
--- a/PepperDashEssentials/Bridges/DisplayControllerBridge.cs
+++ b/PepperDashEssentials/Bridges/DisplayControllerBridge.cs
@@ -18,10 +18,9 @@ namespace PepperDash.Essentials.Bridges
 		public static int InputNumber;
 		public static IntFeedback InputNumberFeedback;
 		public static List<string> InputKeys = new List<string>();
-		public static void LinkToApi(this PepperDash.Essentials.Core.TwoWayDisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
+		public static void LinkToApi(this PepperDash.Essentials.Core.DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
 		{
 
-
 				JoinMap = JoinMapHelper.GetJoinMapForDevice(joinMapKey) as DisplayControllerJoinMap;
 				_TriList = trilist;
 
@@ -31,17 +30,31 @@ namespace PepperDash.Essentials.Bridges
 				}
 
 				JoinMap.OffsetJoinNumbers(joinStart);
+
 				Debug.Console(1, "Linking to Trilist '{0}'", _TriList.ID.ToString("X"));
 				Debug.Console(0, "Linking to Bridge Type {0}", displayDevice.GetType().Name.ToString());
 
-				_TriList.StringInput[JoinMap.Name].StringValue = displayDevice.GetType().Name.ToString();
-			
-				InputNumberFeedback = new IntFeedback(() => { return InputNumber; });
-				InputNumberFeedback.LinkInputSig(_TriList.UShortInput[JoinMap.InputSelect]);
-				var commMonitor = displayDevice as ICommunicationMonitor;
-				commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.IsOnline]);
+				_TriList.StringInput[JoinMap.Name].StringValue = displayDevice.GetType().Name.ToString();			
 
-				// Poewer Off
+				var commMonitor = displayDevice as ICommunicationMonitor;
+                if (commMonitor != null)
+                {
+                    commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[JoinMap.IsOnline]);
+                }
+
+                // Two way feedbacks
+                var twoWayDisplay = displayDevice as PepperDash.Essentials.Core.TwoWayDisplayBase;
+                if (twoWayDisplay != null)
+                {
+                    trilist.SetBool(JoinMap.IsTwoWayDisplay, true);
+
+                    twoWayDisplay.CurrentInputFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(CurrentInputFeedback_OutputChange);
+
+                    InputNumberFeedback = new IntFeedback(() => { return InputNumber; });
+                    InputNumberFeedback.LinkInputSig(_TriList.UShortInput[JoinMap.InputSelect]);
+                }
+
+				// Power Off
 				trilist.SetSigTrueAction(JoinMap.PowerOff, () =>
 					{
 						InputNumber = 102;
@@ -73,7 +86,6 @@ namespace PepperDash.Essentials.Bridges
 					count++;
 				}
 
-				displayDevice.CurrentInputFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(CurrentInputFeedback_OutputChange);
 				trilist.SetUShortSigAction(JoinMap.InputSelect, (a) =>
 				{
 					if (a == 0)
@@ -91,7 +103,8 @@ namespace PepperDash.Essentials.Bridges
 						displayDevice.PowerToggle();
 
 					}
-					InputNumberFeedback.FireUpdate();
+                    if (displayDevice is PepperDash.Essentials.Core.TwoWayDisplayBase)
+					    InputNumberFeedback.FireUpdate();
 				});
 				 
 
@@ -134,10 +147,9 @@ namespace PepperDash.Essentials.Bridges
 		public uint PowerOff { get; set; }
 		public uint InputSelect { get; set; }
 		public uint PowerOn { get; set; }
+        public uint IsTwoWayDisplay { get; set; }
 		public uint SelectScene { get; set; }
-		public uint LightingSceneOffset { get; set; }
 		public uint ButtonVisibilityOffset { get; set; }
-		public uint IntegrationIdSet { get; set; }
 
 		public DisplayControllerJoinMap()
 		{
@@ -145,15 +157,17 @@ namespace PepperDash.Essentials.Bridges
 			IsOnline = 50;
 			PowerOff = 1;
 			PowerOn = 2;
-			InputSelect = 4;
-			IntegrationIdSet = 1;
-			LightingSceneOffset = 10;
+            IsTwoWayDisplay = 3;
 			ButtonVisibilityOffset = 40;
-			Name = 1;
-			InputNamesOffset = 10;
-			InputSelectOffset = 4;
+            InputSelectOffset = 4;
+
 			// Analog
-		}
+            InputSelect = 4;
+
+            // Serial
+            Name = 1;
+            InputNamesOffset = 10;
+        }
 
 		public override void OffsetJoinNumbers(uint joinStart)
 		{
@@ -162,8 +176,8 @@ namespace PepperDash.Essentials.Bridges
 			IsOnline = IsOnline + joinOffset;
 			PowerOff = PowerOff + joinOffset;
 			PowerOn = PowerOn + joinOffset;
+            IsTwoWayDisplay = IsTwoWayDisplay + joinOffset;
 			SelectScene = SelectScene + joinOffset;
-			LightingSceneOffset = LightingSceneOffset + joinOffset;
 			ButtonVisibilityOffset = ButtonVisibilityOffset + joinOffset;
 			Name = Name + joinOffset;
 			InputNamesOffset = InputNamesOffset + joinOffset;
diff --git a/PepperDashEssentials/ControlSystem.cs b/PepperDashEssentials/ControlSystem.cs
index 9069bef4..25d1c431 100644
--- a/PepperDashEssentials/ControlSystem.cs
+++ b/PepperDashEssentials/ControlSystem.cs
@@ -248,6 +248,10 @@ namespace PepperDash.Essentials
 			if (!Directory.Exists(sgdDir))
 				Directory.Create(sgdDir);
 
+            var pluginDir = Global.FilePathPrefix + "plugins";
+            if (!Directory.Exists(pluginDir))
+                Directory.Create(pluginDir);
+
 			return configExists;
 		}
 
diff --git a/PepperDashEssentials/Factory/DeviceFactory.cs b/PepperDashEssentials/Factory/DeviceFactory.cs
index 86612747..8e83fb9d 100644
--- a/PepperDashEssentials/Factory/DeviceFactory.cs
+++ b/PepperDashEssentials/Factory/DeviceFactory.cs
@@ -43,13 +43,13 @@ namespace PepperDash.Essentials
                 return new Device(key, name);
             }
 
-            // MOVE into something else???
-            else if (typeName == "basicirdisplay")
-            {
-                var ir = IRPortHelper.GetIrPort(properties);
-                if (ir != null)
-                    return new BasicIrDisplay(key, name, ir.Port, ir.FileName);
-            }
+            //// MOVE into something else???
+            //else if (typeName == "basicirdisplay")
+            //{
+            //    var ir = IRPortHelper.GetIrPort(properties);
+            //    if (ir != null)
+            //        return new BasicIrDisplay(key, name, ir.Port, ir.FileName);
+            //}
 
             else if (typeName == "commmock")
             {
diff --git a/PepperDashEssentials/Properties/AssemblyInfo.cs b/PepperDashEssentials/Properties/AssemblyInfo.cs
index f5bdcfd9..55f4a128 100644
--- a/PepperDashEssentials/Properties/AssemblyInfo.cs
+++ b/PepperDashEssentials/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
 [assembly: AssemblyCompany("PepperDash Technology Corp")]
 [assembly: AssemblyProduct("PepperDashEssentials")]
 [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")]
-[assembly: AssemblyVersion("1.4.9.*")]
+[assembly: AssemblyVersion("1.4.10.*")]
 
diff --git a/essentials-framework b/essentials-framework
index 433f71da..1675b98b 160000
--- a/essentials-framework
+++ b/essentials-framework
@@ -1 +1 @@
-Subproject commit 433f71da3e8381834ba3c9207622fae16f639ba9
+Subproject commit 1675b98b87a37a915081fff64e79cdc062147588