diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 32d0bd4572..199a49cb6b 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -169,6 +169,12 @@
     <Compile Include="config\ControllerConfig.Designer.cs">
       <DependentUpon>ControllerConfig.cs</DependentUpon>
     </Compile>
+    <Compile Include="config\ControllerConfig\ButtonListConfigPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="config\ControllerConfig\ButtonListConfigPanel.Designer.cs">
+      <DependentUpon>ButtonListConfigPanel.cs</DependentUpon>
+    </Compile>
     <Compile Include="config\ControllerConfig\ControllerConfigPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -458,6 +464,9 @@
     <EmbeddedResource Include="config\ControllerConfig.resx">
       <DependentUpon>ControllerConfig.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="config\ControllerConfig\ButtonListConfigPanel.resx">
+      <DependentUpon>ButtonListConfigPanel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="config\ControllerConfig\ControllerConfigPanel.resx">
       <DependentUpon>ControllerConfigPanel.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/BizHawk.MultiClient/config/ControllerConfig/ButtonListConfigPanel.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig/ButtonListConfigPanel.Designer.cs
new file mode 100644
index 0000000000..6b7221f008
--- /dev/null
+++ b/BizHawk.MultiClient/config/ControllerConfig/ButtonListConfigPanel.Designer.cs
@@ -0,0 +1,45 @@
+namespace BizHawk.MultiClient
+{
+	partial class ButtonListConfigPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.SuspendLayout();
+			// 
+			// ButtonListConfigPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Name = "ButtonListConfigPanel";
+			this.Load += new System.EventHandler(this.ButtonListConfigPanel_Load);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+	}
+}
diff --git a/BizHawk.MultiClient/config/ControllerConfig/ButtonListConfigPanel.cs b/BizHawk.MultiClient/config/ControllerConfig/ButtonListConfigPanel.cs
new file mode 100644
index 0000000000..1260e33ad0
--- /dev/null
+++ b/BizHawk.MultiClient/config/ControllerConfig/ButtonListConfigPanel.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Reflection;
+
+namespace BizHawk.MultiClient
+{
+	public partial class ButtonListConfigPanel : UserControl
+	{
+		List<object> ConfigObjects; //Object that values will be saved to (In Config.cs)
+
+		public List<string> buttons = new List<string>();
+
+		public int InputMarginLeft = 0;
+		public int LabelPadding = 10;
+
+		public int MarginTop = 0;
+		public int Spacing = 30;
+		public int InputSize = 200;
+
+		protected List<InputWidget> Inputs = new List<InputWidget>();
+		protected List<Label> Labels = new List<Label>();
+
+		public ButtonListConfigPanel()
+		{
+			InitializeComponent();
+		}
+
+		private void ButtonListConfigPanel_Load(object sender, EventArgs e)
+		{
+
+		}
+
+		public void Save()
+		{
+			for (int button = 0; button < buttons.Count; button++)
+			{
+				FieldInfo buttonF = ConfigObjects[button].GetType().GetField(buttons[button]);
+				buttonF.SetValue(ConfigObjects[button], Inputs[button].Text);
+			}
+		}
+
+		public void LoadSettings(List<object> stringobjs) //These must be string objects
+		{
+			ConfigObjects = stringobjs;
+
+			SetButtonList();
+			Startup();
+			SetWidgetStrings();
+		}
+
+		private void SetButtonList()
+		{
+			buttons.Clear();
+			
+			
+			
+			//MemberInfo[] members = ControllerConfigObject.GetType().GetMembers();
+
+			//foreach (MemberInfo member in members)
+			//{
+			//    Type type = member.GetType();
+
+			//    if (member.MemberType.ToString() == "Field" && member.ToString().Contains("System.String"))
+			//    {
+			//        buttons.Add(member.Name);
+			//    }
+			//}
+		}
+
+		private void SetWidgetStrings()
+		{
+			for (int button = 0; button < buttons.Count; button++)
+			{
+				//FieldInfo buttonF = ControllerConfigObject.GetType().GetField(buttons[button]);
+				//object field = ControllerConfigObject.GetType().GetField(buttons[button]).GetValue(ControllerConfigObject);
+				//Inputs[button].SetBindings(field.ToString());
+			}
+		}
+
+		private void Startup()
+		{
+			for (int i = 0; i < buttons.Count; i++)
+			{
+				InputWidget iw = new InputWidget();
+				iw.Location = new Point(InputMarginLeft, MarginTop + (i * Spacing));
+				iw.Size = new Size(InputSize, 23);
+				iw.TabIndex = i;
+				Controls.Add(iw);
+				Inputs.Add(iw);
+
+				Label l = new Label();
+				l.Location = new Point(InputMarginLeft + InputSize + LabelPadding, MarginTop + (i * Spacing) + 3);
+				l.Text = buttons[i];
+				Controls.Add(l);
+				Labels.Add(l);
+			}
+		}
+	}
+}
diff --git a/BizHawk.MultiClient/config/ControllerConfig/ButtonListConfigPanel.resx b/BizHawk.MultiClient/config/ControllerConfig/ButtonListConfigPanel.resx
new file mode 100644
index 0000000000..29dcb1b3a3
--- /dev/null
+++ b/BizHawk.MultiClient/config/ControllerConfig/ButtonListConfigPanel.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/BizHawk.MultiClient/config/ControllerConfig/NESConsoleButtons.cs b/BizHawk.MultiClient/config/ControllerConfig/NESConsoleButtons.cs
deleted file mode 100644
index 66047a902b..0000000000
--- a/BizHawk.MultiClient/config/ControllerConfig/NESConsoleButtons.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using System.Drawing;
-using System.Reflection;
-
-namespace BizHawk.MultiClient
-{
-	class NESConsoleButtons
-	{
-		public NESConsoleButtons()
-		{
-			//buttons = new List<string> { "Power", "Reset"};
-			//Startup();
-		}
-
-		public void Save()
-		{
-			//for (int button = 0; button < buttons.Count; button++)
-			//{
-			//    NESControllerTemplate o = Global.Config.NESController[ControllerNumber - 1];
-			//    FieldInfo buttonF = o.GetType().GetField(buttons[button]);
-			//    buttonF.SetValue(o, Inputs[button].Text);
-			//}
-		}
-
-		public void Load()
-		{
-			//for (int button = 0; button < buttons.Count; button++)
-			//{
-			//    NESControllerTemplate o = Global.Config.NESController[ControllerNumber - 1];
-			//    FieldInfo buttonF = o.GetType().GetField(buttons[button]);
-			//    object field = o.GetType().GetField(buttons[button]).GetValue(o);
-			//    Inputs[button].Text = field.ToString();
-			//}
-		}
-	}
-}