diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs
index 7adf3d8292..c07831e44d 100644
--- a/BizHawk.MultiClient/Config.cs
+++ b/BizHawk.MultiClient/Config.cs
@@ -9,102 +9,6 @@ namespace BizHawk.MultiClient
 	{
 		public Config()
 		{
-			/*
-			SMSController[0] = new SMSControllerTemplate(true);
-			SMSController[1] = new SMSControllerTemplate(false);
-			PCEController[0] = new PCEControllerTemplate(true);
-			PCEController[1] = new PCEControllerTemplate(false);
-			PCEController[2] = new PCEControllerTemplate(false);
-			PCEController[3] = new PCEControllerTemplate(false);
-			PCEController[4] = new PCEControllerTemplate(false);
-			NESController[0] = new NESControllerTemplate(true);
-			NESController[1] = new NESControllerTemplate(false);
-			NESController[2] = new NESControllerTemplate(false);
-			NESController[3] = new NESControllerTemplate(false);
-			SNESController[0] = new SNESControllerTemplate(true);
-			SNESController[1] = new SNESControllerTemplate(false);
-			SNESController[2] = new SNESControllerTemplate(false);
-			SNESController[3] = new SNESControllerTemplate(false);
-			GBController[0] = new GBControllerTemplate(true);
-			DualGBController[0] = new DualGBControllerTemplate(true);
-			AutoDualGBController[0] = new DualGBControllerTemplate(true);
-			GBAutoController[0] = new GBControllerTemplate(true);
-			TI83Controller[0] = new TI83ControllerTemplate(true);
-
-			GBAController[0] = new GBAControllerTemplate(true);
-			GBAAutoController[0] = new GBAControllerTemplate(false);
-
-			GenesisController[0] = new GenControllerTemplate(true);
-			GenesisAutoController[0] = new GenControllerTemplate(false);
-
-			SaturnController[0] = new SaturnControllerTemplate(true);
-			SaturnController[1] = new SaturnControllerTemplate(false);
-
-			SaturnAutoController[0] = new SaturnControllerTemplate(false);
-			SaturnAutoController[1] = new SaturnControllerTemplate(false);
-
-			Atari2600Controller[0] = new SingleButtonJoyStickTemplate(true);
-			Atari2600Controller[1] = new SingleButtonJoyStickTemplate(false);
-			Atari2600AutoController[0] = new SingleButtonJoyStickTemplate(false);
-			Atari2600AutoController[1] = new SingleButtonJoyStickTemplate(false);
-			Atari2600ConsoleButtons[0] = new Atari2600ConsoleButtonsTemplate(true);
-
-			Atari7800Controller[0] = new DoubleButtonJoyStickTemplate(true);
-			Atari7800Controller[1] = new DoubleButtonJoyStickTemplate(false);
-			Atari7800AutoController[0] = new DoubleButtonJoyStickTemplate(false);
-			Atari7800AutoController[1] = new DoubleButtonJoyStickTemplate(false);
-			Atari7800ConsoleButtons[0] = new Atari7800ConsoleButtonsTemplate(true);
-
-			NESAutoController[0] = new NESControllerTemplate(false);
-			NESAutoController[1] = new NESControllerTemplate(false);
-			NESAutoController[2] = new NESControllerTemplate(false);
-			NESAutoController[3] = new NESControllerTemplate(false);
-
-			SMSAutoController[0] = new SMSControllerTemplate(false);
-			SMSAutoController[1] = new SMSControllerTemplate(false);
-
-			PCEAutoController[0] = new PCEControllerTemplate(false);
-			PCEAutoController[1] = new PCEControllerTemplate(false);
-			PCEAutoController[2] = new PCEControllerTemplate(false);
-			PCEAutoController[3] = new PCEControllerTemplate(false);
-			PCEAutoController[4] = new PCEControllerTemplate(false);
-
-			SNESAutoController[0] = new SNESControllerTemplate(false);
-			SNESAutoController[1] = new SNESControllerTemplate(false);
-			SNESAutoController[2] = new SNESControllerTemplate(false);
-			SNESAutoController[3] = new SNESControllerTemplate(false);
-
-			N64Controller[0] = new N64ButtonsTemplate(true);
-			N64Controller[1] = new N64ButtonsTemplate(false);
-			N64Controller[2] = new N64ButtonsTemplate(false);
-			N64Controller[3] = new N64ButtonsTemplate(false);
-			N64AutoController[0] = new N64ButtonsTemplate(false);
-			N64AutoController[1] = new N64ButtonsTemplate(false);
-			N64AutoController[2] = new N64ButtonsTemplate(false);
-			N64AutoController[3] = new N64ButtonsTemplate(false);
-			N64ConsoleButtons = new Standard2ButtonConsoleTemplate(true);
-
-			ColecoController[0] = new ColecoVisionControllerTemplate(true);
-			ColecoController[1] = new ColecoVisionControllerTemplate(false);
-			ColecoAutoController[0] = new ColecoVisionControllerTemplate(false);
-			ColecoAutoController[1] = new ColecoVisionControllerTemplate(false);
-
-			IntellivisionController[0] = new IntellivisionControllerTemplate(true);
-			IntellivisionController[1] = new IntellivisionControllerTemplate(false);
-			IntellivisionAutoController[0] = new IntellivisionControllerTemplate(false);
-			IntellivisionAutoController[1] = new IntellivisionControllerTemplate(false);
-
-			C64Joysticks[0] = new SingleButtonJoyStickTemplate(true, true);
-			C64Joysticks[1] = new SingleButtonJoyStickTemplate(false);
-			C64AutoJoysticks[0] = new SingleButtonJoyStickTemplate(false);
-			C64AutoJoysticks[1] = new SingleButtonJoyStickTemplate(false);
-			C64Keyboard = new C64KeyboardTemplate(true);
-
-			NESConsoleButtons = new NESConsoleButtonTemplate();
-			SNESConsoleButtons = new NESConsoleButtonTemplate();
-			SMSConsoleButtons = new SMSConsoleButtonTemplate();
-			GenesisConsoleButtons = new GenConsoleButtonTemplate();
-			*/
 		}
 
 		// Directories
@@ -858,66 +762,36 @@ namespace BizHawk.MultiClient
 		public bool GGShowClippedRegions = false;
 		public bool GGHighlightActiveDisplayRegion = false;
 
-		//public SMSControllerTemplate[] SMSController = new SMSControllerTemplate[2];
-		//public SMSControllerTemplate[] SMSAutoController = new SMSControllerTemplate[2];
-		//public SMSConsoleButtonTemplate SMSConsoleButtons = new SMSConsoleButtonTemplate();
-
 		// PCEngine Settings
 		public bool PceSpriteLimit = false;
 		public bool PceEqualizeVolume = false;
 		public bool PceArcadeCardRewindHack = true;
-		//public PCEControllerTemplate[] PCEController = new PCEControllerTemplate[5];
-		//public PCEControllerTemplate[] PCEAutoController = new PCEControllerTemplate[5];
 
 		// Genesis Settings
-		//public GenControllerTemplate[] GenesisController = new GenControllerTemplate[1];
-		//public GenControllerTemplate[] GenesisAutoController = new GenControllerTemplate[1];
-		//public GenConsoleButtonTemplate GenesisConsoleButtons = new GenConsoleButtonTemplate();
 
 		//Atari 2600 Settings
-		//public SingleButtonJoyStickTemplate[] Atari2600Controller = new SingleButtonJoyStickTemplate[2];
-		//public SingleButtonJoyStickTemplate[] Atari2600AutoController = new SingleButtonJoyStickTemplate[2];
-		//public Atari2600ConsoleButtonsTemplate[] Atari2600ConsoleButtons = new Atari2600ConsoleButtonsTemplate[1];
 		public bool Atari2600_BW = false;
 		public bool Atari2600_LeftDifficulty = true;
 		public bool Atari2600_RightDifficulty = true;
 
 		//Atari 7800 Settings
-		//public DoubleButtonJoyStickTemplate[] Atari7800Controller = new DoubleButtonJoyStickTemplate[2];
-		//public DoubleButtonJoyStickTemplate[] Atari7800AutoController = new DoubleButtonJoyStickTemplate[2];
-		//public Atari7800ConsoleButtonsTemplate[] Atari7800ConsoleButtons = new Atari7800ConsoleButtonsTemplate[1];
 
 		//ColecoVision
-		//public ColecoVisionControllerTemplate[] ColecoController = new ColecoVisionControllerTemplate[2];
-		//public ColecoVisionControllerTemplate[] ColecoAutoController = new ColecoVisionControllerTemplate[2];
 
 		//Intellivision
-		//public IntellivisionControllerTemplate[] IntellivisionController = new IntellivisionControllerTemplate[2];
-		//public IntellivisionControllerTemplate[] IntellivisionAutoController = new IntellivisionControllerTemplate[2];
 
 		//NES settings
-		//public NESControllerTemplate[] NESController = new NESControllerTemplate[4];
-		//public NESControllerTemplate[] NESAutoController = new NESControllerTemplate[4];
-		//public NESConsoleButtonTemplate NESConsoleButtons = new NESConsoleButtonTemplate();
 
 		//SNES settings
-		//public SNESControllerTemplate[] SNESController = new SNESControllerTemplate[4];
-		//public SNESControllerTemplate[] SNESAutoController = new SNESControllerTemplate[4];
-		//public NESConsoleButtonTemplate SNESConsoleButtons = new NESConsoleButtonTemplate();
 		public string SNESProfile = "Compatibility";
 		public bool SNESUseRingBuffer = true;
 		public bool SNESAlwaysDoubleSize = false;
 
-		//public N64ButtonsTemplate[] N64Controller = new N64ButtonsTemplate[4];
-		//public N64ButtonsTemplate[] N64AutoController = new N64ButtonsTemplate[4];
-		//public Standard2ButtonConsoleTemplate N64ConsoleButtons = new Standard2ButtonConsoleTemplate();
+		//N64 settings
 
 		//TI 83 settings
-		//public TI83ControllerTemplate[] TI83Controller = new TI83ControllerTemplate[1];
 
 		//GB settings
-		//public GBControllerTemplate[] GBController = new GBControllerTemplate[1];
-		//public GBControllerTemplate[] GBAutoController = new GBControllerTemplate[1];
 		public bool GB_ForceDMG = false;
 		public bool GB_GBACGB = false;
 		public bool GB_MulticartCompat = false;
@@ -926,23 +800,12 @@ namespace BizHawk.MultiClient
 		public Emulation.Consoles.GB.GBColors.ColorType CGBColors = Emulation.Consoles.GB.GBColors.ColorType.gambatte;
 
 		//Dual Gb
-		//public DualGBControllerTemplate[] DualGBController = new DualGBControllerTemplate[1];
-		//public DualGBControllerTemplate[] AutoDualGBController = new DualGBControllerTemplate[1];
 
 		//GBA settings
-		//public GBAControllerTemplate[] GBAController = new GBAControllerTemplate[1];
-		//public GBAControllerTemplate[] GBAAutoController = new GBAControllerTemplate[1];
 
 		//Saturn
-		//public SaturnControllerTemplate[] SaturnController = new SaturnControllerTemplate[2];
-		//public SaturnControllerTemplate[] SaturnAutoController = new SaturnControllerTemplate[2];
-		//public SaturnConsoleButtonTemplate SaturnConsoleButtons = new SaturnConsoleButtonTemplate();
 
 		//Commodore 64 Settings
-		//public SingleButtonJoyStickTemplate[] C64Joysticks = new SingleButtonJoyStickTemplate[2];
-		//public SingleButtonJoyStickTemplate[] C64AutoJoysticks = new SingleButtonJoyStickTemplate[2]; 
-		//public C64KeyboardTemplate C64Keyboard = new C64KeyboardTemplate();
-		//public C64KeyboardTemplate C64AutofireKeyboard = new C64KeyboardTemplate();
 
 		//GIF Animator Settings
 		public int GifAnimatorNumFrames;
@@ -982,988 +845,6 @@ namespace BizHawk.MultiClient
 		public bool Atari2600_ShowPlayfield = true;
 	}
 
-	/*
-	public class NESConsoleButtonTemplate : iControllerConfigObject
-	{
-		public string Reset = "";
-		public string Power = "";
-		//public string FDS_Eject = ""; //Not supporting this for now
-		//public string FDS_Insert = ""; //Need to support inserting of disk 1,2,3,4,etc so not supporting this for now
-		//public string VS_Coin_1 = ""; //Not supported yet
-		//public string VS_Coin_2 = ""; //Not supported yet
-
-		public void SetDefaults()
-		{
-			Reset = "";
-			Power = "";
-		}
-	}
-
-	public class SMSConsoleButtonTemplate : iControllerConfigObject
-	{
-		public string Reset = "C";
-		public string Pause = "V, X1 Start";
-
-		public void SetDefaults()
-		{
-			Reset = "C";
-			Pause = "V, X1 Start";
-		}
-	}
-
-	public class SaturnConsoleButtonTemplate : iControllerConfigObject
-	{
-		public string Reset = "";
-		public string Power = "";
-
-		public void SetDefaults()
-		{
-			Reset = "";
-			Power = "";
-		}
-	}
-
-
-	public class GenConsoleButtonTemplate : iControllerConfigObject
-	{
-		public string Reset = "";
-
-		public void SetDefaults()
-		{
-			Reset = "";
-		}
-	}
-
-	public class SMSControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string B1 = "";
-		public string B2 = "";
-		public bool Enabled = false;
-		public SMSControllerTemplate() { }
-		public SMSControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			B1 = "Z, X1 A";
-			B2 = "X, X1 B";
-		}
-	}
-
-	public class PCEControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string I = "";
-		public string II = "";
-		public string Select = "";
-		public string Run = "";
-		public bool Enabled = false;
-		public PCEControllerTemplate() { }
-		public PCEControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			I = "Z, X1 B";
-			II = "X, X1 A";
-			Run = "C, X1 Start";
-			Select = "V, X1 Back";
-		}
-	}
-
-	public class SNESControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string A = "";
-		public string B = "";
-		public string Start = "";
-		public string Select = "";
-		public string Y = "";
-		public string X = "";
-		public string L = "";
-		public string R = "";
-		public bool Enabled = false;
-		public SNESControllerTemplate() { }
-		public SNESControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			A = "X, X1 B";
-			B = "Z, X1 A";
-			Y = "A, X1 X";
-			X = "S, X1 Y";
-			L = "W, X1 LeftTrigger";
-			R = "E, X1 RightTrigger";
-			Start = "Return, X1 Start";
-			Select = "Space, X1 Back";
-		}
-	}
-
-	public class GBAControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string A = "";
-		public string B = "";
-		public string Start = "";
-		public string Select = "";
-		public string L = "";
-		public string R = "";
-		public string Power = "";
-		public bool Enabled = false;
-		public GBAControllerTemplate() { }
-		public GBAControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			A = "X, X1 B";
-			B = "Z, X1 A";
-			L = "W, X1 LeftTrigger";
-			R = "E, X1 RightTrigger";
-			Start = "Return, X1 Start";
-			Select = "Space, X1 Back";
-			Power = "";
-		}
-	}
-
-	public class NESControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string A = "";
-		public string B = "";
-		public string Select = "";
-		public string Start = "";
-		public bool Enabled = false;
-		public NESControllerTemplate() { }
-		public NESControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			A = "X, X1 B";
-			B = "Z, X1 A";
-			Start = "Return, X1 Start";
-			Select = "Space, X1 Back";
-		}
-	}
-
-	public class GBControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string A = "";
-		public string B = "";
-		public string Select = "";
-		public string Start = "";
-		public string Power = "";
-		public bool Enabled = false;
-		public GBControllerTemplate() { }
-		public GBControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			A = "X, X1 B";
-			B = "Z, X1 A";
-			Start = "Return, X1 Start";
-			Select = "Space, X1 Back";
-			Power = "";
-		}
-	}
-
-	public class DualGBControllerTemplate : iControllerConfigObject
-	{
-		public string P1_Up = "";
-		public string P1_Down = "";
-		public string P1_Left = "";
-		public string P1_Right = "";
-		public string P1_A = "";
-		public string P1_B = "";
-		public string P1_Select = "";
-		public string P1_Start = "";
-		public string P1_Power = "";
-
-		public string P2_Up = "";
-		public string P2_Down = "";
-		public string P2_Left = "";
-		public string P2_Right = "";
-		public string P2_A = "";
-		public string P2_B = "";
-		public string P2_Select = "";
-		public string P2_Start = "";
-		public string P2_Power = "";
-
-		public bool Enabled = false;
-		public DualGBControllerTemplate() { }
-		public DualGBControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			P1_Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			P1_Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			P1_Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			P1_Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			P1_A = "X, X1 B";
-			P1_B = "Z, X1 A";
-			P1_Start = "Return, X1 Start";
-			P1_Select = "Space, X1 Back";
-			P1_Power = "";
-
-			P2_Up = "NumberPad8";
-			P2_Down = "NumberPad2";
-			P2_Left = "NumberPad4";
-			P2_Right = "NumberPad6";
-			P2_A = "C";
-			P2_B = "V";
-			P2_Select = "";
-			P2_Start = "";
-			P2_Power = "";
-		}
-	}
-
-	public class SaturnControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string A = "";
-		public string B = "";
-		public string C = "";
-		public string X = "";
-		public string Y = "";
-		public string Z = "";
-		public string L = "";
-		public string R = "";
-		public string Start = "";
-		public bool Enabled;
-
-		public SaturnControllerTemplate() { }
-		public SaturnControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-		public void SetDefaults()
-		{
-			Enabled = true;
-		}
-	}
-
-	public class GenControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string A = "";
-		public string B = "";
-		public string C = "";
-		public string Start = "";
-		public bool Enabled;
-
-		public GenControllerTemplate() { }
-		public GenControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			A = "Z, X1 A";
-			B = "X, X1 X";
-			C = "C, X1 Y";
-			Start = "Return, X1 Start";
-		}
-	}
-
-	public class SingleButtonJoyStickTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string Button = "";
-		public bool Enabled;
-		public bool UseNumpad;
-
-		public SingleButtonJoyStickTemplate() { }
-		public SingleButtonJoyStickTemplate(bool defaults, bool useNumpad = false)
-		{
-			UseNumpad = useNumpad;
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			if (UseNumpad)
-			{
-				Enabled = true;
-				Up = "NumberPad8, X1 DpadUp, X1 LStickUp";
-				Down = "NumberPad2, X1 DpadDown, X1 LStickDown";
-				Left = "NumberPad4, X1 DpadLeft, X1 LStickLeft";
-				Right = "NumberPad6, X1 DpadRight, X1 LStickRight";
-				Button = "NumberPad8, X1 A";
-			}
-			else
-			{
-				Enabled = true;
-				Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-				Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-				Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-				Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-				Button = "Z, X1 A";
-			}
-		}
-	}
-
-	public class DoubleButtonJoyStickTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string Button1 = "";
-		public string Button2 = "";
-		public bool Enabled;
-
-		public DoubleButtonJoyStickTemplate() { }
-		public DoubleButtonJoyStickTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			Button1 = "Z, X1 A";
-			Button2 = "X, X1 X";
-		}
-	}
-
-	public class Atari2600ConsoleButtonsTemplate : iControllerConfigObject
-	{
-		public string Reset = "C";
-		public string Select = "V, X1 Start";
-		public bool Enabled = false;
-
-		public Atari2600ConsoleButtonsTemplate() { }
-		public Atari2600ConsoleButtonsTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Reset = "";
-			Select = "";
-		}
-	}
-
-	public class Atari7800ConsoleButtonsTemplate : iControllerConfigObject
-	{
-		public string Power = "";
-		public string Reset = "C";
-		public string Select = "V, X1 Start";
-		public string Pause = "";
-		public bool Enabled = false;
-
-		public Atari7800ConsoleButtonsTemplate() { }
-		public Atari7800ConsoleButtonsTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Reset = "";
-			Select = "";
-			Pause = "";
-		}
-	}
-
-	public class N64ButtonsTemplate : iControllerConfigObject
-	{
-		public string DPadU = "";
-		public string DPadD = "";
-		public string DPadL = "";
-		public string DPadR = "";
-		public string Start = "";
-		public string Z = "";
-		public string B = "";
-		public string A = "";
-		public string CUp = "";
-		public string CDown = "";
-		public string CLeft = "";
-		public string CRight = "";
-		public string L = "";
-		public string R = "";
-
-		public bool Enabled = false;
-
-		public N64ButtonsTemplate() { }
-		public N64ButtonsTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			DPadU = "UpArrow, X1 DpadUp, X1 LStickUp";
-			DPadD = "DownArrow, X1 DpadDown, X1 LStickDown";
-			DPadL = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			DPadR = "RightArrow, X1 DpadRight, X1 LStickRight";
-			Start = "V, X1 Start";
-			Z = "Z, X1 A";
-			B = "X, X1 X";
-			A = "C";
-			CUp = "NumberPad8, J1 RotationZ-";
-			CDown = "NumberPad2, J1 RoationZ+";
-			CLeft = "NumberPad4, J1 Z-";
-			CRight = "NumberPad6, J1 Z+";
-			L = "D";
-			R = "F";
-
-			Enabled = true;
-		}
-	}
-
-	public class Standard2ButtonConsoleTemplate : iControllerConfigObject
-	{
-		public string Power = "";
-		public string Reset = "";
-		public bool Enabled = false;
-
-		public Standard2ButtonConsoleTemplate() { }
-		public Standard2ButtonConsoleTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Power = "";
-			Reset = "";
-		}
-	}
-
-	public class ColecoVisionControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string L = "";
-		public string R = "";
-		public string _1 = "";
-		public string _2 = "";
-		public string _3 = "";
-		public string _4 = "";
-		public string _5 = "";
-		public string _6 = "";
-		public string _7 = "";
-		public string _8 = "";
-		public string _9 = "";
-		public string Star = "";
-		public string _0 = "";
-		public string Pound = "";
-		public bool Enabled;
-
-		public ColecoVisionControllerTemplate() { }
-		public ColecoVisionControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			L = "Z, J1 B1";
-			R = "X, J1 B1";
-			_0 = "NumberPad0";
-			_1 = "NumberPad1";
-			_2 = "NumberPad2";
-			_3 = "NumberPad3";
-			_4 = "NumberPad4";
-			_5 = "NumberPad5";
-			_6 = "NumberPad6";
-			_7 = "NumberPad7";
-			_8 = "NumberPad8";
-			_9 = "NumberPad9";
-			Pound = "NumberPadPeriod";
-			Star = "NumberPadEnter";
-		}
-	}
-
-	public class IntellivisionControllerTemplate : iControllerConfigObject
-	{
-		public string Up = "";
-		public string Down = "";
-		public string Left = "";
-		public string Right = "";
-		public string L = "";
-		public string R = "";
-		public string _1 = "";
-		public string _2 = "";
-		public string _3 = "";
-		public string _4 = "";
-		public string _5 = "";
-		public string _6 = "";
-		public string _7 = "";
-		public string _8 = "";
-		public string _9 = "";
-		public string Enter = "";
-		public string _0 = "";
-		public string Clear = "";
-		
-		public bool Enabled;
-
-		public IntellivisionControllerTemplate() { }
-		public IntellivisionControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			Up = "UpArrow, X1 DpadUp, X1 LStickUp";
-			Down = "DownArrow, X1 DpadDown, X1 LStickDown";
-			Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
-			Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-			L = "Z, J1 B1";
-			R = "X, J1 B1";
-			_0 = "NumberPad0";
-			_1 = "NumberPad1";
-			_2 = "NumberPad2";
-			_3 = "NumberPad3";
-			_4 = "NumberPad4";
-			_5 = "NumberPad5";
-			_6 = "NumberPad6";
-			_7 = "NumberPad7";
-			_8 = "NumberPad8";
-			_9 = "NumberPad9";
-			Enter = "NumberPadPeriod";
-			Clear = "NumberPadEnter";
-		}
-	}
-
-	public class C64KeyboardTemplate : iControllerConfigObject
-	{
-		public string F1 = "";
-		public string F3 = "";
-		public string F5 = "";
-		public string F7 = "";
-
-		public string Left_Arrow = "";
-		public string _1 = "";
-		public string _2 = "";
-		public string _3 = "";
-		public string _4 = "";
-		public string _5 = "";
-		public string _6 = "";
-		public string _7 = "";
-		public string _8 = "";
-		public string _9 = "";
-		public string _0 = "";
-		public string Plus = "";
-		public string Minus = "";
-		public string Pound = "";
-		public string Clear_Home = "";
-		public string Insert_Delete = "";
-
-		public string Control = "";
-		public string Q = "";
-		public string W = "";
-		public string E = "";
-		public string R = "";
-		public string T = "";
-		public string Y = "";
-		public string U = "";
-		public string I = "";
-		public string O = "";
-		public string P = "";
-		public string At = "";
-		public string Asterisk = "";
-		public string Up_Arrow = "";
-		public string Restore = "";
-
-		public string Run_Stop = "";
-		public string Lck = "";
-		public string A = "";
-		public string S = "";
-		public string D = "";
-		public string F = "";
-		public string G = "";
-		public string H = "";
-		public string J = "";
-		public string K = "";
-		public string L = "";
-		public string Colon = "";
-		public string Semicolon = "";
-		public string Equal = "";
-		public string Return = "";
-
-		public string Commodore = "";
-		public string Left_Shift = "";
-		public string Z = "";
-		public string X = "";
-		public string C = "";
-		public string V = "";
-		public string B = "";
-		public string N = "";
-		public string M = "";
-		public string Comma = "";
-		public string Period = "";
-		public string Slash = "";
-		public string Right_Shift = "";
-		public string Cursor_Up_Down = "";
-		public string Cursor_Left_Right = "";
-
-		public string Space = "";
-
-		public bool enabled = false;
-
-		public C64KeyboardTemplate() { }
-		public C64KeyboardTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			F1 = "F1";
-			F3 = "F3";
-			F5 = "F5";
-			F7 = "F7";
-
-			Left_Arrow = "Grave";
-			_1 = "D1";
-			_2 = "D2";
-			_3 = "D3";
-			_4 = "D4";
-			_5 = "D5";
-			_6 = "D6";
-			_7 = "D7";
-			_8 = "D8";
-			_9 = "D9";
-			_0 = "D0";
-			Plus = "Equals";
-			Minus = "Minus";
-			Pound = "Insert";
-			Clear_Home = "Delete";
-			Insert_Delete = "Backspace";
-
-			Control = "Tab";
-			Q = "Q";
-			W = "W";
-			E = "E";
-			R = "R";
-			T = "T";
-			Y = "Y";
-			U = "U";
-			I = "I";
-			O = "O";
-			P = "P";
-			At = "LeftBracket";
-			Asterisk = "RightBracket";
-			Up_Arrow = "Backslash";
-
-			Run_Stop = "CapsLock";
-			A = "A";
-			S = "S";
-			D = "D";
-			F = "F";
-			G = "G";
-			H = "H";
-			J = "J";
-			K = "K";
-			L = "L";
-			Colon = "Semicolon";
-			Semicolon = "Apostrophe";
-			Equal = "RightControl";
-			Return = "Return";
-
-			Commodore = "LeftControl";
-			Left_Shift = "LeftShift";
-			Z = "Z";
-			X = "X";
-			C = "C";
-			V = "V";
-			B = "B";
-			N = "N";
-			M = "M";
-			Comma = "Comma";
-			Period = "Period";
-			Slash = "Slash";
-			Right_Shift = "RightShift";
-			Cursor_Up_Down = "DownArrow";
-			Cursor_Left_Right = "RightArrow";
-
-			Space = "Space";
-		}
-	}
-
-	public class TI83ControllerTemplate : iControllerConfigObject
-	{
-		public string _0 = "";
-		public string _1 = "";
-		public string _2 = "";
-		public string _3 = "";
-		public string _4 = "";
-		public string _5 = "";
-		public string _6 = "";
-		public string _7 = "";
-		public string _8 = "";
-		public string _9 = "";
-		public string DOT = "";
-		public string ON = "";
-		public string ENTER = "";
-		public string DOWN = "";
-		public string UP = "";
-		public string LEFT = "";
-		public string RIGHT = "";
-		public string PLUS = "";
-		public string MINUS = "";
-		public string MULTIPLY = "";
-		public string DIVIDE = "";
-		public string CLEAR = "";
-		public string EXP = "";
-		public string DASH = "";
-		public string PARACLOSE = "";
-		public string TAN = "";
-		public string VARS = "";
-		public string PARAOPEN = "";
-		public string COS = "";
-		public string PRGM = "";
-		public string STAT = "";
-		public string SIN = "";
-		public string MATRIX = "";
-		public string X = "";
-		public string STO = "";
-		public string LN = "";
-		public string LOG = "";
-		public string SQUARED = "";
-		public string NEG1 = "";
-		public string MATH = "";
-		public string ALPHA = "";
-		public string GRAPH = "";
-		public string TRACE = "";
-		public string ZOOM = "";
-		public string WINDOW = "";
-		public string Y = "";
-		public string SECOND = "";
-		public string MODE = "";
-		public string DEL = "";
-		public string COMMA = "";
-
-		public bool Enabled = false;
-
-		public TI83ControllerTemplate() { }
-		public TI83ControllerTemplate(bool defaults)
-		{
-			if (defaults)
-			{
-				SetDefaults();
-			}
-		}
-
-		public void SetDefaults()
-		{
-			Enabled = true;
-			_0 = "NumberPad0";      //0
-			_1 = "NumberPad1";      //1
-			_2 = "NumberPad2";      //2
-			_3 = "NumberPad3";      //3
-			_4 = "NumberPad4";      //4
-			_5 = "NumberPad5";      //5
-			_6 = "NumberPad6";      //6
-			_7 = "NumberPad7";      //7
-			_8 = "NumberPad8";      //8
-			_9 = "NumberPad9";      //9
-			DOT = "NumberPadPeriod";//10
-			ON = "Space";           //11
-			ENTER = "Return, NumberPadEnter";       //12
-			UP = "UpArrow";         //13
-			DOWN = "DownArrow";     //14
-			LEFT = "LeftArrow";     //15
-			RIGHT = "RightArrow";   //16
-			PLUS = "NumberPadPlus"; //17
-			MINUS = "NumberPadMinus";     //18
-			MULTIPLY = "NumberPadStar";   //19
-			DIVIDE = "NumberPadSlash";    //20
-			CLEAR = "Escape";       //21
-			EXP = "6";              //22
-			DASH = "Minus";         //23
-			PARACLOSE = "0";        //24
-			PARAOPEN = "9";         //25
-			TAN = "T";              //26
-			VARS = "V";             //27
-			COS = "C";              //28
-			PRGM = "R";             //29
-			STAT = "S";             //30
-			MATRIX = "LeftBracket"; //31
-			X = "X";                //32
-			STO = "Insert";         //33
-			LN = "L";               //34
-			LOG = "O";              //35
-			SQUARED = "2";          //36
-			NEG1 = "1";             //37
-			MATH = "M";             //38
-			ALPHA = "A";            //39
-			GRAPH = "G";            //40
-			TRACE = "Home";         //41
-			ZOOM = "Z";             //42
-			WINDOW = "W";           //43
-			Y = "Y";                //44
-			SECOND = "Slash";       //45
-			MODE = "BackSlash";     //46
-			DEL = "Delete";         //47
-			COMMA = "Comma";        //48
-			SIN = "Period";         //49
-		}
-	}
-	*/
-	public interface iControllerConfigObject
-	{
-		void SetDefaults();
-	}
-	
-
 	public enum PLUGINTYPE { RICE, GLIDE }; 
 
 	public interface iPluginSettings
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 719e07a349..45fdafeb71 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -804,838 +804,7 @@ namespace BizHawk.MultiClient
 
 			Global.NullControls = new Controller(NullEmulator.NullController);
 			Global.AutofireNullControls = new AutofireController(NullEmulator.NullController);
-			/*
-			var smsControls = new Controller(SMS.SmsController);
-			smsControls.BindMulti("Reset", Global.Config.SMSConsoleButtons.Reset);
-			smsControls.BindMulti("Pause", Global.Config.SMSConsoleButtons.Pause);
-			for (int i = 0; i < 2; i++)
-			{
-				smsControls.BindMulti(string.Format("P{0} Up", i + 1), Global.Config.SMSController[i].Up);
-				smsControls.BindMulti(string.Format("P{0} Left", i + 1), Global.Config.SMSController[i].Left);
-				smsControls.BindMulti(string.Format("P{0} Right", i + 1), Global.Config.SMSController[i].Right);
-				smsControls.BindMulti(string.Format("P{0} Down", i + 1), Global.Config.SMSController[i].Down);
-				smsControls.BindMulti(string.Format("P{0} B1", i + 1), Global.Config.SMSController[i].B1);
-				smsControls.BindMulti(string.Format("P{0} B2", i + 1), Global.Config.SMSController[i].B2);
-			}
-			Global.SMSControls = smsControls;
 
-			var asmsControls = new AutofireController(SMS.SmsController) {Autofire = true};
-			asmsControls.BindMulti("Reset", Global.Config.SMSConsoleButtons.Reset);
-			asmsControls.BindMulti("Pause", Global.Config.SMSConsoleButtons.Pause);
-			for (int i = 0; i < 2; i++)
-			{
-				asmsControls.BindMulti(string.Format("P{0} Up", i + 1), Global.Config.SMSAutoController[i].Up);
-				asmsControls.BindMulti(string.Format("P{0} Left", i + 1), Global.Config.SMSAutoController[i].Left);
-				asmsControls.BindMulti(string.Format("P{0} Right", i + 1), Global.Config.SMSAutoController[i].Right);
-				asmsControls.BindMulti(string.Format("P{0} Down", i + 1), Global.Config.SMSAutoController[i].Down);
-				asmsControls.BindMulti(string.Format("P{0} B1", i + 1), Global.Config.SMSAutoController[i].B1);
-				asmsControls.BindMulti(string.Format("P{0} B2", i + 1), Global.Config.SMSAutoController[i].B2);
-			}
-			Global.AutofireSMSControls = asmsControls;
-
-			var pceControls = new Controller(PCEngine.PCEngineController);
-			for (int i = 0; i < 5; i++)
-			{
-				pceControls.BindMulti("P" + (i + 1) + " Up", Global.Config.PCEController[i].Up);
-				pceControls.BindMulti("P" + (i + 1) + " Down", Global.Config.PCEController[i].Down);
-				pceControls.BindMulti("P" + (i + 1) + " Left", Global.Config.PCEController[i].Left);
-				pceControls.BindMulti("P" + (i + 1) + " Right", Global.Config.PCEController[i].Right);
-
-				pceControls.BindMulti("P" + (i + 1) + " B2", Global.Config.PCEController[i].II);
-				pceControls.BindMulti("P" + (i + 1) + " B1", Global.Config.PCEController[i].I);
-				pceControls.BindMulti("P" + (i + 1) + " Select", Global.Config.PCEController[i].Select);
-				pceControls.BindMulti("P" + (i + 1) + " Run", Global.Config.PCEController[i].Run);
-			}
-			Global.PCEControls = pceControls;
-
-			var apceControls = new AutofireController(PCEngine.PCEngineController) {Autofire = true};
-			for (int i = 0; i < 5; i++)
-			{
-				apceControls.BindMulti("P" + (i + 1) + " Up", Global.Config.PCEAutoController[i].Up);
-				apceControls.BindMulti("P" + (i + 1) + " Down", Global.Config.PCEAutoController[i].Down);
-				apceControls.BindMulti("P" + (i + 1) + " Left", Global.Config.PCEAutoController[i].Left);
-				apceControls.BindMulti("P" + (i + 1) + " Right", Global.Config.PCEAutoController[i].Right);
-
-				apceControls.BindMulti("P" + (i + 1) + " B2", Global.Config.PCEAutoController[i].II);
-				apceControls.BindMulti("P" + (i + 1) + " B1", Global.Config.PCEAutoController[i].I);
-				apceControls.BindMulti("P" + (i + 1) + " Select", Global.Config.PCEAutoController[i].Select);
-				apceControls.BindMulti("P" + (i + 1) + " Run", Global.Config.PCEAutoController[i].Run);
-			}
-			Global.AutofirePCEControls = apceControls;
-
-			var snesControls = new Controller(LibsnesCore.SNESController);
-
-			for (int i = 0; i < 4; i++)
-			{
-				snesControls.BindMulti("P" + (i + 1) + " Up", Global.Config.SNESController[i].Up);
-				snesControls.BindMulti("P" + (i + 1) + " Down", Global.Config.SNESController[i].Down);
-				snesControls.BindMulti("P" + (i + 1) + " Left", Global.Config.SNESController[i].Left);
-				snesControls.BindMulti("P" + (i + 1) + " Right", Global.Config.SNESController[i].Right);
-				snesControls.BindMulti("P" + (i + 1) + " A", Global.Config.SNESController[i].A);
-				snesControls.BindMulti("P" + (i + 1) + " B", Global.Config.SNESController[i].B);
-				snesControls.BindMulti("P" + (i + 1) + " X", Global.Config.SNESController[i].X);
-				snesControls.BindMulti("P" + (i + 1) + " Y", Global.Config.SNESController[i].Y);
-				snesControls.BindMulti("P" + (i + 1) + " L", Global.Config.SNESController[i].L);
-				snesControls.BindMulti("P" + (i + 1) + " R", Global.Config.SNESController[i].R);
-				snesControls.BindMulti("P" + (i + 1) + " Select", Global.Config.SNESController[i].Select);
-				snesControls.BindMulti("P" + (i + 1) + " Start", Global.Config.SNESController[i].Start);
-			}
-
-			snesControls.BindMulti("Reset", Global.Config.SNESConsoleButtons.Reset);
-			snesControls.BindMulti("Power", Global.Config.SNESConsoleButtons.Power);
-			Global.SNESControls = snesControls;
-
-
-			var asnesControls = new AutofireController(LibsnesCore.SNESController) {Autofire = true};
-			for (int i = 0; i < 4; i++)
-			{
-				asnesControls.BindMulti("P" + (i + 1) + " Up", Global.Config.SNESAutoController[i].Up);
-				asnesControls.BindMulti("P" + (i + 1) + " Down", Global.Config.SNESAutoController[i].Down);
-				asnesControls.BindMulti("P" + (i + 1) + " Left", Global.Config.SNESAutoController[i].Left);
-				asnesControls.BindMulti("P" + (i + 1) + " Right", Global.Config.SNESAutoController[i].Right);
-				asnesControls.BindMulti("P" + (i + 1) + " A", Global.Config.SNESAutoController[i].A);
-				asnesControls.BindMulti("P" + (i + 1) + " B", Global.Config.SNESAutoController[i].B);
-				asnesControls.BindMulti("P" + (i + 1) + " X", Global.Config.SNESAutoController[i].X);
-				asnesControls.BindMulti("P" + (i + 1) + " Y", Global.Config.SNESAutoController[i].Y);
-				asnesControls.BindMulti("P" + (i + 1) + " L", Global.Config.SNESAutoController[i].L);
-				asnesControls.BindMulti("P" + (i + 1) + " R", Global.Config.SNESAutoController[i].R);
-				asnesControls.BindMulti("P" + (i + 1) + " Select", Global.Config.SNESAutoController[i].Select);
-				asnesControls.BindMulti("P" + (i + 1) + " Start", Global.Config.SNESAutoController[i].Start);
-			}
-			Global.AutofireSNESControls = asnesControls;
-
-			var nesControls = new Controller(NES.NESController);
-			for (int i = 0; i < 2; i++) // TODO: more than 2
-			{
-				nesControls.BindMulti("P" + (i + 1) + " Up", Global.Config.NESController[i].Up);
-				nesControls.BindMulti("P" + (i + 1) + " Down", Global.Config.NESController[i].Down);
-				nesControls.BindMulti("P" + (i + 1) + " Left", Global.Config.NESController[i].Left);
-				nesControls.BindMulti("P" + (i + 1) + " Right", Global.Config.NESController[i].Right);
-				nesControls.BindMulti("P" + (i + 1) + " A", Global.Config.NESController[i].A);
-				nesControls.BindMulti("P" + (i + 1) + " B", Global.Config.NESController[i].B);
-				nesControls.BindMulti("P" + (i + 1) + " Select", Global.Config.NESController[i].Select);
-				nesControls.BindMulti("P" + (i + 1) + " Start", Global.Config.NESController[i].Start);
-			}
-
-			nesControls.BindMulti("Reset", Global.Config.NESConsoleButtons.Reset);
-			nesControls.BindMulti("Power", Global.Config.NESConsoleButtons.Power);
-			//nesControls.BindMulti("FDS Eject", Global.Config.NESConsoleButtons.FDS_Eject);
-			//nesControls.BindMulti("VS Coin 1", Global.Config.NESConsoleButtons.VS_Coin_1);
-			//nesControls.BindMulti("VS Coin 2", Global.Config.NESConsoleButtons.VS_Coin_2);
-
-			Global.NESControls = nesControls;
-
-			var anesControls = new AutofireController(NES.NESController) {Autofire = true};
-
-			for (int i = 0; i < 2; i++) // TODO: more than 2
-			{
-				anesControls.BindMulti("P" + (i + 1) + " Up", Global.Config.NESAutoController[i].Up);
-				anesControls.BindMulti("P" + (i + 1) + " Down", Global.Config.NESAutoController[i].Down);
-				anesControls.BindMulti("P" + (i + 1) + " Left", Global.Config.NESAutoController[i].Left);
-				anesControls.BindMulti("P" + (i + 1) + " Right", Global.Config.NESAutoController[i].Right);
-				anesControls.BindMulti("P" + (i + 1) + " A", Global.Config.NESAutoController[i].A);
-				anesControls.BindMulti("P" + (i + 1) + " B", Global.Config.NESAutoController[i].B);
-				anesControls.BindMulti("P" + (i + 1) + " Select", Global.Config.NESAutoController[i].Select);
-				anesControls.BindMulti("P" + (i + 1) + " Start", Global.Config.NESAutoController[i].Start);
-			}
-			Global.AutofireNESControls = anesControls;
-
-			var gbControls = new Controller(Gameboy.GbController);
-			gbControls.BindMulti("Up", Global.Config.GBController[0].Up);
-			gbControls.BindMulti("Down", Global.Config.GBController[0].Down);
-			gbControls.BindMulti("Left", Global.Config.GBController[0].Left);
-			gbControls.BindMulti("Right", Global.Config.GBController[0].Right);
-			gbControls.BindMulti("A", Global.Config.GBController[0].A);
-			gbControls.BindMulti("B", Global.Config.GBController[0].B);
-			gbControls.BindMulti("Select", Global.Config.GBController[0].Select);
-			gbControls.BindMulti("Start", Global.Config.GBController[0].Start);
-			gbControls.BindMulti("Power", Global.Config.GBController[0].Power);
-			Global.GBControls = gbControls;
-
-			var agbControls = new AutofireController(Gameboy.GbController) {Autofire = true};
-			agbControls.BindMulti("Up", Global.Config.GBAutoController[0].Up);
-			agbControls.BindMulti("Down", Global.Config.GBAutoController[0].Down);
-			agbControls.BindMulti("Left", Global.Config.GBAutoController[0].Left);
-			agbControls.BindMulti("Right", Global.Config.GBAutoController[0].Right);
-			agbControls.BindMulti("A", Global.Config.GBAutoController[0].A);
-			agbControls.BindMulti("B", Global.Config.GBAutoController[0].B);
-			agbControls.BindMulti("Select", Global.Config.GBAutoController[0].Select);
-			agbControls.BindMulti("Start", Global.Config.GBAutoController[0].Start);
-			Global.AutofireGBControls = agbControls;
-
-
-			var dualgbControls = new Controller(Gameboy.GbController);
-			dualgbControls.BindMulti("P1 Up", Global.Config.DualGBController[0].P1_Up);
-			dualgbControls.BindMulti("P1 Down", Global.Config.DualGBController[0].P1_Down);
-			dualgbControls.BindMulti("P1 Left", Global.Config.DualGBController[0].P1_Left);
-			dualgbControls.BindMulti("P1 Right", Global.Config.DualGBController[0].P1_Right);
-			dualgbControls.BindMulti("P1 A", Global.Config.DualGBController[0].P1_A);
-			dualgbControls.BindMulti("P1 B", Global.Config.DualGBController[0].P1_B);
-			dualgbControls.BindMulti("P1 Select", Global.Config.DualGBController[0].P1_Select);
-			dualgbControls.BindMulti("P1 Start", Global.Config.DualGBController[0].P1_Start);
-			dualgbControls.BindMulti("P1 Power", Global.Config.DualGBController[0].P1_Power);
-
-			dualgbControls.BindMulti("P2 Up", Global.Config.DualGBController[0].P2_Up);
-			dualgbControls.BindMulti("P2 Down", Global.Config.DualGBController[0].P2_Down);
-			dualgbControls.BindMulti("P2 Left", Global.Config.DualGBController[0].P2_Left);
-			dualgbControls.BindMulti("P2 Right", Global.Config.DualGBController[0].P2_Right);
-			dualgbControls.BindMulti("P2 A", Global.Config.DualGBController[0].P2_A);
-			dualgbControls.BindMulti("P2 B", Global.Config.DualGBController[0].P2_B);
-			dualgbControls.BindMulti("P2 Select", Global.Config.DualGBController[0].P2_Select);
-			dualgbControls.BindMulti("P2 Start", Global.Config.DualGBController[0].P2_Start);
-			dualgbControls.BindMulti("P2 Power", Global.Config.DualGBController[0].P2_Power);
-
-			Global.DualGBControls = dualgbControls;
-
-			var adualgbControls = new AutofireController(Gameboy.GbController) {Autofire = true};
-			adualgbControls.BindMulti("P1 Up", Global.Config.AutoDualGBController[0].P1_Up);
-			adualgbControls.BindMulti("P1 Down", Global.Config.AutoDualGBController[0].P1_Down);
-			adualgbControls.BindMulti("P1 Left", Global.Config.AutoDualGBController[0].P1_Left);
-			adualgbControls.BindMulti("P1 Right", Global.Config.AutoDualGBController[0].P1_Right);
-			adualgbControls.BindMulti("P1 A", Global.Config.AutoDualGBController[0].P1_A);
-			adualgbControls.BindMulti("P1 B", Global.Config.AutoDualGBController[0].P1_B);
-			adualgbControls.BindMulti("P1 Select", Global.Config.AutoDualGBController[0].P1_Select);
-			adualgbControls.BindMulti("P1 Start", Global.Config.AutoDualGBController[0].P1_Start);
-
-			adualgbControls.BindMulti("P2 Up", Global.Config.AutoDualGBController[0].P2_Up);
-			adualgbControls.BindMulti("P2 Down", Global.Config.AutoDualGBController[0].P2_Down);
-			adualgbControls.BindMulti("P2 Left", Global.Config.AutoDualGBController[0].P2_Left);
-			adualgbControls.BindMulti("P2 Right", Global.Config.AutoDualGBController[0].P2_Right);
-			adualgbControls.BindMulti("P2 A", Global.Config.AutoDualGBController[0].P2_A);
-			adualgbControls.BindMulti("P2 B", Global.Config.AutoDualGBController[0].P2_B);
-			adualgbControls.BindMulti("P2 Select", Global.Config.AutoDualGBController[0].P2_Select);
-			adualgbControls.BindMulti("P2 Start", Global.Config.AutoDualGBController[0].P2_Start);
-
-			Global.DualAutofireGBControls = adualgbControls;
-
-			
-			var gbaControls = new Controller(GBA.GBAController);
-			gbaControls.BindMulti("Up", Global.Config.GBAController[0].Up);
-			gbaControls.BindMulti("Down", Global.Config.GBAController[0].Down);
-			gbaControls.BindMulti("Left", Global.Config.GBAController[0].Left);
-			gbaControls.BindMulti("Right", Global.Config.GBAController[0].Right);
-			gbaControls.BindMulti("A", Global.Config.GBAController[0].A);
-			gbaControls.BindMulti("B", Global.Config.GBAController[0].B);
-			gbaControls.BindMulti("Select", Global.Config.GBAController[0].Select);
-			gbaControls.BindMulti("Start", Global.Config.GBAController[0].Start);
-			gbaControls.BindMulti("L", Global.Config.GBAController[0].L);
-			gbaControls.BindMulti("R", Global.Config.GBAController[0].R);
-			gbaControls.BindMulti("Power", Global.Config.GBAController[0].Power);
-			Global.GBAControls = gbaControls;
-
-			var agbaControls = new AutofireController(GBA.GBAController);
-			agbaControls.BindMulti("Up", Global.Config.GBAAutoController[0].Up);
-			agbaControls.BindMulti("Down", Global.Config.GBAAutoController[0].Down);
-			agbaControls.BindMulti("Left", Global.Config.GBAAutoController[0].Left);
-			agbaControls.BindMulti("Right", Global.Config.GBAAutoController[0].Right);
-			agbaControls.BindMulti("A", Global.Config.GBAAutoController[0].A);
-			agbaControls.BindMulti("B", Global.Config.GBAAutoController[0].B);
-			agbaControls.BindMulti("Select", Global.Config.GBAAutoController[0].Select);
-			agbaControls.BindMulti("Start", Global.Config.GBAAutoController[0].Start);
-			agbaControls.BindMulti("L", Global.Config.GBAAutoController[0].L);
-			agbaControls.BindMulti("R", Global.Config.GBAAutoController[0].R);
-			agbaControls.BindMulti("Power", Global.Config.GBAAutoController[0].Power);
-			Global.AutofireGBAControls = agbaControls;
-
-			var satControls = new Controller(Emulation.Consoles.Sega.Saturn.Yabause.SaturnController);
-			satControls.BindMulti("Power", Global.Config.SaturnConsoleButtons.Power);
-			satControls.BindMulti("Reset", Global.Config.SaturnConsoleButtons.Reset);
-			satControls.BindMulti("P1 Up", Global.Config.SaturnController[0].Up);
-			satControls.BindMulti("P1 Down", Global.Config.SaturnController[0].Down);
-			satControls.BindMulti("P1 Left", Global.Config.SaturnController[0].Left);
-			satControls.BindMulti("P1 Right", Global.Config.SaturnController[0].Right);
-			satControls.BindMulti("P1 A", Global.Config.SaturnController[0].A);
-			satControls.BindMulti("P1 B", Global.Config.SaturnController[0].B);
-			satControls.BindMulti("P1 C", Global.Config.SaturnController[0].C);
-			satControls.BindMulti("P1 X", Global.Config.SaturnController[0].X);
-			satControls.BindMulti("P1 Y", Global.Config.SaturnController[0].Y);
-			satControls.BindMulti("P1 Z", Global.Config.SaturnController[0].Z);
-			satControls.BindMulti("P1 L", Global.Config.SaturnController[0].L);
-			satControls.BindMulti("P1 R", Global.Config.SaturnController[0].R);
-			satControls.BindMulti("P1 Start", Global.Config.SaturnController[0].Start);
-			satControls.BindMulti("P2 Up", Global.Config.SaturnController[1].Up);
-			satControls.BindMulti("P2 Down", Global.Config.SaturnController[1].Down);
-			satControls.BindMulti("P2 Left", Global.Config.SaturnController[1].Left);
-			satControls.BindMulti("P2 Right", Global.Config.SaturnController[1].Right);
-			satControls.BindMulti("P2 A", Global.Config.SaturnController[1].A);
-			satControls.BindMulti("P2 B", Global.Config.SaturnController[1].B);
-			satControls.BindMulti("P2 C", Global.Config.SaturnController[1].C);
-			satControls.BindMulti("P2 X", Global.Config.SaturnController[1].X);
-			satControls.BindMulti("P2 Y", Global.Config.SaturnController[1].Y);
-			satControls.BindMulti("P2 Z", Global.Config.SaturnController[1].Z);
-			satControls.BindMulti("P2 L", Global.Config.SaturnController[1].L);
-			satControls.BindMulti("P2 R", Global.Config.SaturnController[1].R);
-			satControls.BindMulti("P2 Start", Global.Config.SaturnController[1].Start);
-			Global.SaturnControls = satControls;
-
-			var asatControls = new AutofireController(Emulation.Consoles.Sega.Saturn.Yabause.SaturnController);
-			asatControls.BindMulti("P1 Up", Global.Config.SaturnAutoController[0].Up);
-			asatControls.BindMulti("P1 Down", Global.Config.SaturnAutoController[0].Down);
-			asatControls.BindMulti("P1 Left", Global.Config.SaturnAutoController[0].Left);
-			asatControls.BindMulti("P1 Right", Global.Config.SaturnAutoController[0].Right);
-			asatControls.BindMulti("P1 A", Global.Config.SaturnAutoController[0].A);
-			asatControls.BindMulti("P1 B", Global.Config.SaturnAutoController[0].B);
-			asatControls.BindMulti("P1 C", Global.Config.SaturnAutoController[0].C);
-			asatControls.BindMulti("P1 X", Global.Config.SaturnAutoController[0].X);
-			asatControls.BindMulti("P1 Y", Global.Config.SaturnAutoController[0].Y);
-			asatControls.BindMulti("P1 Z", Global.Config.SaturnAutoController[0].Z);
-			asatControls.BindMulti("P1 L", Global.Config.SaturnAutoController[0].L);
-			asatControls.BindMulti("P1 R", Global.Config.SaturnAutoController[0].R);
-			asatControls.BindMulti("P1 Start", Global.Config.SaturnAutoController[0].Start);
-			asatControls.BindMulti("P2 Up", Global.Config.SaturnAutoController[1].Up);
-			asatControls.BindMulti("P2 Down", Global.Config.SaturnAutoController[1].Down);
-			asatControls.BindMulti("P2 Left", Global.Config.SaturnAutoController[1].Left);
-			asatControls.BindMulti("P2 Right", Global.Config.SaturnAutoController[1].Right);
-			asatControls.BindMulti("P2 A", Global.Config.SaturnAutoController[1].A);
-			asatControls.BindMulti("P2 B", Global.Config.SaturnAutoController[1].B);
-			asatControls.BindMulti("P2 C", Global.Config.SaturnAutoController[1].C);
-			asatControls.BindMulti("P2 X", Global.Config.SaturnAutoController[1].X);
-			asatControls.BindMulti("P2 Y", Global.Config.SaturnAutoController[1].Y);
-			asatControls.BindMulti("P2 Z", Global.Config.SaturnAutoController[1].Z);
-			asatControls.BindMulti("P2 L", Global.Config.SaturnAutoController[1].L);
-			asatControls.BindMulti("P2 R", Global.Config.SaturnAutoController[1].R);
-			asatControls.BindMulti("P2 Start", Global.Config.SaturnAutoController[1].Start);
-			Global.AutofireSaturnControls = asatControls;
-
-			var genControls = new Controller(Genesis.GenesisController);
-			genControls.BindMulti("P1 Up", Global.Config.GenesisController[0].Up);
-			genControls.BindMulti("P1 Left", Global.Config.GenesisController[0].Left);
-			genControls.BindMulti("P1 Right", Global.Config.GenesisController[0].Right);
-			genControls.BindMulti("P1 Down", Global.Config.GenesisController[0].Down);
-			genControls.BindMulti("P1 A", Global.Config.GenesisController[0].A);
-			genControls.BindMulti("P1 B", Global.Config.GenesisController[0].B);
-			genControls.BindMulti("P1 C", Global.Config.GenesisController[0].C);
-			genControls.BindMulti("P1 Start", Global.Config.GenesisController[0].Start);
-			genControls.BindMulti("Reset", Global.Config.GenesisConsoleButtons.Reset);
-			Global.GenControls = genControls;
-
-			var agenControls = new AutofireController(Genesis.GenesisController);
-			agenControls.BindMulti("P1 Up", Global.Config.GenesisAutoController[0].Up);
-			agenControls.BindMulti("P1 Left", Global.Config.GenesisAutoController[0].Left);
-			agenControls.BindMulti("P1 Right", Global.Config.GenesisAutoController[0].Right);
-			agenControls.BindMulti("P1 Down", Global.Config.GenesisAutoController[0].Down);
-			agenControls.BindMulti("P1 A", Global.Config.GenesisAutoController[0].A);
-			agenControls.BindMulti("P1 B", Global.Config.GenesisAutoController[0].B);
-			agenControls.BindMulti("P1 C", Global.Config.GenesisAutoController[0].C);
-			agenControls.BindMulti("P1 Start", Global.Config.GenesisAutoController[0].Start);
-			Global.AutofireGenControls = agenControls;
-
-			var a2600Controls = new Controller(Atari2600.Atari2600ControllerDefinition);
-			a2600Controls.BindMulti("P1 Up", Global.Config.Atari2600Controller[0].Up);
-			a2600Controls.BindMulti("P1 Left", Global.Config.Atari2600Controller[0].Left);
-			a2600Controls.BindMulti("P1 Right", Global.Config.Atari2600Controller[0].Right);
-			a2600Controls.BindMulti("P1 Down", Global.Config.Atari2600Controller[0].Down);
-			a2600Controls.BindMulti("P1 Button", Global.Config.Atari2600Controller[0].Button);
-			
-			a2600Controls.BindMulti("P2 Up", Global.Config.Atari2600Controller[1].Up);
-			a2600Controls.BindMulti("P2 Left", Global.Config.Atari2600Controller[1].Left);
-			a2600Controls.BindMulti("P2 Right", Global.Config.Atari2600Controller[1].Right);
-			a2600Controls.BindMulti("P2 Down", Global.Config.Atari2600Controller[1].Down);
-			a2600Controls.BindMulti("P2 Button", Global.Config.Atari2600Controller[1].Button);
-			
-			a2600Controls.BindMulti("Reset", Global.Config.Atari2600ConsoleButtons[0].Reset);
-			a2600Controls.BindMulti("Select", Global.Config.Atari2600ConsoleButtons[0].Select);
-			
-			Global.Atari2600Controls = a2600Controls;
-
-			var autofireA2600Controls = new AutofireController(Atari2600.Atari2600ControllerDefinition);
-			autofireA2600Controls.BindMulti("P1 Up", Global.Config.Atari2600AutoController[0].Up);
-			autofireA2600Controls.BindMulti("P1 Left", Global.Config.Atari2600AutoController[0].Left);
-			autofireA2600Controls.BindMulti("P1 Right", Global.Config.Atari2600AutoController[0].Right);
-			autofireA2600Controls.BindMulti("P1 Down", Global.Config.Atari2600AutoController[0].Down);
-			autofireA2600Controls.BindMulti("P1 Button", Global.Config.Atari2600AutoController[0].Button);
-			
-			autofireA2600Controls.BindMulti("P2 Up", Global.Config.Atari2600AutoController[1].Up);
-			autofireA2600Controls.BindMulti("P2 Left", Global.Config.Atari2600AutoController[1].Left);
-			autofireA2600Controls.BindMulti("P2 Right", Global.Config.Atari2600AutoController[1].Right);
-			autofireA2600Controls.BindMulti("P2 Down", Global.Config.Atari2600AutoController[1].Down);
-			autofireA2600Controls.BindMulti("P2 Button", Global.Config.Atari2600AutoController[1].Button);
-			
-			Global.AutofireAtari2600Controls = autofireA2600Controls;
-
-			var a7800Controls = new Controller(Atari7800Control.ProLineJoystick);
-
-			a7800Controls.BindMulti("Power", Global.Config.Atari7800ConsoleButtons[0].Power);
-			a7800Controls.BindMulti("Reset", Global.Config.Atari7800ConsoleButtons[0].Reset);
-			a7800Controls.BindMulti("Select", Global.Config.Atari7800ConsoleButtons[0].Select);
-			a7800Controls.BindMulti("Pause", Global.Config.Atari7800ConsoleButtons[0].Pause);
-
-			a7800Controls.BindMulti("P1 Up", Global.Config.Atari7800Controller[0].Up);
-			a7800Controls.BindMulti("P1 Left", Global.Config.Atari7800Controller[0].Left);
-			a7800Controls.BindMulti("P1 Right", Global.Config.Atari7800Controller[0].Right);
-			a7800Controls.BindMulti("P1 Down", Global.Config.Atari7800Controller[0].Down);
-			a7800Controls.BindMulti("P1 Trigger", Global.Config.Atari7800Controller[0].Button1);
-			a7800Controls.BindMulti("P1 Trigger 2", Global.Config.Atari7800Controller[0].Button2);
-
-			a7800Controls.BindMulti("P2 Up", Global.Config.Atari7800Controller[1].Up);
-			a7800Controls.BindMulti("P2 Left", Global.Config.Atari7800Controller[1].Left);
-			a7800Controls.BindMulti("P2 Right", Global.Config.Atari7800Controller[1].Right);
-			a7800Controls.BindMulti("P2 Down", Global.Config.Atari7800Controller[1].Down);
-			a7800Controls.BindMulti("P2 Trigger", Global.Config.Atari7800Controller[1].Button1);
-			a7800Controls.BindMulti("P2 Trigger 2", Global.Config.Atari7800Controller[1].Button2);
-
-			Global.Atari7800Controls = a7800Controls;
-
-			var autofireA7800Controls = new AutofireController(Atari7800Control.ProLineJoystick);
-			autofireA7800Controls.BindMulti("P1 Up", Global.Config.Atari7800AutoController[0].Up);
-			autofireA7800Controls.BindMulti("P1 Left", Global.Config.Atari7800AutoController[0].Left);
-			autofireA7800Controls.BindMulti("P1 Right", Global.Config.Atari7800AutoController[0].Right);
-			autofireA7800Controls.BindMulti("P1 Down", Global.Config.Atari7800AutoController[0].Down);
-			autofireA7800Controls.BindMulti("P1 Trigger", Global.Config.Atari7800Controller[0].Button1);
-			autofireA7800Controls.BindMulti("P1 Trigger 2", Global.Config.Atari7800Controller[0].Button2);
-
-			autofireA7800Controls.BindMulti("P2 Up", Global.Config.Atari7800AutoController[1].Up);
-			autofireA7800Controls.BindMulti("P2 Left", Global.Config.Atari7800AutoController[1].Left);
-			autofireA7800Controls.BindMulti("P2 Right", Global.Config.Atari7800AutoController[1].Right);
-			autofireA7800Controls.BindMulti("P2 Down", Global.Config.Atari7800AutoController[1].Down);
-			autofireA7800Controls.BindMulti("P2 Trigger", Global.Config.Atari7800Controller[1].Button1);
-			autofireA7800Controls.BindMulti("P2 Trigger 2", Global.Config.Atari7800Controller[1].Button2);
-
-			Global.AutofireAtari7800Controls = autofireA2600Controls;
-
-			var colecoControls = new Controller(ColecoVision.ColecoVisionControllerDefinition);
-			colecoControls.BindMulti("P1 Up", Global.Config.ColecoController[0].Up);
-			colecoControls.BindMulti("P1 Left", Global.Config.ColecoController[0].Left);
-			colecoControls.BindMulti("P1 Right", Global.Config.ColecoController[0].Right);
-			colecoControls.BindMulti("P1 Down", Global.Config.ColecoController[0].Down);
-			colecoControls.BindMulti("P1 L", Global.Config.ColecoController[0].L);
-			colecoControls.BindMulti("P1 R", Global.Config.ColecoController[0].R);
-			colecoControls.BindMulti("P1 Key0", Global.Config.ColecoController[0]._0);
-			colecoControls.BindMulti("P1 Key1", Global.Config.ColecoController[0]._1);
-			colecoControls.BindMulti("P1 Key2", Global.Config.ColecoController[0]._2);
-			colecoControls.BindMulti("P1 Key3", Global.Config.ColecoController[0]._3);
-			colecoControls.BindMulti("P1 Key4", Global.Config.ColecoController[0]._4);
-			colecoControls.BindMulti("P1 Key5", Global.Config.ColecoController[0]._5);
-			colecoControls.BindMulti("P1 Key6", Global.Config.ColecoController[0]._6);
-			colecoControls.BindMulti("P1 Key7", Global.Config.ColecoController[0]._7);
-			colecoControls.BindMulti("P1 Key8", Global.Config.ColecoController[0]._8);
-			colecoControls.BindMulti("P1 Key9", Global.Config.ColecoController[0]._9);
-			colecoControls.BindMulti("P1 Star", Global.Config.ColecoController[0].Star);
-			colecoControls.BindMulti("P1 Pound", Global.Config.ColecoController[0].Pound);
-
-			colecoControls.BindMulti("P2 Up", Global.Config.ColecoController[1].Up);
-			colecoControls.BindMulti("P2 Left", Global.Config.ColecoController[1].Left);
-			colecoControls.BindMulti("P2 Right", Global.Config.ColecoController[1].Right);
-			colecoControls.BindMulti("P2 Down", Global.Config.ColecoController[1].Down);
-			colecoControls.BindMulti("P2 L", Global.Config.ColecoController[1].L);
-			colecoControls.BindMulti("P2 R", Global.Config.ColecoController[1].R);
-			colecoControls.BindMulti("P2 Key0", Global.Config.ColecoController[1]._0);
-			colecoControls.BindMulti("P2 Key1", Global.Config.ColecoController[1]._1);
-			colecoControls.BindMulti("P2 Key2", Global.Config.ColecoController[1]._2);
-			colecoControls.BindMulti("P2 Key3", Global.Config.ColecoController[1]._3);
-			colecoControls.BindMulti("P2 Key4", Global.Config.ColecoController[1]._4);
-			colecoControls.BindMulti("P2 Key5", Global.Config.ColecoController[1]._5);
-			colecoControls.BindMulti("P2 Key6", Global.Config.ColecoController[1]._6);
-			colecoControls.BindMulti("P2 Key7", Global.Config.ColecoController[1]._7);
-			colecoControls.BindMulti("P2 Key8", Global.Config.ColecoController[1]._8);
-			colecoControls.BindMulti("P2 Key9", Global.Config.ColecoController[1]._9);
-			colecoControls.BindMulti("P2 Star", Global.Config.ColecoController[1].Star);
-			colecoControls.BindMulti("P2 Pound", Global.Config.ColecoController[1].Pound);
-			Global.ColecoControls = colecoControls;
-
-			var acolecoControls = new AutofireController(ColecoVision.ColecoVisionControllerDefinition);
-			acolecoControls.BindMulti("P1 Up", Global.Config.ColecoAutoController[0].Up);
-			acolecoControls.BindMulti("P1 Left", Global.Config.ColecoAutoController[0].Left);
-			acolecoControls.BindMulti("P1 Right", Global.Config.ColecoAutoController[0].Right);
-			acolecoControls.BindMulti("P1 Down", Global.Config.ColecoAutoController[0].Down);
-			acolecoControls.BindMulti("P1 L", Global.Config.ColecoAutoController[0].L);
-			acolecoControls.BindMulti("P1 R", Global.Config.ColecoAutoController[0].R);
-			acolecoControls.BindMulti("P1 Key0", Global.Config.ColecoAutoController[0]._0);
-			acolecoControls.BindMulti("P1 Key1", Global.Config.ColecoAutoController[0]._1);
-			acolecoControls.BindMulti("P1 Key2", Global.Config.ColecoAutoController[0]._2);
-			acolecoControls.BindMulti("P1 Key3", Global.Config.ColecoAutoController[0]._3);
-			acolecoControls.BindMulti("P1 Key4", Global.Config.ColecoAutoController[0]._4);
-			acolecoControls.BindMulti("P1 Key5", Global.Config.ColecoAutoController[0]._5);
-			acolecoControls.BindMulti("P1 Key6", Global.Config.ColecoAutoController[0]._6);
-			acolecoControls.BindMulti("P1 Key7", Global.Config.ColecoAutoController[0]._7);
-			acolecoControls.BindMulti("P1 Key8", Global.Config.ColecoAutoController[0]._8);
-			acolecoControls.BindMulti("P1 Key9", Global.Config.ColecoAutoController[0]._9);
-			acolecoControls.BindMulti("P1 Star", Global.Config.ColecoAutoController[0].Star);
-			acolecoControls.BindMulti("P1 Pound", Global.Config.ColecoController[0].Pound);
-
-			acolecoControls.BindMulti("P2 Up", Global.Config.ColecoAutoController[1].Up);
-			acolecoControls.BindMulti("P2 Left", Global.Config.ColecoAutoController[1].Left);
-			acolecoControls.BindMulti("P2 Right", Global.Config.ColecoAutoController[1].Right);
-			acolecoControls.BindMulti("P2 Down", Global.Config.ColecoAutoController[1].Down);
-			acolecoControls.BindMulti("P2 L", Global.Config.ColecoAutoController[1].L);
-			acolecoControls.BindMulti("P2 R", Global.Config.ColecoAutoController[1].R);
-			acolecoControls.BindMulti("P2 Key0", Global.Config.ColecoAutoController[1]._0);
-			acolecoControls.BindMulti("P2 Key1", Global.Config.ColecoAutoController[1]._1);
-			acolecoControls.BindMulti("P2 Key2", Global.Config.ColecoAutoController[1]._2);
-			acolecoControls.BindMulti("P2 Key3", Global.Config.ColecoAutoController[1]._3);
-			acolecoControls.BindMulti("P2 Key4", Global.Config.ColecoAutoController[1]._4);
-			acolecoControls.BindMulti("P2 Key5", Global.Config.ColecoAutoController[1]._5);
-			acolecoControls.BindMulti("P2 Key6", Global.Config.ColecoAutoController[1]._6);
-			acolecoControls.BindMulti("P2 Key7", Global.Config.ColecoAutoController[1]._7);
-			acolecoControls.BindMulti("P2 Key8", Global.Config.ColecoAutoController[1]._8);
-			acolecoControls.BindMulti("P2 Key9", Global.Config.ColecoAutoController[1]._9);
-			acolecoControls.BindMulti("P2 Star", Global.Config.ColecoAutoController[1].Star);
-			acolecoControls.BindMulti("P2 Pound", Global.Config.ColecoController[1].Pound);
-			Global.AutofireColecoControls = acolecoControls;
-
-			var intelliControls = new Controller(Intellivision.IntellivisionController);
-			intelliControls.BindMulti("P1 Up", Global.Config.IntellivisionController[0].Up);
-			intelliControls.BindMulti("P1 Left", Global.Config.IntellivisionController[0].Left);
-			intelliControls.BindMulti("P1 Right", Global.Config.IntellivisionController[0].Right);
-			intelliControls.BindMulti("P1 Down", Global.Config.IntellivisionController[0].Down);
-			intelliControls.BindMulti("P1 L", Global.Config.IntellivisionController[0].L);
-			intelliControls.BindMulti("P1 R", Global.Config.IntellivisionController[0].R);
-			intelliControls.BindMulti("P1 Key0", Global.Config.IntellivisionController[0]._0);
-			intelliControls.BindMulti("P1 Key1", Global.Config.IntellivisionController[0]._1);
-			intelliControls.BindMulti("P1 Key2", Global.Config.IntellivisionController[0]._2);
-			intelliControls.BindMulti("P1 Key3", Global.Config.IntellivisionController[0]._3);
-			intelliControls.BindMulti("P1 Key4", Global.Config.IntellivisionController[0]._4);
-			intelliControls.BindMulti("P1 Key5", Global.Config.IntellivisionController[0]._5);
-			intelliControls.BindMulti("P1 Key6", Global.Config.IntellivisionController[0]._6);
-			intelliControls.BindMulti("P1 Key7", Global.Config.IntellivisionController[0]._7);
-			intelliControls.BindMulti("P1 Key8", Global.Config.IntellivisionController[0]._8);
-			intelliControls.BindMulti("P1 Key9", Global.Config.IntellivisionController[0]._9);
-			intelliControls.BindMulti("P1 Clear", Global.Config.IntellivisionController[0].Clear);
-			intelliControls.BindMulti("P1 Enter", Global.Config.IntellivisionController[0].Enter);
-
-			intelliControls.BindMulti("P2 Up", Global.Config.IntellivisionController[1].Up);
-			intelliControls.BindMulti("P2 Left", Global.Config.IntellivisionController[1].Left);
-			intelliControls.BindMulti("P2 Right", Global.Config.IntellivisionController[1].Right);
-			intelliControls.BindMulti("P2 Down", Global.Config.IntellivisionController[1].Down);
-			intelliControls.BindMulti("P2 L", Global.Config.IntellivisionController[1].L);
-			intelliControls.BindMulti("P2 R", Global.Config.IntellivisionController[1].R);
-			intelliControls.BindMulti("P2 Key0", Global.Config.IntellivisionController[1]._0);
-			intelliControls.BindMulti("P2 Key1", Global.Config.IntellivisionController[1]._1);
-			intelliControls.BindMulti("P2 Key2", Global.Config.IntellivisionController[1]._2);
-			intelliControls.BindMulti("P2 Key3", Global.Config.IntellivisionController[1]._3);
-			intelliControls.BindMulti("P2 Key4", Global.Config.IntellivisionController[1]._4);
-			intelliControls.BindMulti("P2 Key5", Global.Config.IntellivisionController[1]._5);
-			intelliControls.BindMulti("P2 Key6", Global.Config.IntellivisionController[1]._6);
-			intelliControls.BindMulti("P2 Key7", Global.Config.IntellivisionController[1]._7);
-			intelliControls.BindMulti("P2 Key8", Global.Config.IntellivisionController[1]._8);
-			intelliControls.BindMulti("P2 Key9", Global.Config.IntellivisionController[1]._9);
-			intelliControls.BindMulti("P2 Clear", Global.Config.IntellivisionController[1].Clear);
-			intelliControls.BindMulti("P2 Enter", Global.Config.IntellivisionController[1].Enter);
-			Global.IntellivisionControls = intelliControls;
-
-			var aintelliControls = new AutofireController(Intellivision.IntellivisionController);
-			aintelliControls.BindMulti("P1 Up", Global.Config.IntellivisionAutoController[0].Up);
-			aintelliControls.BindMulti("P1 Left", Global.Config.IntellivisionAutoController[0].Left);
-			aintelliControls.BindMulti("P1 Right", Global.Config.IntellivisionAutoController[0].Right);
-			aintelliControls.BindMulti("P1 Down", Global.Config.IntellivisionAutoController[0].Down);
-			aintelliControls.BindMulti("P1 L", Global.Config.IntellivisionAutoController[0].L);
-			aintelliControls.BindMulti("P1 R", Global.Config.IntellivisionAutoController[0].R);
-			aintelliControls.BindMulti("P1 Key0", Global.Config.IntellivisionAutoController[0]._0);
-			aintelliControls.BindMulti("P1 Key1", Global.Config.IntellivisionAutoController[0]._1);
-			aintelliControls.BindMulti("P1 Key2", Global.Config.IntellivisionAutoController[0]._2);
-			aintelliControls.BindMulti("P1 Key3", Global.Config.IntellivisionAutoController[0]._3);
-			aintelliControls.BindMulti("P1 Key4", Global.Config.IntellivisionAutoController[0]._4);
-			aintelliControls.BindMulti("P1 Key5", Global.Config.IntellivisionAutoController[0]._5);
-			aintelliControls.BindMulti("P1 Key6", Global.Config.IntellivisionAutoController[0]._6);
-			aintelliControls.BindMulti("P1 Key7", Global.Config.IntellivisionAutoController[0]._7);
-			aintelliControls.BindMulti("P1 Key8", Global.Config.IntellivisionAutoController[0]._8);
-			aintelliControls.BindMulti("P1 Key9", Global.Config.IntellivisionAutoController[0]._9);
-			aintelliControls.BindMulti("P1 Clear", Global.Config.IntellivisionAutoController[0].Clear);
-			aintelliControls.BindMulti("P1 Enter", Global.Config.IntellivisionAutoController[0].Enter);
-
-			aintelliControls.BindMulti("P2 Up", Global.Config.IntellivisionAutoController[1].Up);
-			aintelliControls.BindMulti("P2 Left", Global.Config.IntellivisionAutoController[1].Left);
-			aintelliControls.BindMulti("P2 Right", Global.Config.IntellivisionAutoController[1].Right);
-			aintelliControls.BindMulti("P2 Down", Global.Config.IntellivisionAutoController[1].Down);
-			aintelliControls.BindMulti("P2 L", Global.Config.IntellivisionAutoController[1].L);
-			aintelliControls.BindMulti("P2 R", Global.Config.IntellivisionAutoController[1].R);
-			aintelliControls.BindMulti("P2 Key0", Global.Config.IntellivisionAutoController[1]._0);
-			aintelliControls.BindMulti("P2 Key1", Global.Config.IntellivisionAutoController[1]._1);
-			aintelliControls.BindMulti("P2 Key2", Global.Config.IntellivisionAutoController[1]._2);
-			aintelliControls.BindMulti("P2 Key3", Global.Config.IntellivisionAutoController[1]._3);
-			aintelliControls.BindMulti("P2 Key4", Global.Config.IntellivisionAutoController[1]._4);
-			aintelliControls.BindMulti("P2 Key5", Global.Config.IntellivisionAutoController[1]._5);
-			aintelliControls.BindMulti("P2 Key6", Global.Config.IntellivisionAutoController[1]._6);
-			aintelliControls.BindMulti("P2 Key7", Global.Config.IntellivisionAutoController[1]._7);
-			aintelliControls.BindMulti("P2 Key8", Global.Config.IntellivisionAutoController[1]._8);
-			aintelliControls.BindMulti("P2 Key9", Global.Config.IntellivisionAutoController[1]._9);
-			aintelliControls.BindMulti("P2 Clear", Global.Config.IntellivisionAutoController[1].Clear);
-			aintelliControls.BindMulti("P2 Enter", Global.Config.IntellivisionAutoController[1].Enter);
-			Global.AutofireIntellivisionControls = aintelliControls;
-
-			var TI83Controls = new Controller(TI83.TI83Controller);
-			TI83Controls.BindMulti("0", Global.Config.TI83Controller[0]._0);
-			TI83Controls.BindMulti("1", Global.Config.TI83Controller[0]._1);
-			TI83Controls.BindMulti("2", Global.Config.TI83Controller[0]._2);
-			TI83Controls.BindMulti("3", Global.Config.TI83Controller[0]._3);
-			TI83Controls.BindMulti("4", Global.Config.TI83Controller[0]._4);
-			TI83Controls.BindMulti("5", Global.Config.TI83Controller[0]._5);
-			TI83Controls.BindMulti("6", Global.Config.TI83Controller[0]._6);
-			TI83Controls.BindMulti("7", Global.Config.TI83Controller[0]._7);
-			TI83Controls.BindMulti("8", Global.Config.TI83Controller[0]._8);
-			TI83Controls.BindMulti("9", Global.Config.TI83Controller[0]._9);
-			TI83Controls.BindMulti("ON", Global.Config.TI83Controller[0].ON);
-			TI83Controls.BindMulti("ENTER", Global.Config.TI83Controller[0].ENTER);
-			TI83Controls.BindMulti("DOWN", Global.Config.TI83Controller[0].DOWN);
-			TI83Controls.BindMulti("LEFT", Global.Config.TI83Controller[0].LEFT);
-			TI83Controls.BindMulti("RIGHT", Global.Config.TI83Controller[0].RIGHT);
-			TI83Controls.BindMulti("UP", Global.Config.TI83Controller[0].UP);
-			TI83Controls.BindMulti("PLUS", Global.Config.TI83Controller[0].PLUS);
-			TI83Controls.BindMulti("MINUS", Global.Config.TI83Controller[0].MINUS);
-			TI83Controls.BindMulti("MULTIPLY", Global.Config.TI83Controller[0].MULTIPLY);
-			TI83Controls.BindMulti("DIVIDE", Global.Config.TI83Controller[0].DIVIDE);
-			TI83Controls.BindMulti("CLEAR", Global.Config.TI83Controller[0].CLEAR);
-			TI83Controls.BindMulti("DOT", Global.Config.TI83Controller[0].DOT);
-			TI83Controls.BindMulti("EXP", Global.Config.TI83Controller[0].EXP);
-			TI83Controls.BindMulti("DASH", Global.Config.TI83Controller[0].DASH);
-			TI83Controls.BindMulti("PARACLOSE", Global.Config.TI83Controller[0].DASH);
-			TI83Controls.BindMulti("TAN", Global.Config.TI83Controller[0].TAN);
-			TI83Controls.BindMulti("VARS", Global.Config.TI83Controller[0].VARS);
-			TI83Controls.BindMulti("PARAOPEN", Global.Config.TI83Controller[0].PARAOPEN);
-			TI83Controls.BindMulti("COS", Global.Config.TI83Controller[0].COS);
-			TI83Controls.BindMulti("PRGM", Global.Config.TI83Controller[0].PRGM);
-			TI83Controls.BindMulti("STAT", Global.Config.TI83Controller[0].STAT);
-			TI83Controls.BindMulti("COMMA", Global.Config.TI83Controller[0].COMMA);
-			TI83Controls.BindMulti("SIN", Global.Config.TI83Controller[0].SIN);
-			TI83Controls.BindMulti("MATRIX", Global.Config.TI83Controller[0].MATRIX);
-			TI83Controls.BindMulti("X", Global.Config.TI83Controller[0].X);
-			TI83Controls.BindMulti("STO", Global.Config.TI83Controller[0].STO);
-			TI83Controls.BindMulti("LN", Global.Config.TI83Controller[0].LN);
-			TI83Controls.BindMulti("LOG", Global.Config.TI83Controller[0].LOG);
-			TI83Controls.BindMulti("SQUARED", Global.Config.TI83Controller[0].SQUARED);
-			TI83Controls.BindMulti("NEG1", Global.Config.TI83Controller[0].NEG1);
-			TI83Controls.BindMulti("MATH", Global.Config.TI83Controller[0].MATH);
-			TI83Controls.BindMulti("ALPHA", Global.Config.TI83Controller[0].ALPHA);
-			TI83Controls.BindMulti("GRAPH", Global.Config.TI83Controller[0].GRAPH);
-			TI83Controls.BindMulti("TRACE", Global.Config.TI83Controller[0].TRACE);
-			TI83Controls.BindMulti("ZOOM", Global.Config.TI83Controller[0].ZOOM);
-			TI83Controls.BindMulti("WINDOW", Global.Config.TI83Controller[0].WINDOW);
-			TI83Controls.BindMulti("Y", Global.Config.TI83Controller[0].Y);
-			TI83Controls.BindMulti("2ND", Global.Config.TI83Controller[0].SECOND);
-			TI83Controls.BindMulti("MODE", Global.Config.TI83Controller[0].MODE);
-			TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].DEL);
-			Global.TI83Controls = TI83Controls;
-
-			var CommodoreControls = new Controller(C64.C64ControllerDefinition);
-			CommodoreControls.BindMulti("P1 Up", Global.Config.C64Joysticks[0].Up);
-			CommodoreControls.BindMulti("P1 Left", Global.Config.C64Joysticks[0].Left);
-			CommodoreControls.BindMulti("P1 Right", Global.Config.C64Joysticks[0].Right);
-			CommodoreControls.BindMulti("P1 Down", Global.Config.C64Joysticks[0].Down);
-			CommodoreControls.BindMulti("P1 Button", Global.Config.C64Joysticks[0].Button);
-
-			CommodoreControls.BindMulti("P2 Up", Global.Config.C64Joysticks[1].Up);
-			CommodoreControls.BindMulti("P2 Left", Global.Config.C64Joysticks[1].Left);
-			CommodoreControls.BindMulti("P2 Right", Global.Config.C64Joysticks[1].Right);
-			CommodoreControls.BindMulti("P2 Down", Global.Config.C64Joysticks[1].Down);
-			CommodoreControls.BindMulti("P2 Button", Global.Config.C64Joysticks[1].Button);
-
-			CommodoreControls.BindMulti("Key F1", Global.Config.C64Keyboard.F1);
-			CommodoreControls.BindMulti("Key F3", Global.Config.C64Keyboard.F3);
-			CommodoreControls.BindMulti("Key F5", Global.Config.C64Keyboard.F5);
-			CommodoreControls.BindMulti("Key F7", Global.Config.C64Keyboard.F7);
-			CommodoreControls.BindMulti("Key Left Arrow", Global.Config.C64Keyboard.Left_Arrow);
-			CommodoreControls.BindMulti("Key 1", Global.Config.C64Keyboard._1);
-			CommodoreControls.BindMulti("Key 2", Global.Config.C64Keyboard._2);
-			CommodoreControls.BindMulti("Key 3", Global.Config.C64Keyboard._3);
-			CommodoreControls.BindMulti("Key 4", Global.Config.C64Keyboard._4);
-			CommodoreControls.BindMulti("Key 5", Global.Config.C64Keyboard._5);
-			CommodoreControls.BindMulti("Key 6", Global.Config.C64Keyboard._6);
-			CommodoreControls.BindMulti("Key 7", Global.Config.C64Keyboard._7);
-			CommodoreControls.BindMulti("Key 8", Global.Config.C64Keyboard._8);
-			CommodoreControls.BindMulti("Key 9", Global.Config.C64Keyboard._9);
-			CommodoreControls.BindMulti("Key 0", Global.Config.C64Keyboard._0);
-			CommodoreControls.BindMulti("Key Plus", Global.Config.C64Keyboard.Plus);
-			CommodoreControls.BindMulti("Key Minus", Global.Config.C64Keyboard.Minus);
-			CommodoreControls.BindMulti("Key Pound", Global.Config.C64Keyboard.Pound);
-			CommodoreControls.BindMulti("Key Clear/Home", Global.Config.C64Keyboard.Clear_Home);
-			CommodoreControls.BindMulti("Key Insert/Delete", Global.Config.C64Keyboard.Insert_Delete);
-			CommodoreControls.BindMulti("Key Control", Global.Config.C64Keyboard.Control);
-			CommodoreControls.BindMulti("Key Q", Global.Config.C64Keyboard.Q);
-			CommodoreControls.BindMulti("Key W", Global.Config.C64Keyboard.W);
-			CommodoreControls.BindMulti("Key E", Global.Config.C64Keyboard.E);
-			CommodoreControls.BindMulti("Key R", Global.Config.C64Keyboard.R);
-			CommodoreControls.BindMulti("Key T", Global.Config.C64Keyboard.T);
-			CommodoreControls.BindMulti("Key Y", Global.Config.C64Keyboard.Y);
-			CommodoreControls.BindMulti("Key U", Global.Config.C64Keyboard.U);
-			CommodoreControls.BindMulti("Key I", Global.Config.C64Keyboard.I);
-			CommodoreControls.BindMulti("Key O", Global.Config.C64Keyboard.O);
-			CommodoreControls.BindMulti("Key P", Global.Config.C64Keyboard.P);
-			CommodoreControls.BindMulti("Key At", Global.Config.C64Keyboard.At);
-			CommodoreControls.BindMulti("Key Asterisk", Global.Config.C64Keyboard.Asterisk);
-			CommodoreControls.BindMulti("Key Up Arrow", Global.Config.C64Keyboard.Up_Arrow);
-			CommodoreControls.BindMulti("Key Restore", Global.Config.C64Keyboard.Restore);
-			CommodoreControls.BindMulti("Key Run/Stop", Global.Config.C64Keyboard.Run_Stop);
-			CommodoreControls.BindMulti("Key Lck", Global.Config.C64Keyboard.Lck);
-			CommodoreControls.BindMulti("Key A", Global.Config.C64Keyboard.A);
-			CommodoreControls.BindMulti("Key S", Global.Config.C64Keyboard.S);
-			CommodoreControls.BindMulti("Key D", Global.Config.C64Keyboard.D);
-			CommodoreControls.BindMulti("Key F", Global.Config.C64Keyboard.F);
-			CommodoreControls.BindMulti("Key G", Global.Config.C64Keyboard.G);
-			CommodoreControls.BindMulti("Key H", Global.Config.C64Keyboard.H);
-			CommodoreControls.BindMulti("Key J", Global.Config.C64Keyboard.J);
-			CommodoreControls.BindMulti("Key K", Global.Config.C64Keyboard.K);
-			CommodoreControls.BindMulti("Key L", Global.Config.C64Keyboard.L);
-			CommodoreControls.BindMulti("Key Colon", Global.Config.C64Keyboard.Colon);
-			CommodoreControls.BindMulti("Key Semicolon", Global.Config.C64Keyboard.Semicolon);
-			CommodoreControls.BindMulti("Key Equal", Global.Config.C64Keyboard.Equal);
-			CommodoreControls.BindMulti("Key Return", Global.Config.C64Keyboard.Return);
-			CommodoreControls.BindMulti("Key Commodore", Global.Config.C64Keyboard.Commodore);
-			CommodoreControls.BindMulti("Key Left Shift", Global.Config.C64Keyboard.Left_Shift);
-			CommodoreControls.BindMulti("Key Z", Global.Config.C64Keyboard.Z);
-			CommodoreControls.BindMulti("Key X", Global.Config.C64Keyboard.X);
-			CommodoreControls.BindMulti("Key C", Global.Config.C64Keyboard.C);
-			CommodoreControls.BindMulti("Key V", Global.Config.C64Keyboard.V);
-			CommodoreControls.BindMulti("Key B", Global.Config.C64Keyboard.B);
-			CommodoreControls.BindMulti("Key N", Global.Config.C64Keyboard.N);
-			CommodoreControls.BindMulti("Key M", Global.Config.C64Keyboard.M);
-			CommodoreControls.BindMulti("Key Comma", Global.Config.C64Keyboard.Comma);
-			CommodoreControls.BindMulti("Key Period", Global.Config.C64Keyboard.Period);
-			CommodoreControls.BindMulti("Key Period", Global.Config.C64Keyboard.Period);
-			CommodoreControls.BindMulti("Key Slash", Global.Config.C64Keyboard.Slash);
-			CommodoreControls.BindMulti("Key Right Shift", Global.Config.C64Keyboard.Right_Shift);
-			CommodoreControls.BindMulti("Key Cursor Up/Down", Global.Config.C64Keyboard.Cursor_Up_Down);
-			CommodoreControls.BindMulti("Key Cursor Left/Right", Global.Config.C64Keyboard.Cursor_Left_Right);
-			CommodoreControls.BindMulti("Key Space", Global.Config.C64Keyboard.Space);
-
-			Global.Commodore64Controls = CommodoreControls;
-
-			var autofireC64Controls = new AutofireController(C64.C64ControllerDefinition);
-			autofireC64Controls.BindMulti("P1 Up", Global.Config.C64AutoJoysticks[0].Up);
-			autofireC64Controls.BindMulti("P1 Left", Global.Config.C64AutoJoysticks[0].Left);
-			autofireC64Controls.BindMulti("P1 Right", Global.Config.C64AutoJoysticks[0].Right);
-			autofireC64Controls.BindMulti("P1 Down", Global.Config.C64AutoJoysticks[0].Down);
-			autofireC64Controls.BindMulti("P1 Button", Global.Config.C64AutoJoysticks[0].Button);
-
-			autofireC64Controls.BindMulti("P2 Up", Global.Config.C64AutoJoysticks[1].Up);
-			autofireC64Controls.BindMulti("P2 Left", Global.Config.C64AutoJoysticks[1].Left);
-			autofireC64Controls.BindMulti("P2 Right", Global.Config.C64AutoJoysticks[1].Right);
-			autofireC64Controls.BindMulti("P2 Down", Global.Config.C64AutoJoysticks[1].Down);
-			autofireC64Controls.BindMulti("P2 Button", Global.Config.C64AutoJoysticks[1].Button);
-
-			Global.AutofireCommodore64Controls = autofireC64Controls;
-
-			var N64Controls = new Controller(N64.N64ControllerDefinition);
-
-			N64Controls.BindMulti("Power", Global.Config.N64ConsoleButtons.Power);
-			N64Controls.BindMulti("Reset", Global.Config.N64ConsoleButtons.Reset);
-
-			N64Controls.BindMulti("P1 DPad U", Global.Config.N64Controller[0].DPadU);
-			N64Controls.BindMulti("P1 DPad L", Global.Config.N64Controller[0].DPadL);
-			N64Controls.BindMulti("P1 DPad R", Global.Config.N64Controller[0].DPadR);
-			N64Controls.BindMulti("P1 DPad D", Global.Config.N64Controller[0].DPadD);
-			N64Controls.BindMulti("P1 Start", Global.Config.N64Controller[0].Start);
-			N64Controls.BindMulti("P1 Z", Global.Config.N64Controller[0].Z);
-			N64Controls.BindMulti("P1 B", Global.Config.N64Controller[0].B);
-			N64Controls.BindMulti("P1 A", Global.Config.N64Controller[0].A);
-			N64Controls.BindMulti("P1 C Up", Global.Config.N64Controller[0].CUp);
-			N64Controls.BindMulti("P1 C Down", Global.Config.N64Controller[0].CDown);
-			N64Controls.BindMulti("P1 C Left", Global.Config.N64Controller[0].CLeft);
-			N64Controls.BindMulti("P1 C Right", Global.Config.N64Controller[0].CRight);
-			N64Controls.BindMulti("P1 L", Global.Config.N64Controller[0].L);
-			N64Controls.BindMulti("P1 R", Global.Config.N64Controller[0].R);
-
-			N64Controls.BindMulti("P2 DPad U", Global.Config.N64Controller[1].DPadU);
-			N64Controls.BindMulti("P2 DPad L", Global.Config.N64Controller[1].DPadL);
-			N64Controls.BindMulti("P2 DPad R", Global.Config.N64Controller[1].DPadR);
-			N64Controls.BindMulti("P2 DPad D", Global.Config.N64Controller[1].DPadD);
-			N64Controls.BindMulti("P2 Start", Global.Config.N64Controller[1].Start);
-			N64Controls.BindMulti("P2 Z", Global.Config.N64Controller[1].Z);
-			N64Controls.BindMulti("P2 B", Global.Config.N64Controller[1].B);
-			N64Controls.BindMulti("P2 A", Global.Config.N64Controller[1].A);
-			N64Controls.BindMulti("P2 C Up", Global.Config.N64Controller[1].CUp);
-			N64Controls.BindMulti("P2 C Down", Global.Config.N64Controller[1].CDown);
-			N64Controls.BindMulti("P2 C Left", Global.Config.N64Controller[1].CLeft);
-			N64Controls.BindMulti("P2 C Right", Global.Config.N64Controller[1].CRight);
-			N64Controls.BindMulti("P2 L", Global.Config.N64Controller[1].L);
-			N64Controls.BindMulti("P2 R", Global.Config.N64Controller[1].R);
-
-			N64Controls.BindMulti("P3 DPad U", Global.Config.N64Controller[2].DPadU);
-			N64Controls.BindMulti("P3 DPad L", Global.Config.N64Controller[2].DPadL);
-			N64Controls.BindMulti("P3 DPad R", Global.Config.N64Controller[2].DPadR);
-			N64Controls.BindMulti("P3 DPad D", Global.Config.N64Controller[2].DPadD);
-			N64Controls.BindMulti("P3 Start", Global.Config.N64Controller[2].Start);
-			N64Controls.BindMulti("P3 Z", Global.Config.N64Controller[2].Z);
-			N64Controls.BindMulti("P3 B", Global.Config.N64Controller[2].B);
-			N64Controls.BindMulti("P3 A", Global.Config.N64Controller[2].A);
-			N64Controls.BindMulti("P3 C Up", Global.Config.N64Controller[2].CUp);
-			N64Controls.BindMulti("P3 C Down", Global.Config.N64Controller[2].CDown);
-			N64Controls.BindMulti("P3 C Left", Global.Config.N64Controller[2].CLeft);
-			N64Controls.BindMulti("P3 C Right", Global.Config.N64Controller[2].CRight);
-			N64Controls.BindMulti("P3 L", Global.Config.N64Controller[2].L);
-			N64Controls.BindMulti("P3 R", Global.Config.N64Controller[2].R);
-
-			N64Controls.BindMulti("P4 DPad U", Global.Config.N64Controller[3].DPadU);
-			N64Controls.BindMulti("P4 DPad L", Global.Config.N64Controller[3].DPadL);
-			N64Controls.BindMulti("P4 DPad R", Global.Config.N64Controller[3].DPadR);
-			N64Controls.BindMulti("P4 DPad D", Global.Config.N64Controller[3].DPadD);
-			N64Controls.BindMulti("P4 Start", Global.Config.N64Controller[3].Start);
-			N64Controls.BindMulti("P4 Z", Global.Config.N64Controller[3].Z);
-			N64Controls.BindMulti("P4 B", Global.Config.N64Controller[3].B);
-			N64Controls.BindMulti("P4 A", Global.Config.N64Controller[3].A);
-			N64Controls.BindMulti("P4 C Up", Global.Config.N64Controller[3].CUp);
-			N64Controls.BindMulti("P4 C Down", Global.Config.N64Controller[3].CDown);
-			N64Controls.BindMulti("P4 C Left", Global.Config.N64Controller[3].CLeft);
-			N64Controls.BindMulti("P4 C Right", Global.Config.N64Controller[3].CRight);
-			N64Controls.BindMulti("P4 L", Global.Config.N64Controller[3].L);
-			N64Controls.BindMulti("P4 R", Global.Config.N64Controller[3].R);
-
-			Global.N64Controls = N64Controls;
-
-			var N64AControls = new AutofireController(N64.N64ControllerDefinition);
-			
-			N64AControls.BindMulti("P1 DPad U", Global.Config.N64AutoController[0].DPadU);
-			N64AControls.BindMulti("P1 DPad L", Global.Config.N64AutoController[0].DPadL);
-			N64AControls.BindMulti("P1 DPad R", Global.Config.N64AutoController[0].DPadR);
-			N64AControls.BindMulti("P1 DPad D", Global.Config.N64AutoController[0].DPadD);
-			N64AControls.BindMulti("P1 Start", Global.Config.N64AutoController[0].Start);
-			N64AControls.BindMulti("P1 Z", Global.Config.N64AutoController[0].Z);
-			N64AControls.BindMulti("P1 B", Global.Config.N64AutoController[0].B);
-			N64AControls.BindMulti("P1 A", Global.Config.N64AutoController[0].A);
-			N64AControls.BindMulti("P1 C Up", Global.Config.N64AutoController[0].CUp);
-			N64AControls.BindMulti("P1 C Down", Global.Config.N64AutoController[0].CDown);
-			N64AControls.BindMulti("P1 C Left", Global.Config.N64AutoController[0].CLeft);
-			N64AControls.BindMulti("P1 C Right", Global.Config.N64AutoController[0].CRight);
-			N64AControls.BindMulti("P1 L", Global.Config.N64AutoController[0].L);
-			N64AControls.BindMulti("P1 R", Global.Config.N64AutoController[0].R);
-
-			N64AControls.BindMulti("P2 DPad U", Global.Config.N64AutoController[1].DPadU);
-			N64AControls.BindMulti("P2 DPad L", Global.Config.N64AutoController[1].DPadL);
-			N64AControls.BindMulti("P2 DPad R", Global.Config.N64AutoController[1].DPadR);
-			N64AControls.BindMulti("P2 DPad D", Global.Config.N64AutoController[1].DPadD);
-			N64AControls.BindMulti("P2 Start", Global.Config.N64AutoController[1].Start);
-			N64AControls.BindMulti("P2 Z", Global.Config.N64AutoController[1].Z);
-			N64AControls.BindMulti("P2 B", Global.Config.N64AutoController[1].B);
-			N64AControls.BindMulti("P2 A", Global.Config.N64AutoController[1].A);
-			N64AControls.BindMulti("P2 C Up", Global.Config.N64AutoController[1].CUp);
-			N64AControls.BindMulti("P2 C Down", Global.Config.N64AutoController[1].CDown);
-			N64AControls.BindMulti("P2 C Left", Global.Config.N64AutoController[1].CLeft);
-			N64AControls.BindMulti("P2 C Right", Global.Config.N64AutoController[1].CRight);
-			N64AControls.BindMulti("P2 L", Global.Config.N64AutoController[1].L);
-			N64AControls.BindMulti("P2 R", Global.Config.N64AutoController[1].R);
-
-			N64AControls.BindMulti("P3 DPad U", Global.Config.N64AutoController[2].DPadU);
-			N64AControls.BindMulti("P3 DPad L", Global.Config.N64AutoController[2].DPadL);
-			N64AControls.BindMulti("P3 DPad R", Global.Config.N64AutoController[2].DPadR);
-			N64AControls.BindMulti("P3 DPad D", Global.Config.N64AutoController[2].DPadD);
-			N64AControls.BindMulti("P3 Start", Global.Config.N64AutoController[2].Start);
-			N64AControls.BindMulti("P3 Z", Global.Config.N64AutoController[2].Z);
-			N64AControls.BindMulti("P3 B", Global.Config.N64AutoController[2].B);
-			N64AControls.BindMulti("P3 A", Global.Config.N64AutoController[2].A);
-			N64AControls.BindMulti("P3 C Up", Global.Config.N64AutoController[2].CUp);
-			N64AControls.BindMulti("P3 C Down", Global.Config.N64AutoController[2].CDown);
-			N64AControls.BindMulti("P3 C Left", Global.Config.N64AutoController[2].CLeft);
-			N64AControls.BindMulti("P3 C Right", Global.Config.N64AutoController[2].CRight);
-			N64AControls.BindMulti("P3 L", Global.Config.N64AutoController[2].L);
-			N64AControls.BindMulti("P3 R", Global.Config.N64AutoController[2].R);
-
-			N64AControls.BindMulti("P4 DPad U", Global.Config.N64AutoController[3].DPadU);
-			N64AControls.BindMulti("P4 DPad L", Global.Config.N64AutoController[3].DPadL);
-			N64AControls.BindMulti("P4 DPad R", Global.Config.N64AutoController[3].DPadR);
-			N64AControls.BindMulti("P4 DPad D", Global.Config.N64AutoController[3].DPadD);
-			N64AControls.BindMulti("P4 Start", Global.Config.N64AutoController[3].Start);
-			N64AControls.BindMulti("P4 Z", Global.Config.N64AutoController[3].Z);
-			N64AControls.BindMulti("P4 B", Global.Config.N64AutoController[3].B);
-			N64AControls.BindMulti("P4 A", Global.Config.N64AutoController[3].A);
-			N64AControls.BindMulti("P4 C Up", Global.Config.N64AutoController[3].CUp);
-			N64AControls.BindMulti("P4 C Down", Global.Config.N64AutoController[3].CDown);
-			N64AControls.BindMulti("P4 C Left", Global.Config.N64AutoController[3].CLeft);
-			N64AControls.BindMulti("P4 C Right", Global.Config.N64AutoController[3].CRight);
-			N64AControls.BindMulti("P4 L", Global.Config.N64AutoController[3].L);
-			N64AControls.BindMulti("P4 R", Global.Config.N64AutoController[3].R);
-
-			Global.AutofireN64Controls = N64AControls;
- 
-			*/
 		}
 
 		private static void FormDragEnter(object sender, DragEventArgs e)
@@ -1947,90 +1116,6 @@ namespace BizHawk.MultiClient
 			Global.ActiveController = BindToDefinition(def, Global.Config.AllTrollers);
 			Global.AutoFireController = BindToDefinitionAF(def, Global.Config.AllTrollersAutoFire);
 
-			/*
-			if (Global.Game == null) return;
-			switch (Global.Game.System)
-			{
-
-				case "SG":
-				case "SMS":
-					Global.ActiveController = Global.SMSControls;
-					Global.AutoFireController = Global.AutofireSMSControls;
-					break;
-				case "GG":
-					Global.ActiveController = Global.SMSControls;
-					Global.AutoFireController = Global.AutofireSMSControls;
-					break;
-				case "A26":
-					Global.ActiveController = Global.Atari2600Controls;
-					Global.AutoFireController = Global.AutofireAtari2600Controls;
-					break;
-				case "A78":
-					Global.ActiveController = Global.Atari7800Controls;
-					Global.AutoFireController = Global.AutofireAtari7800Controls;
-					break;
-				case "PCE":
-				case "PCECD":
-					Global.ActiveController = Global.PCEControls;
-					Global.AutoFireController = Global.AutofirePCEControls;
-					break;
-				case "SGX":
-					Global.ActiveController = Global.PCEControls;
-					Global.AutoFireController = Global.AutofirePCEControls;
-					break;
-				case "GEN":
-					Global.ActiveController = Global.GenControls;
-					Global.AutoFireController = Global.AutofireGenControls;
-					break;
-				case "TI83":
-					Global.ActiveController = Global.TI83Controls;
-					break;
-				case "NES":
-					Global.ActiveController = Global.NESControls;
-					Global.AutoFireController = Global.AutofireNESControls;
-					break;
-				case "SNES":
-					Global.ActiveController = Global.SNESControls;
-					Global.AutoFireController = Global.AutofireSNESControls;
-					break;
-				case "GB":
-				case "GBC":
-					Global.ActiveController = Global.GBControls;
-					Global.AutoFireController = Global.AutofireGBControls;
-					break;
-				case "GBA":
-					Global.ActiveController = Global.GBAControls;
-					Global.AutoFireController = Global.AutofireGBAControls;
-					break;
-				case "Coleco":
-					Global.ActiveController = Global.ColecoControls;
-					Global.AutoFireController = Global.AutofireColecoControls;
-					break;
-				case "N64":
-					Global.ActiveController = Global.N64Controls;
-					Global.AutoFireController = Global.AutofireN64Controls;
-					break;
-				case "SAT":
-					Global.ActiveController = Global.SaturnControls;
-					Global.AutoFireController = Global.AutofireSaturnControls;
-					break;
-				case "C64":
-					Global.ActiveController = Global.Commodore64Controls;
-					Global.AutoFireController = Global.AutofireCommodore64Controls;
-					break;
-				case "INTV":
-					Global.ActiveController = Global.IntellivisionControls;
-					Global.AutoFireController = Global.AutofireIntellivisionControls;
-					break;
-				case "DGB":
-					Global.ActiveController = Global.DualGBControls;
-					Global.AutoFireController = Global.DualAutofireGBControls;
-					break;
-				default:
-					Global.ActiveController = Global.NullControls;
-					break;
-			}
-			*/
 			// allow propogating controls that are in the current controller definition but not in the prebaked one
 			Global.ActiveController.ForceType(new ControllerDefinition(Global.Emulator.ControllerDefinition));
 			Global.ClickyVirtualPadController.Type = new ControllerDefinition(Global.Emulator.ControllerDefinition);