diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index a66fb72f8b..d0c9cbdd76 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -198,6 +198,9 @@
   <ItemGroup>
     <None Include="images\restart.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="config\ControllerImages\SMSController.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index 9b2c783196..b0e33df7fe 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -116,6 +116,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap SMSController {
+            get {
+                object obj = ResourceManager.GetObject("SMSController", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap undo {
             get {
                 object obj = ResourceManager.GetObject("undo", resourceCulture);
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx
index 0c6bf21fe2..9a1ce7b7df 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -142,6 +142,9 @@
   <data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="SMSController" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\config\ControllerImages\SMSController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/BizHawk.MultiClient/config/ControllerImages/SMSController.png b/BizHawk.MultiClient/config/ControllerImages/SMSController.png
new file mode 100644
index 0000000000..81d1c280d8
Binary files /dev/null and b/BizHawk.MultiClient/config/ControllerImages/SMSController.png differ
diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs
index 2ffba20981..960992723d 100644
--- a/BizHawk.MultiClient/config/InputConfig.cs
+++ b/BizHawk.MultiClient/config/InputConfig.cs
@@ -21,8 +21,43 @@ namespace BizHawk.MultiClient
         {
             this.Text = ControllerStr + "SMS / GG / SG-1000";
 
-            Button Up = new Button();
-            Button Down = new Button();
+            Label UpLabel = new Label();
+            UpLabel.Text = "Up";
+            UpLabel.Location = new Point(8, 20);
+            TextBox Up = new TextBox();
+            Up.Location = new Point(48, 20);
+
+
+            Label DownLabel = new Label();
+            DownLabel.Text = "Down";
+            DownLabel.Location = new Point(8, 44);
+            TextBox Down = new TextBox();
+            Down.Location = new Point(48, 44);
+
+            Label LeftLabel = new Label();
+            LeftLabel.Text = "Left";
+            LeftLabel.Location = new Point(8, 68);
+            TextBox Left = new TextBox();
+            Left.Location = new Point(48, 68);
+
+            Label RightLabel = new Label();
+            RightLabel.Text = "Right";
+            RightLabel.Location = new Point(8, 92);
+            TextBox Right = new TextBox();
+            Right.Location = new Point(48, 92);
+            
+
+            ButtonsGroupBox.Controls.Add(Up);
+            ButtonsGroupBox.Controls.Add(UpLabel);
+            ButtonsGroupBox.Controls.Add(Down);
+            ButtonsGroupBox.Controls.Add(DownLabel);
+            ButtonsGroupBox.Controls.Add(Left);
+            ButtonsGroupBox.Controls.Add(LeftLabel);
+            ButtonsGroupBox.Controls.Add(Right);
+            ButtonsGroupBox.Controls.Add(RightLabel);
+
+            ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.SMSController;
+
         }
 
         private void DoPCE()