diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
index 8fba46ba58..79fc26dbf1 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -4,12 +4,12 @@ using System.Linq;
 using System.Text;
 using System.IO;
 
-namespace BizHawk.Emulation.Consoles.Gambatte
+namespace BizHawk.Emulation.Consoles.GB
 {
 	/// <summary>
 	/// a gameboy/gameboy color emulator wrapped around native C++ libgambatte
 	/// </summary>
-	public class Gambatte : IEmulator, IVideoProvider, ISoundProvider
+	public class Gameboy : IEmulator, IVideoProvider, ISoundProvider
 	{
 		/// <summary>
 		/// internal gambatte state
@@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Consoles.Gambatte
 		IntPtr GambatteState = IntPtr.Zero;
 
 
-		public Gambatte(byte[] romdata)
+		public Gameboy(byte[] romdata)
 		{
 			// use temp file until we hack up the libgambatte api to take data directly
 
@@ -50,7 +50,7 @@ namespace BizHawk.Emulation.Consoles.Gambatte
 
 
 
-		static readonly ControllerDefinition GbController = new ControllerDefinition
+		public static readonly ControllerDefinition GbController = new ControllerDefinition
 		{
 			Name = "Gameboy Controller",
 			BoolButtons =
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs
index 69f73d3cdc..5737e73626 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Runtime.InteropServices;
 
-namespace BizHawk.Emulation.Consoles.Gambatte
+namespace BizHawk.Emulation.Consoles.GB
 {
 	/// <summary>
 	/// static bindings into libgambatte.dll
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 1a11180df7..eba104add3 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -16,6 +16,7 @@ using BizHawk.Emulation.Consoles.Coleco;
 using BizHawk.MultiClient.tools;
 using System.Collections.Generic;
 using BizHawk.Emulation.Consoles.Intellivision;
+using BizHawk.Emulation.Consoles.GB;
 
 namespace BizHawk.MultiClient
 {
@@ -772,29 +773,28 @@ namespace BizHawk.MultiClient
 			}
 			Global.AutofireNESControls = anesControls;
 
-            // TODO: wire this up to gambatte instead
-            //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);
-            //Global.GBControls = gbControls;
+            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);
+            Global.GBControls = gbControls;
 
-            //var agbControls = new AutofireController(Gameboy.GbController);
-            //agbControls.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 agbControls = new AutofireController(Gameboy.GbController);
+            agbControls.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 genControls = new Controller(Genesis.GenesisController);
 			genControls.BindMulti("P1 Up", Global.Config.GenesisController[0].Up);
@@ -1380,14 +1380,9 @@ namespace BizHawk.MultiClient
 								}
 								break;
 							case "GB":
-								/*
-								Gameboy gb = new Gameboy(game, rom.FileData, Global.Config.GameBoySkipBIOS);
+								Emulation.Consoles.GB.Gameboy gb = new Emulation.Consoles.GB.Gameboy(rom.FileData);
 								nextEmulator = gb;
 								break;
-								 */
-								Emulation.Consoles.Gambatte.Gambatte gambatte = new Emulation.Consoles.Gambatte.Gambatte(rom.FileData);
-								nextEmulator = gambatte;
-								break;
 							case "COLV":
 								SMS c = new SMS(game, rom.RomData);//new ColecoVision(game, rom.FileData);
 								nextEmulator = c;