diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericIrControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericIrControllerJoinMap.cs
new file mode 100644
index 00000000..288141bb
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/GenericIrControllerJoinMap.cs	
@@ -0,0 +1,827 @@
+using PepperDash.Essentials.Core;
+
+namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+{
+		public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
+		{
+			[JoinName("PLAY")]
+			public JoinDataComplete Play = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 1,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "PLAY",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("STOP")]
+			public JoinDataComplete Stop = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 2,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "STOP",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("PAUSE")]
+			public JoinDataComplete Pause = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 3,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "PAUSE",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("FSCAN")]
+			public JoinDataComplete ForwardScan = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 4,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "FSCAN",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("RSCAN")]
+			public JoinDataComplete ReverseScan = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 5,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "RSCAN",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("F_SKIP")]
+			public JoinDataComplete ForwardSkip = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 6,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "F_SKIP",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("R_SKIP")]
+			public JoinDataComplete ReverseSkip = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 7,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "R_SKIP",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("RECORD")]
+			public JoinDataComplete Record = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 8,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "RECORD",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("POWER")]
+			public JoinDataComplete Power = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 9,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "POWER",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("0")]
+			public JoinDataComplete Kp0 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 10,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "0",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("1")]
+			public JoinDataComplete Kp1 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 11,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "1",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("2")]
+			public JoinDataComplete Kp2 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 12,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "2",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("3")]
+			public JoinDataComplete Kp3 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 13,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "3",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("4")]
+			public JoinDataComplete Kp4 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 14,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "4",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("5")]
+			public JoinDataComplete Kp5 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 15,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "5",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("6")]
+			public JoinDataComplete Kp6 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 16,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "6",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("7")]
+			public JoinDataComplete Kp7 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 17,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "7",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("8")]
+			public JoinDataComplete Kp8 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 18,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "8",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("9")]
+			public JoinDataComplete Kp9 = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 19,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "9",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			// [JoinName("+10")]
+			// public JoinDataComplete Kp9 = new JoinDataComplete(
+			// 	new JoinData
+			// 	{
+			// 		JoinNumber = 20,
+			// 		JoinSpan = 1
+			// 	},
+			// 	new JoinMetadata
+			// 	{
+			// 		Description = "+10",
+			// 		JoinCapabilities = eJoinCapabilities.FromSIMPL,
+			// 		JoinType = eJoinType.Digital
+			// 	});
+			
+			[JoinName("ENTER")]
+			public JoinDataComplete Enter = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 21,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "ENTER",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("CH+")]
+			public JoinDataComplete ChannelUp = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 22,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "CH+",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("CH-")]
+			public JoinDataComplete ChannelDown = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 23,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "CH-",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("*")]
+			public JoinDataComplete KpStar = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 24,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "*",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("#")]
+			public JoinDataComplete KpPound = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 25,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "#",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			// [JoinName(".")]
+			// public JoinDataComplete KpPound = new JoinDataComplete(
+			// 	new JoinData
+			// 	{
+			// 		JoinNumber = 26,
+			// 		JoinSpan = 1
+			// 	},
+			// 	new JoinMetadata
+			// 	{
+			// 		Description = ".",
+			// 		JoinCapabilities = eJoinCapabilities.FromSIMPL,
+			// 		JoinType = eJoinType.Digital
+			// 	});
+
+			[JoinName("POWER_ON")]
+			public JoinDataComplete PowerOn = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 27,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "POWER_ON",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("POWER_OFF")]
+			public JoinDataComplete PowerOff = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 28,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "POWER_OFF",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("PLAY_PAUSE")]
+			public JoinDataComplete PlayPause = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 29,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "PLAY_PAUSE",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("LAST")]
+			public JoinDataComplete Last = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 30,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "LAST",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("HOME")]
+			public JoinDataComplete Home = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 40,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "HOME",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("BACK")]
+			public JoinDataComplete Back = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 41,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "BACK",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+
+			[JoinName("GUIDE")]
+			public JoinDataComplete Guide = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 42,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "GUIDE",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("INFO")]
+			public JoinDataComplete Info = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 43,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "INFO",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("MENU")]
+			public JoinDataComplete Menu = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 44,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "MENU",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("UP_ARROW")]
+			public JoinDataComplete DpadUp = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 45,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "UP_ARROW",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("DN_ARROW")]
+			public JoinDataComplete DpadDown = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 46,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "DN_ARROW",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("LEFT_ARROW")]
+			public JoinDataComplete DpadLeft = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 47,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "LEFT_ARROW",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("RIGHT_ARROW")]
+			public JoinDataComplete DpadRight = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 48,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "RIGHT_ARROW",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("SELECT")]
+			public JoinDataComplete DpadSelect = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 49,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "SELECT",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("OPTIONS")]
+			public JoinDataComplete Options = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 50,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "OPTIONS",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("RETURN")]
+			public JoinDataComplete Return = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 51,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "RETURN",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("DVR")]
+			public JoinDataComplete Dvr = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 52,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "DVR",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+
+			[JoinName("ON_DEMAND")]
+			public JoinDataComplete OnDemand = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 53,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "ON_DEMAND",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+
+			[JoinName("PAGE_UP")]
+			public JoinDataComplete PageUp = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 54,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "PAGE_UP",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("PAGE_DOWN")]
+			public JoinDataComplete PageDown = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 55,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "PAGE_DOWN",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("F_SRCH")]
+			public JoinDataComplete ForwardSearch = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 56,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "F_SRCH",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("R_SRCH")]
+			public JoinDataComplete ReverseSearch = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 57,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "R_SRCH",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("TRACK+")]
+			public JoinDataComplete TrackPlus = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 58,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "TRACK+",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("TRACK-")]
+			public JoinDataComplete TrackMinus = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 59,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "TRACK-",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+			
+			[JoinName("A")]
+			public JoinDataComplete KpA = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 61,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "A",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("B")]
+			public JoinDataComplete KpB = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 62,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "B",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("C")]
+			public JoinDataComplete KpC = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 63,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "C",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("D")]
+			public JoinDataComplete KpD = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 64,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "D",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("RED")]
+			public JoinDataComplete KpRed = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 65,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "RED",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("GREEN")]
+			public JoinDataComplete KpGreen = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 66,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "GREEN",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("YELLOW")]
+			public JoinDataComplete KpYellow = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 67,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "YELLOW",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			[JoinName("BLUE")]
+			public JoinDataComplete KpBlue = new JoinDataComplete(
+				new JoinData
+				{
+					JoinNumber = 68,
+					JoinSpan = 1
+				},
+				new JoinMetadata
+				{
+					Description = "BLUE",
+					JoinCapabilities = eJoinCapabilities.FromSIMPL,
+					JoinType = eJoinType.Digital
+				});
+
+			public GenericIrControllerJoinMap(uint joinStart)
+				: base(joinStart, typeof(GenericIrControllerJoinMap))
+			{
+			}
+	}
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/IRPortHelper.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/IRPortHelper.cs
index c75630e4..80ee2a2c 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/IRPortHelper.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/IRPortHelper.cs	
@@ -224,12 +224,18 @@ namespace PepperDash.Essentials.Core
 	/// </summary>
 	public class IrOutPortConfig
 	{
+		[JsonProperty("port")]
 		public IROutputPort Port { get; set; }
+		
+		[JsonProperty("fileName")]
 		public string FileName { get; set; }
 
+		[JsonProperty("useBridgeJoinMap")]
+		public bool UseBridgeJoinMap { get; set; }
+
 		public IrOutPortConfig()
 		{
-			FileName = "";
+			FileName = "";			
 		}
 	}
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs
index 409562a2..df76b726 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/GenericIRController.cs	
@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash_Essentials_Core.Bridges.JoinMaps;
 
 namespace PepperDash.Essentials.Core.Devices
 {
@@ -19,12 +19,11 @@ namespace PepperDash.Essentials.Core.Devices
 
         private readonly IrOutputPortController _port; 
 
-        public string[] IrCommands {get { return _port.IrFileCommands; }}
+        public string[] IrCommands {get { return _port.IrFileCommands; }}	    
 
         public GenericIrController(string key, string name, IrOutputPortController irPort) : base(key, name)
         {
             _port = irPort;
-
             if (_port == null)
             {
                 Debug.Console(0, this, Debug.ErrorLogLevel.Error, "IR Port is null, device will not function");
@@ -71,23 +70,65 @@ namespace PepperDash.Essentials.Core.Devices
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericIrControllerJoinMap>(joinMapSerialized);
 
-            for (uint i = 0; i < _port.IrFileCommands.Length; i++)
-            {
-                var cmd = _port.IrFileCommands[i];
-                var joinData = new JoinDataComplete(new JoinData {JoinNumber = i, JoinSpan = 1},
-                    new JoinMetadata
-                    {
-                        Description = cmd,
-                        JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                        JoinType = eJoinType.Digital
-                    });
+	        if (_port.UseBridgeJoinMap)
+	        {
+				Debug.Console(0, this, "Using new IR bridge join map");
 
-                joinData.SetJoinOffset(joinStart);
+		        var bridgeJoins = joinMap.Joins.Where((kv) => _port.IrFileCommands.Any(cmd => cmd == kv.Key)).ToDictionary(kv => kv.Key);
+		        if (bridgeJoins == null)
+		        {
+					Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Failed to link new IR bridge join map");
+			        return;
+		        }
 
-                joinMap.Joins.Add(cmd,joinData);
+				joinMap.Joins.Clear();
 
-                trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(cmd, b));
-            }
+		        foreach (var bridgeJoin in bridgeJoins)
+		        {
+			        var key = bridgeJoin.Key;
+			        var joinDataKey = bridgeJoin.Value.Key;
+			        var joinDataValue = bridgeJoin.Value.Value;
+			        var joinNumber = bridgeJoin.Value.Value.JoinNumber;					
+
+					Debug.Console(2, this, @"bridgeJoin: Key-'{0}'
+Value.Key-'{1}'
+Value.JoinNumber-'{2}'
+Value.Metadata.Description-'{3}'", 
+						key,
+						joinDataKey,
+						joinNumber,
+						joinDataValue.Metadata.Description);
+
+
+					joinMap.Joins.Add(key, joinDataValue);
+
+			        trilist.SetBoolSigAction(joinNumber, (b) => Press(key, b));
+		        }
+	        }
+	        else
+	        {
+				Debug.Console(0, this, "Using legacy IR join mapping based on available IR commands");
+
+				joinMap.Joins.Clear();
+
+				for (uint i = 0; i < _port.IrFileCommands.Length; i++)
+				{
+					var cmd = _port.IrFileCommands[i];
+					var joinData = new JoinDataComplete(new JoinData { JoinNumber = i, JoinSpan = 1 },
+						new JoinMetadata
+						{
+							Description = cmd,
+							JoinCapabilities = eJoinCapabilities.FromSIMPL,
+							JoinType = eJoinType.Digital
+						});
+
+					joinData.SetJoinOffset(joinStart);
+
+					joinMap.Joins.Add(cmd, joinData);
+
+					trilist.SetBoolSigAction(joinData.JoinNumber, (b) => Press(cmd, b));
+				}   
+	        }            
 
             joinMap.PrintJoinMapInfo();
 
@@ -109,13 +150,6 @@ namespace PepperDash.Essentials.Core.Devices
         }
     }
 
-    public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
-    {
-        public GenericIrControllerJoinMap(uint joinStart) : base(joinStart)
-        {
-        }
-    }
-
     public class GenericIrControllerFactory : EssentialsDeviceFactory<GenericIrController>
     {
         public GenericIrControllerFactory()
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs
index cce1d46e..d404b3ea 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IrOutputPortController.cs	
@@ -29,6 +29,8 @@ namespace PepperDash.Essentials.Core
 
         public string[] IrFileCommands { get { return IrPort.AvailableStandardIRCmds(IrPortUid); } }
 
+		public bool UseBridgeJoinMap { get; private set; }
+
 		/// <summary>
 		/// Constructor for IrDevice base class.  If a null port is provided, this class will 
 		/// still function without trying to talk to a port.
@@ -53,9 +55,10 @@ namespace PepperDash.Essentials.Core
 	        : base(key)
 	    {
             DriverLoaded = new BoolFeedback(() => DriverIsLoaded);
+			UseBridgeJoinMap = config.Properties["control"].Value<bool>("useBridgeJoinMap");
             AddPostActivationAction(() =>
             {
-                IrPort = postActivationFunc(config);
+	            IrPort = postActivationFunc(config);
 
                 if (IrPort == null)
                 {
@@ -67,8 +70,8 @@ namespace PepperDash.Essentials.Core
                 Debug.Console(1, "*************Attempting to load IR file: {0}***************", filePath);
 
                 LoadDriver(filePath);
-                    
-                PrintAvailableCommands();
+                
+				PrintAvailableCommands();
             });
 	    }
 
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index a0da04f9..aa2359bf 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -127,6 +127,7 @@
     <Compile Include="Bridges\IBridge.cs" />
     <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\GenericIrControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\HdPsXxxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IAnalogInputJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IDigitalOutputJoinMap.cs" />