diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index bba65607a0..e35b6096ec 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -150,6 +150,7 @@
     </Compile>
     <Compile Include="Consoles\Atari\7800\Atari7800.Core.cs" />
     <Compile Include="Consoles\Atari\7800\Atari7800.cs" />
+    <Compile Include="Consoles\Atari\7800\Atari7800Control.cs" />
     <Compile Include="Consoles\Atari\7800\EMU7800\AddressSpace.cs" />
     <Compile Include="Consoles\Atari\7800\EMU7800\Bios7800.cs" />
     <Compile Include="Consoles\Atari\7800\EMU7800\BufferElement.cs" />
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs
index 0ea5e497be..9ddd04b0c8 100644
--- a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs
+++ b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs
@@ -5,7 +5,7 @@ using BizHawk.Emulation.CPUs.M6502;
 using BizHawk.Emulation.Consoles.Atari;
 using EMU7800.Core;
 
-namespace BizHawk
+namespace BizHawk.Emulation
 {
 	partial class Atari7800
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
index a1853faedf..8bd3628b26 100644
--- a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
+++ b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using EMU7800.Core;
 
-namespace BizHawk
+namespace BizHawk.Emulation
 {
 	public partial class Atari7800 : IEmulator
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
new file mode 100644
index 0000000000..4709d9ff66
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using EMU7800.Core;
+
+namespace BizHawk.Emulation
+{
+	public class Atari7800Control
+	{
+
+
+	}
+}
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 89f62988da..7d65f5eb8a 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1907,7 +1907,7 @@ namespace BizHawk.MultiClient
 
 								string gamedbpath = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "EMU7800.csv");
 
-								Atari7800 a78 = new Atari7800(nextComm, game, rom.RomData, NTSC_BIOS7800, PAL_BIOS7800, HighScoreBIOS, gamedbpath);
+								var a78 = new BizHawk.Emulation.Atari7800(nextComm, game, rom.RomData, NTSC_BIOS7800, PAL_BIOS7800, HighScoreBIOS, gamedbpath);
 								nextEmulator = a78;
 								break;
 							case "C64":