diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index 9cbefa4c9a..c469bf327b 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -78,11 +78,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
index 58d174cf58..0aa0d76b37 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
@@ -113,6 +113,23 @@ namespace BizHawk
case "CV": mapper = new mCV(); break;
case "F8": mapper = new mF8(); break;
case "F6": mapper = new mF6(); break;
+ case "F4": mapper = new mF4(); break;
+ case "FE": mapper = new mFE(); break;
+ case "E0": mapper = new mE0(); break;
+ case "3F": mapper = new m3F(); break;
+ case "FA": mapper = new mFA(); break;
+ case "E7": mapper = new mE7(); break;
+ case "F0": mapper = new mF0(); break;
+ case "UA": mapper = new mUA(); break;
+ //Homebrew mappers
+ case "3Fe": mapper = new m3Fe(); break;
+ case "3E": mapper = new m3E(); break;
+ case "0840": mapper = new m0840(); break;
+ case "MC": mapper = new mMC(); break;
+ case "EF": mapper = new mEF(); break;
+ case "X07": mapper = new mX07(); break;
+ case "4A50": mapper = new m4A50(); break;
+
default: throw new InvalidOperationException("mapper not supported: " + game.GetOptionsDict()["m"]);
}
mapper.core = this;
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs
new file mode 100644
index 0000000000..35c27709b5
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class m0840 : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs
new file mode 100644
index 0000000000..d21f0773a9
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class m3E : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs
new file mode 100644
index 0000000000..652844fd2e
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class m3F :MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs
new file mode 100644
index 0000000000..956261da58
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class m3Fe : MapperBase
+ {
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs
new file mode 100644
index 0000000000..347f286909
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class m4A50 : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs
new file mode 100644
index 0000000000..194bdb5bd5
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mE0 : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs
new file mode 100644
index 0000000000..bea152eea8
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mE7 : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs
new file mode 100644
index 0000000000..10df41a8fc
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mEF : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs
new file mode 100644
index 0000000000..c5407ee11e
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mF0 : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs
new file mode 100644
index 0000000000..a04a69fa51
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mF4 :MapperBase
+ {
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs
new file mode 100644
index 0000000000..7acd1758ff
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mFA : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs
new file mode 100644
index 0000000000..e2cc6d88f2
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mFE : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs
new file mode 100644
index 0000000000..5c3d52308c
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mMC : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs
new file mode 100644
index 0000000000..f3165195e6
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mUA : MapperBase
+ {
+
+ }
+}
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs
new file mode 100644
index 0000000000..b6838072e9
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.Emulation.Consoles.Atari._2600
+{
+ class mX07 : MapperBase
+ {
+
+ }
+}