diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index 0732390bbe..e11472ff0b 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -78,8 +78,11 @@
     <Compile Include="Buffer.cs" />
     <Compile Include="Consoles\Atari\2600\Atari2600.cs" />
     <Compile Include="Consoles\Atari\2600\Atari2600.Core.cs" />
-    <Compile Include="Consoles\Atari\2600\TIA.cs" />
+    <Compile Include="Consoles\Atari\2600\oldTIA.cs" />
     <Compile Include="Consoles\Atari\2600\M6532.cs" />
+    <Compile Include="Consoles\Atari\2600\TIA.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Consoles\Calculator\TI83.cs" />
     <Compile Include="Consoles\Nintendo\NES\APU.cs" />
     <Compile Include="Consoles\Nintendo\NES\BoardSystem.cs" />
@@ -344,4 +347,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
index 46375e5746..d7490b2e5d 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
@@ -11,7 +11,7 @@ namespace BizHawk
 		public byte[] rom;
 		public MOS6507 cpu;
 		public M6532 m6532;
-		public TIA tia;
+		public oldTIA tia;
 
 		bool resetSignal;
 
@@ -111,7 +111,7 @@ namespace BizHawk
 			cpu.WriteMemory = WriteMemory;
 
 			// Setup TIA
-			tia = new TIA(this, frameBuffer);
+			tia = new oldTIA(this, frameBuffer);
 			// Setup 6532
 			m6532 = new M6532(cpu, ram, this);
 
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/TIA.cs b/BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs
similarity index 95%
rename from BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
rename to BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs
index 50e0c9a84e..579459e391 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 namespace BizHawk.Emulation.Consoles.Atari
 {
 	// Emulates the TIA
-	public partial class TIA
+	public partial class oldTIA
 	{
 		Atari2600 core;
 
@@ -118,7 +118,7 @@ namespace BizHawk.Emulation.Consoles.Atari
 		  0xbb9f47, 0, 0xd2b656, 0, 0xe8cc63, 0, 0xfce070, 0
 		};
 
-		public TIA(Atari2600 core, int[] frameBuffer)
+		public oldTIA(Atari2600 core, int[] frameBuffer)
 		{
 			this.core = core;
 			BKcolor = 0x00;