diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index da20a39d4a..1ea74c2b0b 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -164,6 +164,7 @@
     <Compile Include="Consoles\PC Engine\MemoryMap.Populous.cs" />
     <Compile Include="Consoles\PC Engine\ScsiCDBus.cs" />
     <Compile Include="Consoles\PC Engine\TurboCD.cs" />
+    <Compile Include="Consoles\PSX\PSX.cs" />
     <Compile Include="Consoles\Sega\Genesis\Input.cs" />
     <Compile Include="Consoles\Sega\SMS\MemoryMap.CodeMasters.cs" />
     <Compile Include="Consoles\Sega\SMS\MemoryMap.Sega.cs" />
@@ -240,9 +241,6 @@
     <Compile Include="DiscSystem\TOC_format.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ExternalCores\EmuFile.cs" />
-    <Compile Include="ExternalCores\ExternalCore.cs" />
-    <Compile Include="ExternalCores\PsxCore.cs" />
     <Compile Include="Interfaces\Base Implementations\IPS.cs" />
     <Compile Include="Interfaces\Base Implementations\Movies.cs" />
     <Compile Include="Interfaces\Base Implementations\NullController.cs" />
@@ -293,7 +291,6 @@
     <Content Include="Consoles\PC Engine\Compat.txt" />
     <Content Include="Consoles\Sega\Genesis\Compat.txt" />
     <Content Include="Consoles\Sega\SMS\Compat.txt" />
-    <Content Include="ExternalCores\Snippets.txt" />
     <Content Include="Notes.txt" />
   </ItemGroup>
   <ItemGroup>
@@ -313,7 +310,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\PsxHawk.API\PsxHawk.API.vcxproj">
+      <Project>{E160DA07-E926-4C7B-8A38-D45F4FE16725}</Project>
+      <Name>PsxHawk.API</Name>
+    </ProjectReference>
+  </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.Emulation/CPUs/Z80-GB/Execute.cs b/BizHawk.Emulation/CPUs/Z80-GB/Execute.cs
index ce4b72f0db..b15efd1a0e 100644
--- a/BizHawk.Emulation/CPUs/Z80-GB/Execute.cs
+++ b/BizHawk.Emulation/CPUs/Z80-GB/Execute.cs
@@ -108,7 +108,6 @@ namespace BizHawk.Emulation.CPUs.Z80GB
 				case 0x10: // STOP
 					Console.WriteLine("STOP!!!!!!!!!!!!!!!!!!!!!!"); // TODO this instruction is actually STOP. not DJNZ d.
 					throw new Exception("CPU stopped. What now?");
-					break;
 				case 0x11: // LD DE, nn
 					RegDE.Word = (ushort)(ReadMemory(RegPC.Word++) + ReadMemory(RegPC.Word++) * 256);
 					break;
diff --git a/BizHawk.Emulation/Consoles/Calculator/TI83.cs b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
index bca96b56b0..640299a2a7 100644
--- a/BizHawk.Emulation/Consoles/Calculator/TI83.cs
+++ b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
@@ -8,7 +8,7 @@ using BizHawk.Emulation.CPUs.Z80;
 
 namespace BizHawk.Emulation.Consoles.Calculator
 {
-    [CoreVersion("0.8.1", FriendlyName = "TI-83")]
+	[CoreVersion("0.8.1", FriendlyName = "TI-83")]
 	public class TI83 : IEmulator
 	{
 		//hardware
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs
index 710097c451..27c0bc2aed 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs
@@ -379,11 +379,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 					if (noise_bit || len_cnt==0) sample = 0;
 					else
 						sample = env_output;
-
-					if (sample != 0)
-					{
-						int zzz = 9;
-					}
 				}
 			}
 
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
index cfcc51fc33..54aa18220e 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
@@ -124,11 +124,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 
 		public override void WritePPU(int addr, byte value)
 		{
-			if (addr < 0x2000)
-			{
-				int zzz = 9;
-				//Console.WriteLine("{0:X4} = {1:X2}", addr, value);
-			}
 			base.WritePPU(addr, value);
 		}
 
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
index 5e7d2ef6a5..a1c2eb0513 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
@@ -12,7 +12,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 		{
 			//TBD
 			return false;
-			return true;
 		}
 	}
 }
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs
index a50bdf383b..f081295feb 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs
@@ -303,8 +303,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 
 			if (irq_mode)
 			{
-				throw new InvalidOperationException("needed a test case for this; you found one!");
 				ClockIRQ();
+				throw new InvalidOperationException("needed a test case for this; you found one!");
 			}
 			else
 			{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs
index 38f5f8a5ae..217d12378e 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs
@@ -232,8 +232,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 
 			if (irq_mode)
 			{
-				throw new InvalidOperationException("needed a test case for this; you found one!");
 				ClockIRQ();
+				throw new InvalidOperationException("needed a test case for this; you found one!");
 			}
 			else
 			{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs
index 9cb0cf02f7..9528737f97 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs
@@ -206,8 +206,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 
 			if (irq_mode)
 			{
-				throw new InvalidOperationException("needed a test case for this; you found one!");
 				ClockIRQ();
+				throw new InvalidOperationException("needed a test case for this; you found one!");
 			}
 			else
 			{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
index 9ee5fd0d8c..fadd0a2c05 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
@@ -397,10 +397,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				{
 					ppur._vt = value >> 3;
 					ppur._fv = value & 7;
-					if (ppur._vt == 30)
-					{
-						int zz = 9;
-					}
 					//nes.LogLine("scroll wrote vt = {0} and fv = {1}", ppur._vt, ppur._fv);
 				}
 				vtoggle ^= true;
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs b/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs
index f3b2d2380c..2f58cd5a40 100644
--- a/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs
+++ b/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs
@@ -196,13 +196,13 @@ namespace BizHawk.Emulation.Consoles.Sega
                         Log.Note("VDP", "Full Screen VScroll");*/
 
                     int hscrollmode = data & 3;
-                    switch (hscrollmode)
-                    {
-                        //case 0: Log.Note("VDP", "Full Screen HScroll"); break;
-                        //case 1: Log.Note("VDP", "Prohibited HSCROLL mode!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); break;
-                        //case 2: Log.Note("VDP", "HScroll every 1 cell"); break;
-                        //case 3: Log.Note("VDP", "HScroll every 2 cell"); break;
-                    }
+										//switch (hscrollmode)
+										//{
+										//    case 0: Log.Note("VDP", "Full Screen HScroll"); break;
+										//    case 1: Log.Note("VDP", "Prohibited HSCROLL mode!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); break;
+										//    case 2: Log.Note("VDP", "HScroll every 1 cell"); break;
+										//    case 3: Log.Note("VDP", "HScroll every 2 cell"); break;
+										//}
                     break;
 
                 case 0x0C: // Mode Set #4
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs b/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs
index 8c06cf9a1b..f307557a2f 100644
--- a/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs
+++ b/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs
@@ -80,10 +80,10 @@ namespace BizHawk.Emulation.Consoles.Sega
             {
                 return ((ushort)ReadWord(address) | (ushort)(ReadWord(address + 2) << 16));
             }
-            if (address == 0xA10008) return 0; // FIXME HACK for tg-sync.
+            //if (address == 0xA10008) return 0; // FIXME HACK for tg-sync.
 
-            Console.WriteLine("UNHANDLED READL {0:X6}", address);
-            return 0x7DCDCDCD;
+            //Console.WriteLine("UNHANDLED READL {0:X6}", address);
+            //return 0x7DCDCDCD;
         }
 
         public void WriteByte(int address, sbyte value)
@@ -127,11 +127,13 @@ namespace BizHawk.Emulation.Consoles.Sega
                 {
                     case 0x00:
                     case 0x02:
-                        VDP.WriteVdpData((ushort) (value | (value << 8)));
+                        //zero 15-feb-2012 -  added latter two ushort casts to kill a warning
+                        VDP.WriteVdpData((ushort) ((ushort)value | ((ushort)value << 8)));
                         return;
                     case 0x04:
                     case 0x06:
-                        VDP.WriteVdpControl((ushort) (value | (value << 8)));
+                        //zero 15-feb-2012 -  added latter two ushort casts to kill a warning
+                        VDP.WriteVdpControl((ushort) ((ushort)value | ((ushort)value << 8)));
                         return;
                     case 0x11:
                     case 0x13:
diff --git a/BizHawk.Emulation/DiscSystem/CUE_format.cs b/BizHawk.Emulation/DiscSystem/CUE_format.cs
index f4a90076a1..a902a0d48d 100644
--- a/BizHawk.Emulation/DiscSystem/CUE_format.cs
+++ b/BizHawk.Emulation/DiscSystem/CUE_format.cs
@@ -440,7 +440,6 @@ namespace BizHawk.DiscSystem
 			int last_index_num = -1;
 			CueFile currFile = null;
 			CueTrack currTrack = null;
-			int state = 0;
 			for (; ; )
 			{
 				string line = tr.ReadLine();
diff --git a/BizHawk.Emulation/DiscSystem/Disc.cs b/BizHawk.Emulation/DiscSystem/Disc.cs
index bd7ea8a4c5..715d1130f3 100644
--- a/BizHawk.Emulation/DiscSystem/Disc.cs
+++ b/BizHawk.Emulation/DiscSystem/Disc.cs
@@ -79,7 +79,6 @@ namespace BizHawk.DiscSystem
 		public interface IBlob : IDisposable
 		{
 			int Read(long byte_pos, byte[] buffer, int offset, int count);
-			void Dispose();
 		}
 
 		class Blob_RawFile : IBlob
diff --git a/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs b/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs
index b2bf56677d..839115c44d 100644
--- a/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs	
+++ b/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs	
@@ -55,7 +55,7 @@ namespace BizHawk
 		public int BackgroundColor { get { return 0; } }
 		public void GetSamples(short[] samples) { }
 		public void DiscardSamples() { }
-        public int MaxVolume { get; set; }
+		public int MaxVolume { get; set; }
 		private IList<MemoryDomain> memoryDomains;
 		public IList<MemoryDomain> MemoryDomains { get { return memoryDomains; } }
 		public MemoryDomain MainMemory { get { return memoryDomains[0]; } }
@@ -68,6 +68,6 @@ namespace BizHawk
 
 		public void GetSamples(short[] samples) { }
 		public void DiscardSamples() { }
-        public int MaxVolume { get; set; }
+		public int MaxVolume { get; set; }
 	}
 }
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index add72c303f..4a0ade3f40 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -41,7 +41,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>output\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -53,7 +53,8 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>output\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -150,7 +151,6 @@
     <Compile Include="config\SoundConfig.Designer.cs">
       <DependentUpon>SoundConfig.cs</DependentUpon>
     </Compile>
-    <Compile Include="ExternalCoreSupport.cs" />
     <Compile Include="Gameboy\Debugger.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -438,6 +438,10 @@
       <Project>{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}</Project>
       <Name>BizHawk.Util</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PsxHawk.API\PsxHawk.API.vcxproj">
+      <Project>{E160DA07-E926-4C7B-8A38-D45F4FE16725}</Project>
+      <Name>PsxHawk.API</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="AboutBox.resx">
@@ -669,6 +673,8 @@
     <None Include="images\AutoSearch.png" />
     <None Include="images\Lightning.png" />
     <None Include="images\Bug.png" />
+    <None Include="images\console32x32.png" />
+    <None Include="images\console16x16.png" />
     <Content Include="images\logo.ico" />
     <Content Include="output\gamedb.txt" />
     <Content Include="output\gamedb_neshomebrew.txt" />
diff --git a/BizHawk.MultiClient/Global.cs b/BizHawk.MultiClient/Global.cs
index 1a216911d6..02fb09138f 100644
--- a/BizHawk.MultiClient/Global.cs
+++ b/BizHawk.MultiClient/Global.cs
@@ -162,7 +162,5 @@ namespace BizHawk.MultiClient
 		}
 
 		public static DiscHopper DiscHopper = new DiscHopper();
-
-		public static CoreAccessor PsxCoreLibrary = new CoreAccessor(new Win32LibAccessor("PsxHawk.Core.dll"));
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.MultiClient/LogConsole.cs b/BizHawk.MultiClient/LogConsole.cs
index 55d58d1f4a..d5d61d7f1b 100644
--- a/BizHawk.MultiClient/LogConsole.cs
+++ b/BizHawk.MultiClient/LogConsole.cs
@@ -145,17 +145,26 @@ namespace BizHawk.MultiClient
 			//attach to an existing console
 			attachedConsole = false;
 
-			if (Win32.AttachConsole(-1))
+			//ever since a recent KB, XP-based systems glitch out when attachconsole is called and theres no console to attach to.
+			if (System.Environment.OSVersion.Version.Major != 5)
 			{
-				hasConsole = true;
-				attachedConsole = true;
+				if (Win32.AttachConsole(-1))
+				{
+				  hasConsole = true;
+				  attachedConsole = true;
+				}
 			}
 
 			if (!attachedConsole)
 			{
 				Win32.FreeConsole();
 				if (Win32.AllocConsole())
+				{
+					//set icons for the console so we can tell them apart from the main window
+					Win32.SendMessage(Win32.GetConsoleWindow(), 0x0080/*WM_SETICON*/, 0/*ICON_SMALL*/, global::BizHawk.MultiClient.Properties.Resources.console16x16.GetHicon().ToInt32());
+					Win32.SendMessage(Win32.GetConsoleWindow(), 0x0080/*WM_SETICON*/, 1/*ICON_LARGE*/, global::BizHawk.MultiClient.Properties.Resources.console32x32.GetHicon().ToInt32());
 					hasConsole = true;
+				}
 				else
 					System.Windows.Forms.MessageBox.Show(string.Format("Couldn't allocate win32 console: {0}", Marshal.GetLastWin32Error()));
 			}
@@ -172,10 +181,10 @@ namespace BizHawk.MultiClient
 				conOut = Win32.CreateFile("CONOUT$", 0x40000000, 2, IntPtr.Zero, 3, 0, IntPtr.Zero);
 
 				if (!Win32.SetStdHandle(-11, conOut))
-					throw new Exception("SetStdHandle() failed");
+				  throw new Exception("SetStdHandle() failed");
 			}
 
-			DotNetRewireConout();
+			//DotNetRewireConout();
 			hasConsole = true;
 
 			if (attachedConsole)
@@ -185,6 +194,8 @@ namespace BizHawk.MultiClient
 			}
 		}
 
+
+
 		static void DotNetRewireConout()
 		{
 			Stream cstm = Console.OpenStandardOutput();
@@ -204,7 +215,23 @@ namespace BizHawk.MultiClient
 
 			conOut = IntPtr.Zero;
 			hasConsole = false;
-		} 
+		}
+
+		/// <summary>
+		/// pops the console in front of the main window (where it should probably go after booting up the game).
+		/// maybe this should be optional, or maybe we can somehow position the console sensibly.
+		/// sometimes it annoys me, but i really need it on top while debugging or else i will be annoyed.
+		/// best of all would be to position it beneath the bizhawk main window somehow.
+		/// </summary>
+		public static void PositionConsole()
+		{
+			if (ConsoleVisible == false) return;
+			if (Global.Config.WIN32_CONSOLE)
+			{
+				IntPtr x = Win32.GetConsoleWindow();
+				Win32.SetForegroundWindow(x);
+			}
+		}
 
 		public static void ShowConsole()
 		{
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 4998e9b802..8095752f81 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -75,6 +75,7 @@ namespace BizHawk.MultiClient
 			if (Global.Config.ShowLogWindow)
 			{
 				LogConsole.ShowConsole();
+				PsxApi.StdioFixes();
 				displayLogWindowToolStripMenuItem.Checked = true;
 			}
 
@@ -330,6 +331,9 @@ namespace BizHawk.MultiClient
 
 		public void ProgramRunLoop()
 		{
+			CheckMessages();
+			LogConsole.PositionConsole();
+
 			for (; ; )
 			{
 				Input.Instance.Update();
@@ -926,20 +930,30 @@ namespace BizHawk.MultiClient
 
 				try
 				{
-					if (file.Extension.ToLower() == ".iso")
+					if (file.Extension.ToLower() == ".exe")
 					{
-						if (Global.PsxCoreLibrary.IsOpen)
-						{
-							// sorry zero ;'( I leave de-RomGameifying this to you
-							//PsxCore psx = new PsxCore(Global.PsxCoreLibrary);
-							//nextEmulator = psx;
-							//game = new RomGame();
-							//var disc = Disc.FromIsoPath(path);
-							//Global.DiscHopper.Clear();
-							//Global.DiscHopper.Enqueue(disc);
-							//Global.DiscHopper.Insert();
-							//psx.SetDiscHopper(Global.DiscHopper);
-						}
+						PSX psx = new PSX();
+						nextEmulator = psx;
+						psx.LoadFile(file.CanonicalFullPath);
+						game = new GameInfo();
+						game.System = "PSX";
+						game.Name = "xx";
+						game.Hash = "xx";
+					}
+					else if (file.Extension.ToLower() == ".iso")
+					{
+						//if (Global.PsxCoreLibrary.IsOpen)
+						//{
+						//  // sorry zero ;'( I leave de-RomGameifying this to you
+						//  //PsxCore psx = new PsxCore(Global.PsxCoreLibrary);
+						//  //nextEmulator = psx;
+						//  //game = new RomGame();
+						//  //var disc = Disc.FromIsoPath(path);
+						//  //Global.DiscHopper.Clear();
+						//  //Global.DiscHopper.Enqueue(disc);
+						//  //Global.DiscHopper.Insert();
+						//  //psx.SetDiscHopper(Global.DiscHopper);
+						//}
 					}
 					else if (file.Extension.ToLower() == ".cue")
 					{
@@ -2123,7 +2137,8 @@ namespace BizHawk.MultiClient
 			ofd.InitialDirectory = PathManager.GetRomsPath(Global.Emulator.SystemId);
 			//"Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ROM;*.ZIP;*.7z|NES (*.NES)|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|TI-83|*.rom|Archive Files|*.zip;*.7z|Savestate|*.state|All Files|*.*";
 			ofd.Filter = FormatFilter(
-				"Rom Files", "*.nes;*.sms;*.gg;*.sg;*.pce;*.sgx;*.gb;*.bin;*.gen;*.smd;*.rom;*.cue;%ARCH%",
+				"Rom Files", "*.nes;*.sms;*.gg;*.sg;*.pce;*.sgx;*.gb;*.bin;*.gen;*.smd;*.rom;*.cue;*.exe;%ARCH%",
+				"PSX Executables", "*.exe",
 				"Disc Images", "*.cue",
 				"NES", "*.nes;%ARCH%",
 				"Master System", "*.sms;*.gg;*.sg;%ARCH%",
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index 3bf2c50694..335491c82f 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -158,6 +158,20 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap console16x16 {
+            get {
+                object obj = ResourceManager.GetObject("console16x16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap console32x32 {
+            get {
+                object obj = ResourceManager.GetObject("console32x32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap CopyFolderHS {
             get {
                 object obj = ResourceManager.GetObject("CopyFolderHS", resourceCulture);
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx
index d8f7ce0832..f136d47ccd 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -804,4 +804,10 @@
   <data name="Bug" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Bug.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="console16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\console16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="console32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\console32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BizHawk.MultiClient/RomGame.cs b/BizHawk.MultiClient/RomGame.cs
index ace16a0ce9..c78dcf72ca 100644
--- a/BizHawk.MultiClient/RomGame.cs
+++ b/BizHawk.MultiClient/RomGame.cs
@@ -7,7 +7,7 @@ namespace BizHawk.MultiClient
 	{
 		public byte[] RomData;
 		public byte[] FileData;
-	    public GameInfo GameInfo;
+		public GameInfo GameInfo;
 
 		private const int BankSize = 4096;
 
diff --git a/BizHawk.MultiClient/images/console16x16.png b/BizHawk.MultiClient/images/console16x16.png
new file mode 100644
index 0000000000..d82c2e732d
Binary files /dev/null and b/BizHawk.MultiClient/images/console16x16.png differ
diff --git a/BizHawk.MultiClient/images/console32x32.png b/BizHawk.MultiClient/images/console32x32.png
new file mode 100644
index 0000000000..d77d505ab9
Binary files /dev/null and b/BizHawk.MultiClient/images/console32x32.png differ
diff --git a/BizHawk.Util/Win32.cs b/BizHawk.Util/Win32.cs
index 7a5c2cc6b6..00b4be3e8c 100644
--- a/BizHawk.Util/Win32.cs
+++ b/BizHawk.Util/Win32.cs
@@ -305,6 +305,15 @@ namespace BizHawk
 			FileTypeUnknown = 0x0000,
 		}
 
+		[DllImport("kernel32.dll", SetLastError = true)]
+		public static extern IntPtr GetConsoleWindow();
+
+		[DllImport("user32.dll", SetLastError = true)]
+		public static extern bool SetForegroundWindow(IntPtr hWnd);
+
+		[DllImport("user32.dll", SetLastError = true)]
+		public static extern IntPtr SetActiveWindow(IntPtr hWnd);
+
 		[DllImport("kernel32.dll", SetLastError = true)]
 		public static extern bool AttachConsole(int dwProcessId);
 
diff --git a/BizHawk.sln b/BizHawk.sln
index 436feef7ed..9d701faad7 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -13,11 +13,11 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PsxHawk.Core", "PsxHawk.Core\PsxHawk.Core.vcxproj", "{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1CE74E20-B345-4126-AACB-A21FA23149DE} = {1CE74E20-B345-4126-AACB-A21FA23149DE}
-	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BizHawk.UnmanagedCore", "BizHawk.UnmanagedCore\BizHawk.UnmanagedCore.vcxproj", "{1CE74E20-B345-4126-AACB-A21FA23149DE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PsxHawk.API", "PsxHawk.API\PsxHawk.API.vcxproj", "{E160DA07-E926-4C7B-8A38-D45F4FE16725}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7B67D95B-29E0-4F9D-9767-42C35CEC3F25} = {7B67D95B-29E0-4F9D-9767-42C35CEC3F25}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,41 +34,49 @@ Global
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Win32.Build.0 = Debug|Any CPU
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.ActiveCfg = Release|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.Build.0 = Release|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Win32.Build.0 = Debug|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Win32.ActiveCfg = Release|Any CPU
+		{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Win32.Build.0 = Release|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Win32.Build.0 = Debug|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DD448B37-BA3F-4544-9754-5406E8094723}.Release|Win32.ActiveCfg = Release|Any CPU
+		{DD448B37-BA3F-4544-9754-5406E8094723}.Release|Win32.Build.0 = Release|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|Win32.Build.0 = Debug|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.ActiveCfg = Release|Any CPU
+		{C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.Build.0 = Release|Any CPU
 		{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -79,16 +87,16 @@ Global
 		{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Release|Win32.ActiveCfg = Release|Win32
 		{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Release|Win32.Build.0 = Release|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Debug|Win32.Build.0 = Debug|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Release|Any CPU.ActiveCfg = Release|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Release|Win32.ActiveCfg = Release|Win32
-		{1CE74E20-B345-4126-AACB-A21FA23149DE}.Release|Win32.Build.0 = Release|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Win32.Build.0 = Debug|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Any CPU.ActiveCfg = Release|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Win32.ActiveCfg = Release|Win32
+		{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/PsxHawk.API/PsxHawk.API.vcxproj b/PsxHawk.API/PsxHawk.API.vcxproj
new file mode 100644
index 0000000000..c971e3148b
--- /dev/null
+++ b/PsxHawk.API/PsxHawk.API.vcxproj
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="api.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PsxHawk.Core\PsxHawk.Core.vcxproj">
+      <Project>{7b67d95b-29e0-4f9d-9767-42c35cec3f25}</Project>
+      <Private>true</Private>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E160DA07-E926-4C7B-8A38-D45F4FE16725}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>PsxHawkAPI</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../PsxHawk.Core</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../PsxHawk.Core</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/PsxHawk.API/PsxHawk.API.vcxproj.filters b/PsxHawk.API/PsxHawk.API.vcxproj.filters
new file mode 100644
index 0000000000..c5416353ac
--- /dev/null
+++ b/PsxHawk.API/PsxHawk.API.vcxproj.filters
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="api.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/PsxHawk.API/api.cpp b/PsxHawk.API/api.cpp
new file mode 100644
index 0000000000..c0a8372f3e
--- /dev/null
+++ b/PsxHawk.API/api.cpp
@@ -0,0 +1,60 @@
+/*
+this c++/cli file implements the bridge between PsxHawk.Core and managed code.
+currently this is a miserable little pile of hacks.
+*/
+
+#using <mscorlib.dll>
+#using <System.dll>
+#include <vcclr.h>
+#include <msclr/marshal.h>
+#include <msclr/marshal_cppstd.h>
+#include <string>
+
+#include "psx.h"
+#include "loader.h"
+
+using namespace msclr::interop;
+
+public ref class PsxApi
+{
+public:
+	PSX *psx;
+
+	//this endeavours to fix some issues with routing stdio between .net and the CRT
+	static void StdioFixes()
+	{
+		HANDLE handle = GetStdHandle(STD_OUTPUT_HANDLE);
+		DWORD fileType = GetFileType(handle);
+		bool shouldReopen = fileType == FILE_TYPE_CHAR;
+		if(shouldReopen)
+			freopen("CONOUT$", "w", stdout);
+
+		handle = GetStdHandle(STD_ERROR_HANDLE);
+		fileType = GetFileType(handle);
+		shouldReopen = fileType == FILE_TYPE_CHAR;
+		if(shouldReopen)
+			freopen("CONOUT$", "w", stderr);
+	}
+
+	PsxApi()
+	{
+		StdioFixes();
+
+		//initialize the psx instance
+		psx = new PSX();
+		psx->poweron(PSX::eConsoleType_DTL);	
+		Load_BIOS(*psx, "B:\\svn\\bizhawk4\\BizHawk.MultiClient\\output\\SCPH5500.bin"); //JP bios (apparently thats what region our test programs are, or what mednafen ends up using)
+		//Load_BIOS(psx, "scph5501.bin"); 
+		psx->reset();
+	}
+
+	void Load_EXE(System::String^ str)
+	{
+		::Load_EXE(*psx, marshal_as<std::wstring>(str).c_str());
+	}
+
+	void RunForever()
+	{
+		psx->RunForever();
+	}
+};
diff --git a/PsxHawk.Core/PsxCore.cpp b/PsxHawk.Core/PsxCore.cpp
deleted file mode 100644
index 53a8eec38e..0000000000
--- a/PsxHawk.Core/PsxCore.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "PsxCore.h"
-#include "core.h"
-#include <string.h>
-#include <stdlib.h>
-#include "emufile_hawk.h"
-#include "DiscInterface.h"
-
-
-static FunctionRecord records[] = {
-	REG("PsxCore.Construct", &PsxCore::Construct),
-	REG("PsxCore.GetResolution", &PsxCore::GetResolution),
-	REG("PsxCore.FrameAdvance", &PsxCore::FrameAdvance),
-	REG("PsxCore.UpdateVideoBuffer", &PsxCore::UpdateVideoBuffer)
-};
-
-PsxCore::PsxCore(void* _opaque)
-	: opaque(_opaque)
-{
-	discInterface = (DiscInterface*)ClientSignal(NULL,opaque,"GetDiscInterface",NULL);
-}
-
-PsxCore::Size PsxCore::GetResolution()
-{
-	con->fprintf("in PsxCore::GetResolution\n");
-	Size size = {256,256};
-	return size;
-}
-
-int videoBuffer[256*256];
-
-void PsxCore::FrameAdvance()
-{
-	for(int i=0;i<256*256;i++)
-	{
-		videoBuffer[i] = rand() | (rand()<<15) | 0xFF000000;
-	}
-	DiscInterface::TrackInfo ti = discInterface->GetTrack(0,0);
-	con->fprintf("lba len: %d\n",ti.length_lba);
-}
-
-void PsxCore::UpdateVideoBuffer(void* target)
-{
-	int* dest = (int*)target;
-	int* src = (int*)videoBuffer;
-	for(int i=0;i<256*256;i++)
-		*dest++ = *src++;
-}
-
diff --git a/PsxHawk.Core/PsxCore.h b/PsxHawk.Core/PsxCore.h
deleted file mode 100644
index a05d9681d6..0000000000
--- a/PsxHawk.Core/PsxCore.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _PSXCORE_H_
-#define _PSXCORE_H_
-
-#include <stdio.h>
-
-class DiscInterface;
-
-class PsxCore
-{
-public:
-	PsxCore(void* _opaque);
-
-private:
-	void* opaque;
-	DiscInterface* discInterface;
-
-public:
-	void* Construct(void* ManagedOpaque)
-	{
-		return new PsxCore(ManagedOpaque);
-	}
-
-	struct Size
-	{
-		int width,height;
-	};
-
-	Size GetResolution();
-	void FrameAdvance();
-	void UpdateVideoBuffer(void* target);
-};
-
-#endif //_PSXCORE_H_
diff --git a/PsxHawk.Core/PsxHawk.Core.vcxproj b/PsxHawk.Core/PsxHawk.Core.vcxproj
index 2c07e838d6..0ec21dd263 100644
--- a/PsxHawk.Core/PsxHawk.Core.vcxproj
+++ b/PsxHawk.Core/PsxHawk.Core.vcxproj
@@ -10,6 +10,20 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="asm.h" />
+    <ClInclude Include="dis.h" />
+    <ClInclude Include="loader.h" />
+    <ClInclude Include="psx.h" />
+    <ClInclude Include="types.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dis.cpp" />
+    <ClCompile Include="loader.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="psx.cpp" />
+    <ClCompile Include="psx.sio.cpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}</ProjectGuid>
     <RootNamespace>PsxHawkCore</RootNamespace>
@@ -18,12 +32,14 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CLRSupport>false</CLRSupport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>false</CLRSupport>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -40,7 +56,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\BizHawk.Multiclient\output\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -49,44 +65,58 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.dll</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\BizHawk.UnmanagedCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PSXHAWKCORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <GenerateMapFile>true</GenerateMapFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(TargetPath) $(SolutionDir)\BizHawk.MultiClient\output</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\BizHawk.UnmanagedCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PSXHAWKCORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <StringPooling>true</StringPooling>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <ErrorReporting>None</ErrorReporting>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -94,23 +124,17 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <LinkStatus>false</LinkStatus>
+      <AdditionalDependencies>winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LinkErrorReporting>NoErrorReport</LinkErrorReporting>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(TargetPath) $(SolutionDir)\BizHawk.MultiClient\output</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="PsxCore.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="PsxCore.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\BizHawk.UnmanagedCore\BizHawk.UnmanagedCore.vcxproj">
-      <Project>{1ce74e20-b345-4126-aacb-a21fa23149de}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/PsxHawk.Core/asm.h b/PsxHawk.Core/asm.h
new file mode 100644
index 0000000000..eacd8ed281
--- /dev/null
+++ b/PsxHawk.Core/asm.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include "types.h"
+
+//jtype
+#define OPCODE_J 2
+#define OPCODE_JAL 3
+
+//rtype
+#define FUNCTION_JR 8
+#define FUNCTION_BREAK 13
+
+//itype
+#define OPCODE_ORI 13
+#define OPCODE_LUI 15
+
+inline u32 ASM_JTYPE(const u32 opcode, const u32 target) 
+{
+	assert((target&3)==0);
+	assert(opcode<64);
+	const u32 _target = target & ~0xF0000000;
+	return (opcode<<26)|(_target>>2);
+}
+inline u32 ASM_JAL(const u32 target) { return ASM_JTYPE(OPCODE_JAL,target); }
+
+inline u32 ASM_RTYPE(const u32 function, const u32 rs, const u32 rt, const u32 rd, const u32 sa)
+{
+	assert(function<64);
+	assert(rs<32);
+	assert(rt<32);
+	assert(rd<32);
+	assert(sa<32);
+	return (rs<<21)|(rt<<16)|(rd<<11)|(sa<<6)|function;
+}
+inline u32 ASM_JR(const u32 rs) { return ASM_RTYPE(FUNCTION_JR, rs, 0, 0, 0); }
+inline u32 ASM_NOP() { return 0; }
+inline u32 ASM_BREAK(const u32 code)
+{
+	assert(code<(1<<20));
+	return (code<<6)|FUNCTION_BREAK;
+}
+
+inline u32 ASM_ITYPE(const u32 opcode, const u32 rs, const u32 rt, const u32 immediate)
+{
+	assert(opcode<64);
+	assert(rs<32);
+	assert(rt<32);
+	assert(immediate<65536);
+	return (opcode<<26)|(rs<<21)|(rt<<16)|immediate;
+}
+
+inline u32 ASM_LUI(const u32 rt, const u32 immediate) { return ASM_ITYPE(OPCODE_LUI,0,rt,immediate); }
+inline u32 ASM_ORI(const u32 rt, const u32 rs, const u32 immediate)  { return ASM_ITYPE(OPCODE_ORI,rs,rt,immediate); }
\ No newline at end of file
diff --git a/PsxHawk.Core/dis.cpp b/PsxHawk.Core/dis.cpp
new file mode 100644
index 0000000000..bf85af1a4a
--- /dev/null
+++ b/PsxHawk.Core/dis.cpp
@@ -0,0 +1,237 @@
+/*
+this disassembler is courtesy of mednafen
+*/
+
+#include "psx.h"
+#include "types.h"
+#include <string>
+#include <string.h>
+
+//TODO - add break opcode to disassembly
+
+namespace MDFN_IEN_PSX
+{
+
+struct OpEntry
+{
+ u32 mask;
+ u32 value;
+ const char *mnemonic;
+ const char *format;
+};
+
+#define MASK_OP (0x3F << 26)
+#define MASK_FUNC (0x3F)
+#define MASK_RS (0x1F << 21)
+#define MASK_RT (0x1F << 16)
+#define MASK_RD (0x1F << 11)
+#define MASK_SA (0x1F << 6)
+
+#define MK_OP(mnemonic, format, op, func, extra_mask)	{ MASK_OP | (op ? 0 : MASK_FUNC) | extra_mask, (op << 26) | func, mnemonic, format }
+
+#define MK_OP_REGIMM(mnemonic, regop)	{ MASK_OP | MASK_RT, (0x01 << 26) | (regop << 16), mnemonic, "s, p" }
+
+static OpEntry ops[] =
+{
+	MK_OP("nop",	"",	0, 0, MASK_RT | MASK_RD | MASK_SA),
+ MK_OP("sll",	"d, t, a", 0, 0, 0),
+ MK_OP("srl",   "d, t, a", 0, 2, 0),
+ MK_OP("sra",   "d, t, a", 0, 3, 0),
+
+ MK_OP("sllv",   "d, t, s", 0, 4, 0),
+ MK_OP("srlv",   "d, t, s", 0, 6, 0),
+ MK_OP("srav",   "d, t, s", 0, 7, 0),
+
+ MK_OP("jr",   	 "s", 0, 8, 0),
+ MK_OP("jalr",   "d, s", 0, 9, 0),
+
+ MK_OP("syscall", "", 0, 12, 0),	// TODO
+ MK_OP("break",   "", 0, 13, 0),	// TODO
+
+ MK_OP("mfhi",  "d", 0, 16, 0),
+ MK_OP("mthi",  "s", 0, 17, 0),
+ MK_OP("mflo",  "d", 0, 18, 0),
+ MK_OP("mtlo",  "s", 0, 19, 0),
+
+ MK_OP("mult",  "s, t", 0, 24, 0),
+ MK_OP("multu", "s, t", 0, 25, 0),
+ MK_OP("div",   "s, t", 0, 26, 0),
+ MK_OP("divu",  "s, t", 0, 27, 0),
+
+ MK_OP("add",   "d, s, t", 0, 32, 0),
+ MK_OP("addu",  "d, s, t", 0, 33, 0),
+ MK_OP("sub",	"d, s, t", 0, 34, 0),
+ MK_OP("subu",	"d, s, t", 0, 35, 0),
+ MK_OP("and",   "d, s, t", 0, 36, 0),
+ MK_OP("or",    "d, s, t", 0, 37, 0),
+ MK_OP("xor",   "d, s, t", 0, 38, 0),
+ MK_OP("nor",   "d, s, t", 0, 39, 0),
+ MK_OP("slt",   "d, s, t", 0, 42, 0),
+ MK_OP("sltu",  "d, s, t", 0, 43, 0),
+
+ MK_OP_REGIMM("bgez",	0x01),
+ MK_OP_REGIMM("bgezal", 0x11),
+ MK_OP_REGIMM("bltz",	0x00),
+ MK_OP_REGIMM("bltzal",	0x10),
+
+ 
+ MK_OP("j",	"P", 2, 0, 0),
+ MK_OP("jal",	"P", 3, 0, 0),
+
+ MK_OP("beq",	"s, t, p", 4, 0, 0),
+ MK_OP("bne",   "s, t, p", 5, 0, 0),
+ MK_OP("blez",  "s, p", 6, 0, 0),
+ MK_OP("bgtz",  "s, p", 7, 0, 0),
+
+ MK_OP("addi",  "t, s, i", 8, 0, 0),
+ MK_OP("addiu", "t, s, i", 9, 0, 0),
+ MK_OP("slti",  "t, s, i", 10, 0, 0),
+ MK_OP("sltiu", "t, s, i", 11, 0, 0),
+
+ MK_OP("andi",  "t, s, z", 12, 0, 0),
+
+ MK_OP("ori",  	"t, s, z", 13, 0, 0),
+ MK_OP("xori",  "t, s, z", 14, 0, 0),
+ MK_OP("lui",	"t, z", 15, 0, 0),
+
+ // COP0 stuff here
+ //#define MK_OP(mnemonic, format, op, func, extra_mask)	{ MASK_OP | (op ? 0 : MASK_FUNC) | extra_mask, (op << 26) | func, mnemonic, format }
+#define COPMF(num) ((num)<<21)
+ MK_OP("mfc0",  "t, D", 16, 0, 0x03E00000),
+ MK_OP("mfc1",  "t, D", 17, 0, 0x03E00000),
+ MK_OP("mfc2",  "t, D", 18, 0, 0x03E00000),
+ MK_OP("mfc3",  "t, D", 19, 0, 0x03E00000),
+ MK_OP("mtc0",  "t, D", 16, COPMF(4), 0x03E00000),
+ MK_OP("mtc1",  "t, D", 17, COPMF(4), 0x03E00000),
+ MK_OP("mtc2",  "t, D", 18, COPMF(4), 0x03E00000),
+ MK_OP("mtc3",  "t, D", 19, COPMF(4), 0x03E00000),
+ //MK_OP("rfe",   "",     19, COPMF(4), 0x03E00000), //TODO
+
+ MK_OP("lb",    "t, i(s)", 32, 0, 0),
+ MK_OP("lh",    "t, i(s)", 33, 0, 0),
+ MK_OP("lwl",   "t, i(s)", 34, 0, 0),
+ MK_OP("lw",    "t, i(s)", 35, 0, 0),
+ MK_OP("lbu",   "t, i(s)", 36, 0, 0),
+ MK_OP("lhu",   "t, i(s)", 37, 0, 0),
+ MK_OP("lwr",   "t, i(s)", 38, 0, 0),
+
+ MK_OP("sb",    "t, i(s)", 40, 0, 0),
+ MK_OP("sh",    "t, i(s)", 41, 0, 0),
+ MK_OP("swl",   "t, i(s)", 42, 0, 0),
+ MK_OP("sw",	"t, i(s)", 43, 0, 0),
+ MK_OP("swr",   "t, i(s)", 46, 0, 0),
+
+ { 0, 0, NULL, NULL }
+};
+
+std::string DisassembleMIPS(u32 PC, u32 instr)
+{
+ std::string ret = "UNKNOWN";
+ unsigned int rs = (instr >> 21) & 0x1F;
+ unsigned int rt = (instr >> 16) & 0x1F;
+ unsigned int rd = (instr >> 11) & 0x1F;
+ unsigned int shamt = (instr >> 6) & 0x1F;
+ unsigned int immediate = (s32)(s16)(instr & 0xFFFF);
+ unsigned int immediate_ze = (instr & 0xFFFF);
+ unsigned int jt = instr & ((1 << 26) - 1);
+
+ static const char *gpr_names[32] =
+ {
+  "r0", "at", "v0", "v1", "a0", "a1", "a2", "a3", "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7",
+    "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", "t8", "t9", "k0", "k1", "gp", "sp", "fp", "ra"
+ };
+
+ OpEntry *op = ops;
+
+ while(op->mnemonic)
+ {
+  if((instr & op->mask) == op->value)
+  {
+   // a = shift amount
+   // s = rs
+   // t = rt
+   // d = rd
+   // i = immediate
+   // z = immediate, zero-extended
+   // p = PC + 4 + immediate
+   // P = ((PC + 4) & 0xF0000000) | (26bitval << 2)
+   char s_a[16];
+   char s_i[16];
+   char s_z[16];
+   char s_p[16];
+   char s_P[16];
+	 char s_D[16];
+
+	_snprintf(s_D, sizeof(s_D), "%d", rd);
+
+   _snprintf(s_a, sizeof(s_a), "%d", shamt);
+
+   if(immediate < 0)
+    _snprintf(s_i, sizeof(s_i), "%d", immediate);
+   else
+    _snprintf(s_i, sizeof(s_i), "0x%04x", (u32)immediate);
+
+   _snprintf(s_z, sizeof(s_z), "0x%04x", immediate_ze);
+
+   _snprintf(s_p, sizeof(s_p), "0x%08x", PC + 4 + (immediate << 2));
+
+   _snprintf(s_P, sizeof(s_P), "0x%08x", ((PC + 4) & 0xF0000000) | (jt << 2));
+
+   ret = std::string(op->mnemonic);
+   ret.append(10 - ret.size(), ' ');
+
+   for(unsigned int i = 0; i < strlen(op->format); i++)
+   {
+    switch(op->format[i])
+    {
+     case 'a':
+	ret.append(s_a);
+	break;
+
+     case 'i':
+	ret.append(s_i);
+	break;
+
+     case 'z':
+	ret.append(s_z);
+	break;
+
+     case 'p':
+	ret.append(s_p);
+	break;
+
+     case 'P':
+	ret.append(s_P);
+	break;
+
+     case 's':
+	ret.append(gpr_names[rs]);
+	break;
+
+     case 't':
+	ret.append(gpr_names[rt]);
+	break;
+
+    case 'd':
+	ret.append(gpr_names[rd]);
+	break;
+
+		case 'D':
+			ret.append(s_D);
+			break;
+
+     default:
+	ret.append(1, op->format[i]);
+	break;
+    }
+   }
+   break;
+  }
+  op++;
+ }
+
+ return(ret);
+}
+
+}
+
diff --git a/PsxHawk.Core/dis.h b/PsxHawk.Core/dis.h
new file mode 100644
index 0000000000..5ef20c4de0
--- /dev/null
+++ b/PsxHawk.Core/dis.h
@@ -0,0 +1,15 @@
+/*
+this disassembler is courtesy of mednafen
+*/
+
+#pragma once
+
+#include <string>
+#include "types.h"
+
+namespace MDFN_IEN_PSX
+{
+
+std::string DisassembleMIPS(u32 PC, u32 instr);
+
+}
diff --git a/PsxHawk.Core/loader.cpp b/PsxHawk.Core/loader.cpp
new file mode 100644
index 0000000000..97cd259181
--- /dev/null
+++ b/PsxHawk.Core/loader.cpp
@@ -0,0 +1,53 @@
+/*
+this file contains stuff which isn't realistic emulation but is used for loading and bootstrapping things
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#include "types.h"
+#include "loader.h"
+#include "asm.h"
+
+void Load_BIOS(PSX& psx, const char* path)
+{
+	FILE* inf = fopen(path,"rb");
+	fread(psx.bios,1,BIOS_SIZE,inf);
+	fclose(inf);
+}
+
+bool Load_EXE_Check(const char* fname)
+{
+	//check for the PSX EXE signature
+	FILE* inf = fopen(fname, "rb");
+	char tmp[8] = {0};
+	fread(tmp,1,8,inf);
+	fclose(inf);
+	return !memcmp(tmp, "PS-X EXE", 8);
+}
+
+//TODO - we could load other format EXEs as well, not just PSX-EXE (psxjin appears to do this? check PSXGetFileType and Load() in misc.cpp)
+void Load_EXE(PSX& psx, const wchar_t* fname)
+{
+	FILE* inf = _wfopen(fname, L"rb");
+	PSX_EXE_Header header;
+	fread(&header,sizeof(PSX_EXE_Header),1,inf);
+
+	//load the text section to main memory
+	u32 text_destination = header.text_load_addr & RAM_MASK; //convert from virtual address to physical
+	fseek(inf, header.text_exe_offset + 0x800, SEEK_SET); //image addresses are relative to the image section of the file (past the 0x800 header)
+	fread(psx.ram+text_destination,1,header.text_size,inf);
+
+	//now, mednafen patches the bios to run its own routine loaded to PIO which loads the program from fake memory.
+	//i have a better idea. lets patch it with a special escape code which will run the bootstrapping code in C
+	psx.patch(0xBFC06990, ASM_BREAK(PSX::eFakeBreakOp_BootEXE));
+	psx.exeBootHeader = header;
+
+	//patch the kernel image section of the bios with traps for our bios hacks
+	psx.patch(0xBFC10000, ASM_BREAK(PSX::eFakeBreakOp_BiosHack)); //im not sure why we have to include these two. they must get chosen for some other reason to get patched into the kernel
+	psx.patch(0xBFC10010, ASM_BREAK(PSX::eFakeBreakOp_BiosHack)); //..
+	psx.patch(0xBFC10020, ASM_BREAK(PSX::eFakeBreakOp_BiosHack)); //this should correspond to 0xA0 in kernel area
+	psx.patch(0xBFC10030, ASM_BREAK(PSX::eFakeBreakOp_BiosHack)); //this should correspond to 0xB0 in kernel area 
+
+}
\ No newline at end of file
diff --git a/PsxHawk.Core/loader.h b/PsxHawk.Core/loader.h
new file mode 100644
index 0000000000..c8d23dc8b1
--- /dev/null
+++ b/PsxHawk.Core/loader.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "psx.h"
+
+__declspec(dllexport) bool Load_EXE_Check(const char* fname);
+__declspec(dllexport) void Load_EXE(PSX& psx, const wchar_t* fname);
+__declspec(dllexport) void Load_BIOS(PSX& psx, const char* path);
\ No newline at end of file
diff --git a/PsxHawk.Core/main.cpp b/PsxHawk.Core/main.cpp
new file mode 100644
index 0000000000..0d8bbc5164
--- /dev/null
+++ b/PsxHawk.Core/main.cpp
@@ -0,0 +1,34 @@
+//#include <windows.h>
+//#include <stdio.h>
+//
+//#include "psx.h"
+//#include "loader.h"
+//
+//PSX psx;
+//
+//void main(int argc, char **argv)
+//{
+//	//const char* target = argv[1];
+//	const char* target = "C:\\psxsdk\\projects\\helloworld\\main-sdk.exe";
+//	
+//	//can we load it as a PSX EXE? thats the only format we understand so far
+//	if(!Load_EXE_Check(target)) return;
+//
+//	//initialize the psx 
+//	psx.poweron(PSX::eConsoleType_DTL);
+//	Load_BIOS(psx, "SCPH5500.bin"); //JP bios (apparently thats what region our test programs are, or what mednafen ends up using)
+//	//Load_BIOS(psx, "scph5501.bin"); 
+//	//Load_BIOS(psx, "DTLH1100.bin"); 
+//	Load_EXE(psx, target);
+//	psx.reset();
+//
+//	static const int work = 33*1024*1024*10;
+//	DWORD a = timeGetTime();
+//	for(;;)
+//	{
+//		psx.cpu_exec_cycle();
+//		if(psx.counter == work) break;
+//	}
+//	DWORD b = timeGetTime();
+//	printf("%d ms\n",b-a);
+//}
\ No newline at end of file
diff --git a/PsxHawk.Core/psx.cpp b/PsxHawk.Core/psx.cpp
new file mode 100644
index 0000000000..bc000745af
--- /dev/null
+++ b/PsxHawk.Core/psx.cpp
@@ -0,0 +1,1239 @@
+/*
+this file contains the core psx system and cpu emulation.
+where readily possible, components have been split off into separate modules.
+*/
+
+//http://www.d.umn.edu/~gshute/spimsal/talref.html
+
+#include "psx.h"
+#include "dis.h"
+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
+#include <intrin.h>
+#include <Windows.h>
+
+bool dotrace = false;
+
+void PSX::reset()
+{
+	cpu.p_fetch.in_fetch_addr = 0xbfc00000; //this is the reset vector
+}
+
+void PSX::poweron(eConsoleType type)
+{
+	//the psx struct only contains blittable data, so we can just memset it here to make sure we've got complete coverage
+	//(we'll put any non-blittable stuff behind one pointer later so we can reconstruct it as necessary)
+	memset(this,0,sizeof(this));
+
+	//reset cp0 regs (should this be in reset?)
+	memset(&cpu.cp0,0,sizeof(cpu.cp0));
+	cpu.cp0.SR.BEV = 1; //taken from mednafen
+	cpu.cp0.SR.TS = 1; //taken from mednafen
+	cpu.cp0.PRid = 0x300; // PRId: FIXME(test on real thing) //taken from mednafen
+
+	//clear cpu state: pipeline setup
+	cpu.unit_muldiv.timer = 0;
+	//p_fetch will be taken care of by the bootstrapper
+	cpu.p_alu.out_pc.enabled = false;
+	cpu.p_alu.in_pc = 0;
+	cpu.p_alu.decode.instr.value = 0;
+	cpu.p_alu.decode.op = eOP_NULL;
+	cpu.p_mem.in_from_alu.op = CPU::eMemOp_None;
+
+	//clear sio
+	sio[0].Reset();
+	sio[1].Reset();
+
+	//reset the scheduling system
+	sched.null.time = 0xFFFFFFFF; //this item will never happen so it will float at the end as a sentinel (it will continually get rebased)
+	//actually, its already at the end due to the memset
+	sched.head = eScheduleItemType_null;
+	sched.gpu.time = PSX_CLOCK / 60;
+	sched.insert(eScheduleItemType_gpu);
+
+	//setup the system configuration
+	//programs built targeting DTL units will ask for memory near the end of 8MB at program boot-up time (maybe other times?). maybe it puts the heap there? not sure about it.
+	//anyway, we need to handle that much memory if we want those to work.
+	//be aware that right now, psxhawk will mirror 2MB across the 8MB region for retail consoles, until we get better memory mapping
+	if(type == eConsoleType_DTL) config.ram_size = 8*1024*1024;
+	else config.ram_size = 2*1024*1024;
+	config.ram_mask = config.ram_size - 1;
+}
+
+PSX::eScheduleItemType PSX::SCHED::dequeue()
+{
+	eScheduleItemType ret = head;
+	head = items[head].next;
+	//todo - rmeove this for a trivial optimization (but not from debug builds)
+	items[ret].next = eScheduleItemType_NIL;
+	items[ret].prev = eScheduleItemType_NIL;
+	return ret;
+}
+
+void PSX::SCHED::remove(eScheduleItemType todoType)
+{
+	IScheduleItem &todo = items[todoType];
+	eScheduleItemType prevType = todo.prev;
+	eScheduleItemType nextType = todo.next;
+	if(prevType != eScheduleItemType_NIL) items[prevType].next = nextType;
+	if(nextType != eScheduleItemType_NIL) items[nextType].prev = prevType;
+	if(head == todoType)
+		head = nextType;
+}
+
+void PSX::SCHED::insert(eScheduleItemType todoType)
+{
+	IScheduleItem &todo = items[todoType];
+
+	//ensure that it isnt already in the list
+	assert(todo.prev == eScheduleItemType_NIL && todo.next == eScheduleItemType_NIL);
+
+	//insert this schedule item into the list in sorted order
+	u32 todo_time = todo.time;
+	eScheduleItemType prevType = eScheduleItemType_NIL;
+	eScheduleItemType currType = head;
+	while(items[currType].time < todo_time) //TODO - tiebreaker priorities?
+	{
+		prevType = currType;
+		currType = items[currType].next;
+	}
+	//now, currType and prevType are pointing correctly.
+	if(prevType == eScheduleItemType_NIL)
+	{
+		//handle the case where this is the new head
+		items[todoType].next = head;
+		items[head].prev = todoType;
+		head = todoType;
+	}
+	else
+	{
+		//handle the case where it isnt the new head
+		items[todoType].next = items[prevType].next;
+		items[prevType].next = todoType;
+		items[todoType].prev = prevType;
+		items[currType].prev = todoType;
+	}
+}
+
+void PSX::exec_shed(eScheduleItemType type)
+{
+	switch(type)
+	{
+	case eScheduleItemType_null:
+		break;
+	case eScheduleItemType_test:
+		printf("TEST!!!\n");
+		sched.test.time += 100000;
+		sched.insert(eScheduleItemType_test);
+		break;
+	case eScheduleItemType_gpu:
+		sched.gpu.time += PSX_CLOCK / 60;
+		sched.insert(eScheduleItemType_gpu);
+		vblank_trigger();
+		break;
+	}
+}
+
+void PSX::exec_cycle()
+{
+	while(counter >= sched.items[sched.head].time)
+	{
+		eScheduleItemType todo = sched.dequeue();
+		exec_shed(todo);
+	}
+	sched.nextTime = sched.items[sched.head].time;
+
+	if(irq.flags.value & irq.mask.value)
+	{
+		dotrace = true;
+		cpu_exception(CPU::eException_INT, cpu.p_alu.in_pc);
+		//nullify instructions which will be rerun.
+		//in this emulator, interrupts cancel the instruction in the alu (notice we set it as the victim in the exception logic above)
+		//instructions in MEM and WB will proceed normally
+		//this was chosen because we didnt want to have to drag the PC down the pipeline and give it to the MEM stage
+		//HOWEVER -- this is maybe unrealistic (maybe we should nullify MEM and ALU and make MEM the victim) 
+		//and maybe we'll have to drag the PC down later anyway for other proper exception handling
+		//(see pg 94 of see mips run)
+		cpu.p_alu.decode.op = eOP_NULLIFIED;
+	}
+
+	while(counter < sched.nextTime)
+		cpu_exec_cycle();
+}
+
+void PSX::vblank_trigger()
+{
+	irq.flags.vsync = 1;
+	irq_update();
+}
+
+void PSX::cpu_wr_quick(u8* const buf, const int size, const u32 addr, const u32 val)
+{
+	if(size==1) buf[addr] = val;
+	else if(size==2) {
+		*(u16*)&buf[addr] = val;
+	}
+	else {
+		*(u32*)&buf[addr] = val;
+	}
+}
+u32 PSX::cpu_rd_quick(const u8* const buf, const int size, const u32 addr)
+{
+	if(size==1) return buf[addr];
+	else if(size==2) {
+		return *(u16*)&buf[addr];
+	}
+	else {
+		return *(u32*)&buf[addr];
+	}
+}
+
+u32 PSX::cpu_rd_ram(const int size, const u32 addr)
+{
+	if(size==1) 
+		return ram[addr];
+	else if(size==2) {
+		return *(u16*)&ram[addr];
+	}
+	else {
+		return *(u32*)&ram[addr];
+	}
+}
+
+void PSX::cpu_wr_ram(const int size, const u32 addr, const u32 val)
+{
+	if(size==1) 
+		ram[addr] = val;
+	else if(size==2) {
+		*(u16*)&ram[addr] = val;
+	}
+	else {
+		*(u32*)&ram[addr] = val;
+	}
+}
+
+void PSX::cpu_wr_scratch(const int size, const u32 addr, const u32 val) { cpu_wr_quick(scratch,size,addr,val); }
+u32 PSX::cpu_rd_scratch(const int size, const u32 addr) { return cpu_rd_quick(scratch,size,addr); }
+void PSX::cpu_wr_bios(const int size, const u32 addr, const u32 val) { cpu_wr_quick(bios,size,addr,val); }
+u32 PSX::cpu_rd_bios(const int size, const u32 addr) { return cpu_rd_quick(bios,size,addr); }
+void PSX::cpu_wr_pio(const int size, const u32 addr, const u32 val) { cpu_wr_quick(pio,size,addr,val); }
+u32 PSX::cpu_rd_pio(const int size, const u32 addr) { return cpu_rd_quick(pio,size,addr); }
+
+template<int size> void PSX::cpu_wrmem(u32 addr, const u32 val) { cpu_wrmem<size,false>(addr,val); }
+template<int size, bool POKE> void PSX::cpu_wrmem(u32 addr, const u32 val)
+{
+	if(!POKE && cpu.cp0.SR.IsC) 
+		return; //IsC (isolate [data] cache is set). theres no data cache here, so discard write
+
+	if(addr<0x00800000) { cpu_wr_ram(size,addr&config.ram_mask,val); return; }
+	if(addr<0x1F000000) goto BUS_ERROR;
+	if(addr<0x1F010000) { cpu_wr_pio(size,addr&PIO_MASK,val); return; }
+	if(addr<0x1F800000) goto BUS_ERROR;
+	if(addr<0x1F800400) { cpu_wr_scratch(size,addr&SCRATCH_MASK,val); return; }
+	if(addr<0x1F801000) goto BUS_ERROR;
+	if(addr<0x1FC00000) { cpu_wr_hwreg(size,addr,val); return; }
+	if(addr<0x1FC80000) goto BUS_ERROR; //can't write to bios?
+	if(addr<0x80000000) goto BUS_ERROR;
+
+	if(addr<0x80800000) { cpu_wr_ram(size,addr&config.ram_mask,val); return; }
+	if(addr<0x9F000000) goto BUS_ERROR;
+	if(addr<0x9F010000) { cpu_wr_pio(size,addr&PIO_MASK,val); return; }
+	if(addr<0x9FC00000) goto BUS_ERROR;
+	if(addr<0x9FC80000) goto BUS_ERROR; //can't write to bios?
+	if(addr<0xA0000000) goto BUS_ERROR;
+
+	if(addr<0xA0800000) { cpu_wr_ram(size,addr&config.ram_mask,val); return; }
+	if(addr<0xBF000000) goto BUS_ERROR;
+	if(addr<0xBF010000) { cpu_wr_pio(size,addr&PIO_MASK,val); return; }
+	if(addr<0xBFC00000) goto BUS_ERROR;
+	if(addr<0xBFC80000) { if(POKE) { cpu_wr_bios(size,addr&BIOS_MASK,val); return; } else goto BUS_ERROR; } //can't write to bios?
+	
+	if(addr == 0xFFFE0130)
+	{
+		//check psx sources for information on this. it seems to make everything read only?
+		//DEBUG("mystery 0xFFFE0130 reg set to 0x%08X\n",val);
+		return;
+	}
+
+	goto BUS_ERROR;
+
+BUS_ERROR:
+	DEBUG("bus error exception (write) at 0x%08X\n",addr);
+}
+
+void PSX::patch(const u32 addr, const u32 val)
+{
+	//should use the poke versions one day
+	cpu_wrmem<4,true>(addr,val);
+}
+
+void PSX::spu_wr(const int size, const u32 addr, const u32 val)
+{
+	//1d80/1d82 main volume left / right
+	//1d84/1d86 reverberation depth left / right
+	DEBUG_HWREG("spu write size %d addr %08X = %08X\n",size,addr,val);
+}
+
+u32 PSX::spu_rd(const int size, const u32 addr)
+{
+	u32 ret = 0;
+	DEBUG_HWREG("spu read size %d addr %08X = %08X\n",size,addr,ret);
+	return 0;
+}
+
+void PSX::irq_wr(const int size, const u32 addr, const u32 val)
+{
+	if(addr == 0)
+	{
+		//acknowledge the specified irq bits
+		irq.flags.value &= ~(val&IRQ::WIRE_MASK);
+	}
+	else if(addr == 4)
+	{
+		//set the irq mask directly
+		irq.mask.value = val & IRQ::WIRE_MASK;
+	}
+	else assert(false);
+	irq_update();
+}
+
+u32 PSX::irq_rd(const int size, const u32 addr)
+{
+	if(addr == 0)
+		return irq.flags.value;
+	else if(addr == 4)
+		return irq.mask.value;
+	else assert(false);
+}
+
+void PSX::irq_update()
+{
+	sched.escape();
+}
+
+void PSX::cpu_wr_hwreg(const int size, const u32 addr, const u32 val)
+{
+	if(addr>=0x1F801C00 && addr <= 0x1F801DFF)
+	{
+		spu_wr(size,addr,val);
+		return;
+	}
+	else if(addr>=0x1F801040 && addr < 0x1F80105F)
+	{
+		sio_wr(size,addr,val);
+		return;
+	}
+	else switch(addr)
+	{
+	case 0x1F801000: sysregs.biosInit[0] = val; break;
+	case 0x1F801004: sysregs.biosInit[1] = val; break;
+	case 0x1F801008: sysregs.biosInit[2] = val; break;
+	case 0x1F80100C: sysregs.biosInit[3] = val; break;
+	case 0x1F801010: sysregs.biosInit[4] = val; break;
+	case 0x1F801014: sysregs.biosInit[5] = val; break;
+	case 0x1F801018: sysregs.biosInit[6] = val; break;
+	case 0x1F80101C: sysregs.biosInit[7] = val; break;
+	case 0x1F801020: sysregs.biosInit[8] = val; break;
+	//case 0x1f801080-0x1f8010ff dma
+	//case 0x1F801100/10/20/30 root counters
+	case 0x1F801070: irq_wr(size, 0, val); break;
+	case 0x1F801071: assert(false);
+	case 0x1F801072: assert(false);
+	case 0x1F801073: assert(false);
+	case 0x1F801074: irq_wr(size, 4, val); break;
+	case 0x1F801075: assert(false);
+	case 0x1F801076: assert(false);
+	case 0x1F801077: assert(false);
+	//1F801060 // unknown
+	//1F801D80 // unknown
+	//1f802041 // unknown
+	default:
+		DEBUG_HWREG("UNKNOWN ");
+	}
+	DEBUG_HWREG("hwreg write size %d addr %08X = %08X\n",size,addr,val);
+}
+u32 PSX::cpu_rd_hwreg(const int size, const u32 addr)
+{
+	u32 ret = 0;
+	if(addr>=0x1F801C00 && addr <= 0x1F801DFF)
+	{
+		return spu_rd(size,addr);
+	}
+	else if(addr>=0x1F801040 && addr < 0x1F80105F)
+	{
+		return sio_rd(size,addr);
+	}
+	else switch(addr)
+	{
+	case 0x1F801000: ret = sysregs.biosInit[0]; break;
+	case 0x1F801004: ret = sysregs.biosInit[1]; break;
+	case 0x1F801008: ret = sysregs.biosInit[2]; break;
+	case 0x1F80100C: ret = sysregs.biosInit[3]; break;
+	case 0x1F801010: ret = sysregs.biosInit[4]; break;
+	case 0x1F801014: ret = sysregs.biosInit[5]; break;
+	case 0x1F801018: ret = sysregs.biosInit[6]; break;
+	case 0x1F80101C: ret = sysregs.biosInit[7]; break;
+	case 0x1F801020: ret = sysregs.biosInit[8]; break;
+	case 0x1F801070: ret = irq_rd(size, 0); break;
+	case 0x1F801071: assert(false);
+	case 0x1F801072: assert(false);
+	case 0x1F801073: assert(false);
+	case 0x1F801074: ret = irq_rd(size, 4); break;
+	case 0x1F801075: assert(false);
+	case 0x1F801076: assert(false);
+	case 0x1F801077: assert(false);
+	default:
+		DEBUG_HWREG("UNKNOWN ");
+		break;
+	}
+	DEBUG_HWREG("hwreg read size %d addr %08X = %08X\n",size,addr,ret);
+	return ret;
+}
+
+template<int size> u32 PSX::cpu_rdmem(const u32 addr)
+{
+	if(addr<0x00800000) return cpu_rd_ram(size,addr&config.ram_mask);
+	if(addr<0x1F000000) goto BUS_ERROR;
+	if(addr<0x1F010000) return cpu_rd_pio(size,addr&PIO_MASK);
+	if(addr<0x1F800000) goto BUS_ERROR;
+	if(addr<0x1F800400) return cpu_rd_scratch(size,addr&SCRATCH_MASK);
+	if(addr<0x1F801000) goto BUS_ERROR;
+	if(addr<0x1FC00000) return cpu_rd_hwreg(size,addr);
+	if(addr<0x1FC80000) return cpu_rd_bios(size,addr&BIOS_MASK);
+	if(addr<0x80000000) goto BUS_ERROR;
+
+	if(addr<0x80800000) return cpu_rd_ram(size,addr&config.ram_mask);
+	if(addr<0x9F000000) goto BUS_ERROR;
+	if(addr<0x9F010000) return cpu_rd_pio(size,addr&PIO_MASK);
+	if(addr<0x9FC00000) goto BUS_ERROR;
+	if(addr<0x9FC80000) return cpu_rd_bios(size,addr&BIOS_MASK);
+	if(addr<0xA0000000) goto BUS_ERROR;
+
+	if(addr<0xA0800000) return cpu_rd_ram(size,addr&config.ram_mask);
+	if(addr<0xBF000000) goto BUS_ERROR;
+	if(addr<0xBF010000) return cpu_rd_pio(size,addr&PIO_MASK);
+	if(addr<0xBFC00000) goto BUS_ERROR;
+	if(addr<0xBFC80000) return cpu_rd_bios(size,addr&BIOS_MASK);
+	
+	goto BUS_ERROR;
+
+BUS_ERROR:
+	DEBUG("bus error exception (read) at 0x%08X\n",addr);
+	return 0;
+}
+
+void PSX::cpu_copz_mtc(const u32 z, const u32 rd, const u32 value)
+{
+	//DEBUG("Writing cop%d, %d = 0x%08X\n",z,rd,value);
+	if(z==0) cpu_cop0_mtc(rd,value);
+}
+
+void PSX::cpu_cop0_mtc(const u32 rd, const u32 value)
+{
+	cpu.cp0.r[rd] = value;
+	cpu.cp0.SR.value &= ~CPU::SR_REG::ZERO_MASK;
+	//TODO - other register masks
+}
+
+u32 PSX::cpu_copz_mfc(const u32 z, const u32 rd)
+{
+	//DEBUG("Reading cop%d, %d\n",z,rd);
+	if(z==0) return cpu_cop0_mfc(rd);
+	return 0;
+}
+
+u32 PSX::cpu_cop0_mfc(const u32 rd)
+{
+	return cpu.cp0.r[rd];
+}
+
+u32 PSX::cpu_fetch(const u32 addr)
+{
+	return cpu_rdmem<4>(addr);
+}
+
+void PSX::cpu_run_alu_bioshack()
+{
+	const u32 ram_pc = cpu.p_alu.in_pc & 0x0FFFFFFF;
+
+	const u32 function = cpu.regs.t1;
+	switch(function)
+	{
+	case 0x00: break; //open
+	case 0x16: break; //strncat
+	case 0x18: break; //strncmp
+	case 0x35: //lsearch?? but yet the sdk uses this for printf. maybe it depends on the bios version
+		//also the putchar() stdlib function uses this by dropping a character in some kind of buffer that is reserved for it
+		if(ENABLE_CONOUT)
+		{
+			//TODO - make this safer, if necessary, by not going straight into main ram
+			//a1 = address of string
+			//a2 = length of string
+			u8* const raw_addr = ram + (cpu.regs.a1 & config.ram_mask);
+			const u32 len = cpu.regs.a2;
+			for(u32 i=0;i<len;i++)
+				fputc(raw_addr[i],stdout);
+		}
+		break;
+	case 0x3C: //putchar
+		if(ENABLE_CONOUT) cpu_run_alu_bioshack_putchar(cpu.regs.a0);
+		break;
+	case 0x3D: //gets... ? but yet, the kernel uses this to print
+		if(ENABLE_CONOUT) cpu_run_alu_bioshack_putchar(cpu.regs.a0);
+	case 0x3F: //printf. i think putchar will get used internally, no need to handle this
+		break;
+	default:
+		printf("unknown bios call: 0x%02X\n", function);
+		break;
+	}
+	return;
+}
+
+void PSX::cpu_run_alu_bioshack_putchar(const u32 regval)
+{
+	char c = regval;
+	fputc(c,stdout);
+	return;
+}
+
+void PSX::cpu_break(const u32 code)
+{
+	switch(code)
+	{
+	case eFakeBreakOp_BootEXE:
+		{
+			//perform basic exe booting steps
+			//the program has already been loaded. all we need to do is setup the regs specified in the header
+			cpu.p_fetch.in_fetch_addr = exeBootHeader.init_pc;
+			cpu.regs.gp = exeBootHeader.init_gp;
+			cpu.regs.sp = exeBootHeader.stack_load_addr; //aka init_sp
+			break;
+		}
+	case eFakeBreakOp_BiosHack:
+		//first, run the effect of the patched instruction, which was: lui t0, 0x0000
+		cpu.regs.t0 = 0;
+		cpu_run_alu_bioshack();
+		break;
+	default:
+		break;
+	}
+}
+
+#define SIGNBIT(x) ((x) & 0x80000000)
+
+void PSX::cpu_exception(CPU::eException ex, u32 pc_victim)
+{
+	cpu.cp0.EPC = pc_victim;
+	
+	cpu.cp0.Cause.ExcCode = ex;
+	cpu.cp0.Cause.Sw = 0; //?
+	cpu.cp0.Cause.IP = 0; //?
+	cpu.cp0.Cause.CE = 0; //TBD
+	cpu.cp0.Cause.BD = 0; //TODO - BD flag
+
+	//choose the rom or ram handler according to this flag
+	u32 handler = 0x80000080;
+	if(cpu.cp0.SR.BEV)
+		handler = 0xBFC00180;
+
+	cpu.cp0.SR.KUo = cpu.cp0.SR.KUp;
+	cpu.cp0.SR.IEo = cpu.cp0.SR.IEp;
+	cpu.cp0.SR.KUp = cpu.cp0.SR.KUc;
+	cpu.cp0.SR.IEp = cpu.cp0.SR.IEc;
+	cpu.cp0.SR.KUc = 0;
+	cpu.cp0.SR.IEc = 0;
+
+	cpu.p_fetch.in_fetch_addr = handler;
+}
+
+void PSX::cpu_run_muldiv()
+{
+	if(cpu.unit_muldiv.timer > 0)
+	{
+		//TODO - think about whether this is the exactly right amount of time (maybe off by one)
+		cpu.unit_muldiv.timer--;
+		if(cpu.unit_muldiv.timer == 0)
+		{
+			cpu.regs.lo = cpu.unit_muldiv.lo;
+			cpu.regs.hi = cpu.unit_muldiv.hi;
+			cpu.stall_depends &= ~CPU::eStall_MulDiv;
+		}
+	}
+}
+
+void PSX::cpu_run_mem()
+{
+	CPU::ALU_OUTPUT &input = cpu.p_mem.in_from_alu;
+
+	//mem stage
+	switch(input.op)
+	{
+	case CPU::eMemOp_StoreWord:
+		DEBUG_STORE("{%12lld} MEM: StoreWord [%08X] = %08X\n",abscounter,input.addr,input.value);
+		cpu_wrmem<4>(input.addr,input.value);
+		break;
+	case CPU::eMemOp_StoreHalfword:
+		DEBUG_STORE("{%12lld} MEM: StoreWord [%08X] = %04X\n",abscounter,input.addr,input.value);
+		cpu_wrmem<2>(input.addr,input.value);
+		break;
+	case CPU::eMemOp_StoreByte:
+		DEBUG_STORE("{%12lld} MEM: StoreByte [%08X] = %02X\n",abscounter,input.addr,input.value);
+		cpu_wrmem<1>(input.addr,input.value);
+		break;
+	case CPU::eMemOp_LoadWord:
+		{
+			const u32 temp = cpu_rdmem<4>(input.addr);
+			DEBUG_LOAD("{%12lld} MEM: LoadWord [%08X] == %08X\n",abscounter,input.addr,temp);
+			cpu.regs.r[input.rt] = temp;
+			break;
+		}
+	case CPU::eMemOp_LoadHalfwordSigned:
+		{
+			const u32 temp = (s16)cpu_rdmem<2>(input.addr);
+			DEBUG_LOAD("{%12lld} MEM: LoadHalfwordSigned [%08X] == %04X\n",abscounter,input.addr,temp);
+			cpu.regs.r[input.rt] = temp;
+			break;
+		}
+	case CPU::eMemOp_LoadHalfwordUnsigned:
+		{
+			const u32 temp = cpu_rdmem<2>(input.addr);
+			DEBUG_LOAD("{%12lld} MEM: LoadHalfwordUnsigned [%08X] == %04X\n",abscounter,input.addr,temp);
+			cpu.regs.r[input.rt] = temp;
+			break;
+		}
+	case CPU::eMemOp_LoadByteSigned:
+		{
+			const u32 temp = (s8)cpu_rdmem<1>(input.addr);
+			DEBUG_LOAD("{%12lld} MEM: LoadByte [%08X] == %02X\n",abscounter,input.addr,temp);
+			cpu.regs.r[input.rt] = temp;
+			break;
+		}
+	case CPU::eMemOp_LoadByteUnsigned:
+		{
+			const u32 temp = cpu_rdmem<1>(input.addr);
+			DEBUG_LOAD("{%12lld} MEM: LoadByteUnsigned [%08X] == %02X\n",abscounter,input.addr,temp);
+			cpu.regs.r[input.rt] = temp;
+			break;
+		}
+
+	case CPU::eMemOp_MTC:
+		{
+			const CPU::Instruction_CTYPE instr = cpu.p_mem.decode.instr.CTYPE;
+			cpu_copz_mtc(instr.cpnum,instr.rd,input.value);
+			break;
+		}
+	case CPU::eMemOp_MFC:
+		{
+			const CPU::Instruction_CTYPE instr = cpu.p_mem.decode.instr.CTYPE;
+			cpu.regs.r[instr.rt] = cpu_copz_mfc(instr.cpnum,instr.rd);
+			break;
+		}
+
+	case CPU::eMemOp_None:
+		break;
+	case CPU::eMemOp_Unset:
+		printf("*** UNHANDLED MEM OP ***\n");
+		break;
+	default:
+		NOCASE();
+	}
+
+	cpu.regs.r0 = 0;
+}
+
+void PSX::TraceALU()
+{
+	DEBUG_TRACE("{%12lld} %08X: [%08X] (%d,%d) %s\n",abscounter,cpu.p_alu.in_pc,cpu.p_alu.decode.instr.value,
+		cpu.p_alu.decode.instr.value>>26,
+		cpu.p_alu.decode.instr.value&0x3F,
+		MDFN_IEN_PSX::DisassembleMIPS(cpu.p_alu.in_pc,cpu.p_alu.decode.instr.value).c_str()
+		);
+}
+
+void PSX::cpu_run_wb()
+{
+	//TBD
+}
+
+static const eOp DecodeTable[] =
+{
+	eOP_SLL, eOP_ILL, eOP_SRL, eOP_SRA, eOP_SLLV, eOP_ILL, eOP_SRLV, eOP_SRAV,
+	eOP_JR, eOP_JALR, eOP_ILL, eOP_ILL, eOP_SYSCALL, eOP_BREAK, eOP_ILL, eOP_ILL,
+	eOP_MFHI, eOP_MTHI, eOP_MFLO, eOP_MTLO, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL,
+	eOP_MULT, eOP_MULTU, eOP_DIV, eOP_DIVU, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL,
+	eOP_ADD, eOP_ADDU, eOP_SUB, eOP_SUBU, eOP_AND, eOP_OR, eOP_XOR, eOP_NOR,
+	eOP_ILL, eOP_ILL, eOP_SLT, eOP_SLTU, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL,
+	eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL,
+	eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL,
+
+	eOP_NULL, eOP_BCOND, eOP_J, eOP_JAL, eOP_BEQ, eOP_BNE, eOP_BLEZ, eOP_BGTZ,
+	eOP_ADDI, eOP_ADDIU, eOP_SLTI, eOP_SLTIU, eOP_ANDI, eOP_ORI, eOP_XORI, eOP_LUI,
+	eOP_COPROC, eOP_COPROC, eOP_COPROC, eOP_COPROC, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL,
+	eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL,
+	eOP_LB, eOP_LH, eOP_LWL, eOP_LW, eOP_LBU, eOP_LHU, eOP_LWR, eOP_ILL,
+	eOP_SB, eOP_SH, eOP_SWL, eOP_SW, eOP_ILL, eOP_ILL, eOP_SWR, eOP_ILL,
+	eOP_LWC0, eOP_LWC1, eOP_LWC2, eOP_LWC3, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL,
+	eOP_SWC0, eOP_SWC1, eOP_SWC2, eOP_SWC3, eOP_ILL, eOP_ILL, eOP_ILL, eOP_ILL,
+};
+
+void PSX::cpu_run_fetch()
+{
+	const u32 _pc = cpu.p_fetch.in_fetch_addr;
+	const u32 instr = cpu_fetch(cpu.p_fetch.in_fetch_addr);
+	const u32 opc = instr>>26;
+	cpu.p_fetch.decode.instr.value = instr;
+
+	const u32 _opc = instr>>26;
+	const u32 _func = instr&0x3F;
+	if(dotrace) DEBUG_TRACE("{%12lld} %08X: [%08X] (%d,%d) %s\n",abscounter, _pc, instr,_opc,_func,MDFN_IEN_PSX::DisassembleMIPS(_pc,instr).c_str());
+
+	//this decode table approach was taken from mednafen.
+	u32 opf = instr & 0x3F;
+	if(instr & (0x3F << 26))
+		opf = 0x40 | (instr >> 26);
+
+	cpu.p_fetch.decode.op = DecodeTable[opf];
+
+	//dont try to pad out these switches, it wont help
+	switch(cpu.p_fetch.decode.op)
+	{
+	case eOP_MFLO: 
+	case eOP_MFHI:
+			cpu.stall_user |= CPU::eStall_MulDiv;
+			break;
+	}
+}
+
+#define BRANCH_SET_PC() { cpu.p_alu.out_pc.enabled = true, cpu.p_alu.out_pc.pc = cpu.p_alu.in_pc + instr.signed_target(); }
+void PSX::cpu_run_alu()
+{
+	//most alu instructions will not set the out PC
+	cpu.p_alu.out_pc.enabled = false;
+
+	//alu needs to have registers ready before it begins.
+	//some of these will write their results at the end of this stage
+#ifndef NDEBUG 
+	cpu.p_alu.out_mem.op = CPU::eMemOp_Unset;
+#endif
+	cpu.p_alu.exception = CPU::eException_None;
+	switch(cpu.p_alu.decode.op)
+	{
+	case eOP_ILL:
+	default:
+		//NOCASE();
+		printf("*** UNHANDLED ALU OP***\n");
+		TraceALU();
+		break;	
+
+	case eOP_NULLIFIED:
+	case eOP_NULL:
+		{
+			//?? whats this?
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+
+	case eOP_J:  //j (jump)
+		{
+			const CPU::Instruction_JTYPE instr = cpu.p_alu.decode.instr.JTYPE;
+			cpu.p_alu.out_pc.enabled = true;
+			cpu.p_alu.out_pc.pc = (cpu.p_alu.in_pc&0xF0000000) | (instr.target << 2);
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		} 
+	case eOP_JAL: //jal (jump and link)
+		{
+			const CPU::Instruction_JTYPE instr = cpu.p_alu.decode.instr.JTYPE;
+			cpu.p_alu.out_pc.enabled = true;
+			cpu.p_alu.out_pc.pc = (cpu.p_alu.in_pc&0xF0000000) | (instr.target << 2);
+			cpu.regs.ra = cpu.p_alu.in_pc + 8;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		} 
+
+	case eOP_COPROC: //coproc operations
+		{
+			const CPU::Instruction_CTYPE instr = cpu.p_alu.decode.instr.CTYPE;
+			switch(instr.format)
+			{
+			case 0: //mfcz (move from coprocessor z)
+				//TODO - should these have a delay? the psx is supposed to hav a delay for cp1, does that mean there is a delay for cp0? 
+				cpu.p_alu.out_mem.op = CPU::eMemOp_MFC;
+				break;
+			case 4: //mtcz (move to coprocessor z)
+				//TODO - should these have a delay? the psx is supposed to hav a delay for cp1, does that mean there is a delay for cp0? 
+				cpu.p_alu.out_mem.value = cpu.regs.r[instr.rt];
+				cpu.p_alu.out_mem.op = CPU::eMemOp_MTC;
+				break;
+			case 16: //a whole bunch of junk, maybe associated with cp0?
+				switch(instr.function)
+				{
+				case 16: //rfe (return from exception)
+					cpu.cp0.SR.IEc = cpu.cp0.SR.IEp;
+					cpu.cp0.SR.KUc = cpu.cp0.SR.KUp;
+					cpu.cp0.SR.IEp = cpu.cp0.SR.IEo;
+					cpu.cp0.SR.KUp = cpu.cp0.SR.KUo;
+					//KUo and IEo unchanged
+					cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+					break;
+				default:
+					cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+					break;
+				}
+				break;
+			default:
+				NOCASE();
+				printf("*** UNHANDLED ALU CTYPE ***\n");
+				TraceALU();
+			}
+			break;
+		}
+
+	case eOP_SLL: //sll (shift left logical) //nop
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.r[instr.rt] << instr.sa;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SRL: //srl (shift right logical)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.r[instr.rt] >> instr.sa;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SRA: //sra (shift right arithmetic)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = (s32)cpu.regs.r[instr.rt] >> instr.sa;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SLLV: //sllv (shift left logical variable)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.r[instr.rt] << (cpu.regs.r[instr.rs] & 0x1F);
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SRLV: //srlv (shift right logical variable)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.r[instr.rt] >> (cpu.regs.r[instr.rs] & 0x1F);
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SRAV: //srav (shift right arithmetic variable)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = (s32)cpu.regs.r[instr.rt] >> (cpu.regs.r[instr.rs] & 0x1F);
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_JR: //jr (jump register)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.p_alu.out_pc.enabled = true;
+			cpu.p_alu.out_pc.pc = cpu.regs.r[instr.rs];
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_JALR: //jalr (jump and link register)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.p_alu.out_pc.enabled = true;
+			cpu.p_alu.out_pc.pc = cpu.regs.r[instr.rs];
+			cpu.regs.ra = cpu.p_alu.in_pc + 8;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SYSCALL: //syscall
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.p_alu.exception = CPU::eException_SYSCALL;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_BREAK: //break
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu_break(instr.break_code());
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_MFHI: //mfhi (move from hi)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.hi;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_MTHI: //mthi (move to hi)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.hi = cpu.regs.r[instr.rs];
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_MFLO: //mflo (move from lo)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.lo;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_MTLO: //mtlo (move to lo)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.lo = cpu.regs.r[instr.rs];
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_MULT: //mult (multiply)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			const u32 a = cpu.regs.r[instr.rs];
+			const u32 b = cpu.regs.r[instr.rt];
+			s64 product = (s64)a * (s32)b;
+			cpu.unit_muldiv.lo = ((u32*)&product)[0];
+			cpu.unit_muldiv.hi = ((u32*)&product)[1];
+			cpu.unit_muldiv.timer = 12;
+			cpu.stall_depends |= CPU::eStall_MulDiv;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_MULTU: //multu (multiply unsigned)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			const u32 a = cpu.regs.r[instr.rs];
+			const u32 b = cpu.regs.r[instr.rt];
+			u64 product = (u64)a * b;
+			cpu.unit_muldiv.lo = ((u32*)&product)[0];
+			cpu.unit_muldiv.hi = ((u32*)&product)[1];
+			cpu.unit_muldiv.timer = 12;
+			cpu.stall_depends |= CPU::eStall_MulDiv;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_DIV: //div
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			//TODO - special handling for divide by zero and such (take from mednafen)
+			const u32 dividend = cpu.regs.r[instr.rs];
+			const u32 divisor = cpu.regs.r[instr.rt];
+			cpu.unit_muldiv.lo = (s32)dividend / (s32)divisor;
+			cpu.unit_muldiv.hi = (s32)dividend % (s32)divisor;
+			cpu.unit_muldiv.timer = 35;
+			cpu.stall_depends |= CPU::eStall_MulDiv;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_DIVU: //divu
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			//TODO - special handling for divide by zero and such (take from mednafen)
+			const u32 dividend = cpu.regs.r[instr.rs];
+			const u32 divisor = cpu.regs.r[instr.rt];
+			cpu.unit_muldiv.lo = dividend / divisor;
+			cpu.unit_muldiv.hi = dividend % divisor;
+			cpu.unit_muldiv.timer = 35;
+			cpu.stall_depends |= CPU::eStall_MulDiv;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_ADD: //add [overflow (TBD)]
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.r[instr.rs] + cpu.regs.r[instr.rt];
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_ADDU: //addu (add unsigned) [no overflow]
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.r[instr.rs] + cpu.regs.r[instr.rt];
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SUBU: //subu (subtract unsigned) [no overflow]
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.r[instr.rs] - cpu.regs.r[instr.rt];
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_AND: //and
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.r[instr.rs] & cpu.regs.r[instr.rt];
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_OR: //or
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = cpu.regs.r[instr.rs] | cpu.regs.r[instr.rt];
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_NOR: //nor
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = ~(cpu.regs.r[instr.rs] | cpu.regs.r[instr.rt]);
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SLT: //slt (set on less than) [signed]
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = ((s32)cpu.regs.r[instr.rs] < (s32)cpu.regs.r[instr.rt]) ? 1 : 0;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SLTU://sltu (set on less than unsigned)
+		{
+			const CPU::Instruction_RTYPE instr = cpu.p_alu.decode.instr.RTYPE;
+			cpu.regs.r[instr.rd] = (cpu.regs.r[instr.rs] < cpu.regs.r[instr.rt]) ? 1 : 0;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_BCOND: 
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			switch(instr.rt)
+			{
+			case 0: //bltz (branch on less than zero)
+				if(SIGNBIT(cpu.regs.r[instr.rs])!=0)
+					BRANCH_SET_PC();
+				cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+				break;
+			case 1: //bgez (branch on greater than or equal to zero)
+				if(SIGNBIT(cpu.regs.r[instr.rs])==0)
+					BRANCH_SET_PC();
+				cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+				break;
+			}
+			break;
+		}
+	case eOP_BEQ: //beq (branch on equal)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			if(cpu.regs.r[instr.rs] == cpu.regs.r[instr.rt])
+				BRANCH_SET_PC();
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_BNE: //bne (branch on not equal)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			if(cpu.regs.r[instr.rs] != cpu.regs.r[instr.rt])
+				BRANCH_SET_PC();
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_BLEZ: //blez (branch on less than or equal to zero)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			if(SIGNBIT(cpu.regs.r[instr.rs])!=0 || cpu.regs.r[instr.rs] == 0)
+				BRANCH_SET_PC();
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_BGTZ: //bgtz (branch on greater than zero)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			if(SIGNBIT(cpu.regs.r[instr.rs])==0 && cpu.regs.r[instr.rs] != 0)
+				BRANCH_SET_PC();
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_ADDI: //addi (add immediate) [sign extend immediate and throw overflow exception (TBD)]
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.regs.r[instr.rt] = cpu.regs.r[instr.rs] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_ADDIU: //addiu (add immediate unsigned) [sign extend immediate and no overflow exception]
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.regs.r[instr.rt] = cpu.regs.r[instr.rs] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SLTI: //slti (set on less than immediate)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			if((s32)cpu.regs.r[instr.rs] < (s16)instr.immediate) cpu.regs.r[instr.rt] = 1;
+			else cpu.regs.r[instr.rt] = 0;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_SLTIU: //sltiu (set on less than immediate unsigned)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			if(cpu.regs.r[instr.rs] < (u32)(s16)instr.immediate) cpu.regs.r[instr.rt] = 1;
+			else cpu.regs.r[instr.rt] = 0;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_ANDI: //andi (and immediate)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.regs.r[instr.rt] = cpu.regs.r[instr.rs] & instr.immediate;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_ORI: //ori (or immediate) 
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.regs.r[instr.rt] = cpu.regs.r[instr.rs] | instr.immediate;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_LUI: //lui (load upper immediate)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.regs.r[instr.rt] = instr.immediate<<16;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_None;
+			break;
+		}
+	case eOP_LB: //lb (load byte)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.p_alu.out_mem.addr = cpu.regs.r[instr.base()] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.rt = instr.rt;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_LoadByteSigned;
+			break;
+		}
+	case eOP_LH: //lh (load halfword)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.p_alu.out_mem.addr = cpu.regs.r[instr.base()] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.rt = instr.rt;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_LoadHalfwordSigned;
+			break;
+		}
+	case eOP_LW: //lw (load word)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.p_alu.out_mem.addr = cpu.regs.r[instr.base()] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.rt = instr.rt;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_LoadWord;
+			break;
+		}
+	case eOP_LBU: //lbu (load byte unsigned)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.p_alu.out_mem.addr = cpu.regs.r[instr.base()] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.rt = instr.rt;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_LoadByteUnsigned;
+			break;
+		}
+	case eOP_LHU: //lhu (load halfword unsigned)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.p_alu.out_mem.addr = cpu.regs.r[instr.base()] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.rt = instr.rt;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_LoadHalfwordUnsigned;
+			break;
+		}
+	case eOP_SB: //sb (store byte)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.p_alu.out_mem.addr = cpu.regs.r[instr.base()] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.value = cpu.regs.r[instr.rt] & 0xFF;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_StoreByte;
+			break;
+		}
+	case eOP_SH: //sh (store halfword)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.p_alu.out_mem.addr = cpu.regs.r[instr.base()] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.value = cpu.regs.r[instr.rt] & 0xFFFF;
+			cpu.p_alu.out_mem.op = CPU::eMemOp_StoreHalfword;
+			break;
+		}
+	case eOP_SW: //sw (store word)
+		{
+			const CPU::Instruction_ITYPE instr = cpu.p_alu.decode.instr.ITYPE;
+			cpu.p_alu.out_mem.addr = cpu.regs.r[instr.base()] + (s16)instr.immediate;
+			cpu.p_alu.out_mem.value = cpu.regs.r[instr.rt];
+			cpu.p_alu.out_mem.op = CPU::eMemOp_StoreWord;
+			break;
+		}
+	}
+
+	cpu.regs.r0 = 0;
+
+	//handle exceptions from alu
+	//if(cpu.p_alu.exception != CPU::eException_None)
+	//{
+	//	cpu_exception(cpu.p_alu.exception, cpu.p_alu.in_pc);
+	//}
+}
+
+void PSX::cpu_exec_cycle()
+{
+	counter++;
+	abscounter++;
+
+	//rd can sample registers after alu completes
+	//rd can sample registers after mem completes
+	//fetch can sample PC after first half of alu completes (branches need to be done in one early)
+
+	//we sort of pretend the RD stage isnt there, and the fetch stage is shifted over, so we have
+	//| IF | ALU | MEM | WB |
+	//the chief consequences are:
+	//RD can latch registers that the ALU is asserting
+	// (so, we will pretend RD doesnt exist and have ALU latch registers that the previous ALU cycle asserted)
+	// (we'll do this by having an extra buffer of registers)
+	//we don't worry much about the branch addresses getting passed to IF: we're logically shifted the IF to the right,
+	//so the ALU will naturally be asserting them 
+
+	cpu_run_muldiv();
+
+	if(cpu.stall_depends & cpu.stall_user)
+	{
+		//stalled
+	}
+	else
+	{
+		cpu_run_fetch();
+		cpu_run_alu();
+		cpu_run_mem();
+		cpu_run_wb();
+
+		//latch mem<-alu
+		cpu.p_mem.decode = cpu.p_alu.decode;
+		cpu.p_mem.in_from_alu = cpu.p_alu.out_mem;
+
+		//latch alu<-fetch
+		cpu.p_alu.decode = cpu.p_fetch.decode;
+		cpu.p_alu.in_pc = cpu.p_fetch.in_fetch_addr;
+
+		//latch fetch<-alu
+		cpu.p_fetch.in_fetch_addr = cpu.p_alu.out_pc.enabled ? cpu.p_alu.out_pc.pc : (cpu.p_fetch.in_fetch_addr + 4);
+
+		//check for exceptions. this should be more sophisticated
+		if(cpu.p_alu.exception != CPU::eException_None)
+		{
+			cpu_exception(cpu.p_alu.exception,cpu.p_alu.in_pc);
+		}
+	}
+}
+
+void PSX::RunForever()
+{
+		static const int work = 33*1024*1024*20;
+		DWORD a = timeGetTime();
+		for(;;)
+		{
+			exec_cycle();
+			if(counter == work) break;
+		}
+		DWORD b = timeGetTime();
+		printf("%d ms\n",b-a);
+}
diff --git a/PsxHawk.Core/psx.h b/PsxHawk.Core/psx.h
new file mode 100644
index 0000000000..29456baf99
--- /dev/null
+++ b/PsxHawk.Core/psx.h
@@ -0,0 +1,592 @@
+/*
+this file contains the core psx system and cpu emulation declarations.
+implementations may be in several places.
+*/
+
+#pragma once
+
+//#define NOCASE() __assume(0);
+#define NOCASE()
+#define ENABLE_CONOUT true
+
+//#define DPRINT(...)
+#define NOPRINT(...)
+#define DPRINT(...) { fprintf(__VA_ARGS__); }
+#define DEBUG(...) { DPRINT(stdout,__VA_ARGS__); }
+#define DEBUG_PRINT(...) { NOPRINT(stderr,__VA_ARGS__); }
+#define DEBUG_LOAD(...) { NOPRINT(stdout,__VA_ARGS__); }
+#define DEBUG_STORE(...) { NOPRINT(stdout,__VA_ARGS__); }
+#define DEBUG_TRACE(...) { DPRINT(stdout,__VA_ARGS__); }
+#define DEBUG_HWREG(...) { DPRINT(stdout,__VA_ARGS__); }
+#define DEBUG_SIO(...) { DPRINT(stdout,__VA_ARGS__); }
+
+#define PSX_CLOCK 33868800
+
+#include "types.h"
+
+enum eOp
+{
+	eOP_NULLIFIED, //nullified by exception
+	eOP_ILL, 
+	eOP_SLL, eOP_SRL, eOP_SRA, eOP_SLLV,
+	eOP_SRLV, eOP_SRAV,
+	eOP_JR, eOP_JALR,
+	eOP_SYSCALL, eOP_BREAK,
+	eOP_MFHI, eOP_MTHI, eOP_MFLO, eOP_MTLO,
+	eOP_MULT, eOP_MULTU, eOP_DIV, eOP_DIVU,
+	eOP_ADD, eOP_ADDU,
+	eOP_SUB, eOP_SUBU,
+	eOP_AND, eOP_OR,
+	eOP_XOR, eOP_NOR,
+	eOP_SLT, eOP_SLTU,
+	eOP_NULL,
+	eOP_BCOND, 
+	eOP_J, eOP_JAL,
+	eOP_BEQ, eOP_BNE, eOP_BLEZ, eOP_BGTZ,
+	eOP_ADDI, eOP_ADDIU,
+	eOP_SLTI, eOP_SLTIU,
+	eOP_ANDI, eOP_ORI,
+	eOP_XORI, eOP_LUI,
+	eOP_COPROC,
+	eOP_LB, eOP_LH, eOP_LWL, eOP_LW, eOP_LBU, eOP_LHU, eOP_LWR, eOP_SB, eOP_SH, eOP_SWL, eOP_SW, eOP_SWR,
+	eOP_LWC0, eOP_LWC1, eOP_LWC2, eOP_LWC3,
+	eOP_SWC0, eOP_SWC1, eOP_SWC2, eOP_SWC3
+};
+
+
+//reference PSXJIN sources for this
+#pragma pack(push,1)
+struct PSX_EXE_Header
+{
+	char magic[8]; //PS-X EXE
+	u32 text_exe_offset; //location of text section in exe image
+	u32 data_exe_offset; //location of data section in exe image
+	u32 init_pc; //initial PC of program
+	u32 init_gp; //initial GP of program
+	u32 text_load_addr; //detination load address of text section
+	u32 text_size; //size of text section
+	u32 data_load_addr; //detination load address of data section
+	u32 data_size; //size of data section	
+	u32 b_addr, b_size; //unknown
+	u32 stack_load_addr; //aka init_sp; initial SP of program
+	u32 stack_size; //stack size (not used?)
+	u32 saved_sp, saved_fp, saved_gp, saved_ra, saved_so; //not used
+};
+#pragma pack(pop)
+
+#define RAM_SIZE (8*1024*1024)
+#define RAM_MASK (RAM_SIZE-1)
+#define VRAM_SIZE (1024*1024)
+#define VRAM_MASK (VRAM_SIZE-1)
+#define BIOS_SIZE (512*1024)
+#define BIOS_MASK (BIOS_SIZE-1)
+#define SCRATCH_SIZE (1024)
+#define SCRATCH_MASK (SCRATCH_SIZE-1)
+#define PIO_SIZE (65536)
+#define PIO_MASK (PIO_SIZE-1)
+
+//this class should try to organize all psx system state and methods as compactly as possible.
+//let's not mix up anything else in here.
+class __declspec(dllexport) PSX
+{
+public:
+  u8 vram[VRAM_SIZE];
+  u8 bios[BIOS_SIZE];
+	u8 scratch[SCRATCH_SIZE];
+	u8 pio[PIO_SIZE];
+  u8 ram[RAM_SIZE];
+
+	enum eScheduleItemType
+	{
+		eScheduleItemType_NIL, //used as a sentinel for list processing
+		eScheduleItemType_null,
+		eScheduleItemType_test, //to be removed later
+		eScheduleItemType_sio0,
+		eScheduleItemType_sio1,
+		eScheduleItemType_gpu,
+		eScheduleItemType_NUM
+	};
+	struct SCHED
+	{
+		struct IScheduleItem
+		{
+			u32 time;
+			eScheduleItemType next, prev;
+		};
+
+		union
+		{
+			IScheduleItem items[eScheduleItemType_NUM];
+			struct
+			{
+				IScheduleItem NIL, null, test;
+				IScheduleItem sio[2];
+				IScheduleItem gpu;
+			};
+		};
+		eScheduleItemType head;
+		u32 nextTime;
+		void escape() { nextTime = 0; }
+		
+		//dequeues the head item from the list.
+		eScheduleItemType dequeue();
+		//removes the specified item from the list
+		void remove(eScheduleItemType todoType);
+		//inserts this item to the list in sorted order by timestamp
+		void insert(eScheduleItemType todoType);
+
+	} sched;
+
+
+	struct IRQ
+	{
+		static const u16 WIRE_MASK = 0x3FD;
+		union
+		{
+			struct 
+			{
+				u16 vsync:1, gpu:1, cd:1, dma:1, rcnt0:1, rcnt1:1, rcnt2:1, sio0:1, sio1:1, spu:1, extcd:1;
+				u16 unknown2:6;
+			};
+			u16 value;
+		} flags;
+		union
+		{
+			struct 
+			{
+				u16 vsync:1, gpu:1, cd:1, dma:1, rcnt0:1, rcnt1:1, rcnt2:1, sio0:1, sio1:1, spu:1, extcd:1;
+				u16 unknown2:6;
+			};
+			u16 value;
+		} mask;
+	} irq;
+
+	struct SystemRegs
+	{
+		//regs starting at 0x1f801000 accessed at bios init and maybe other times.
+		u32 biosInit[9]; //mednafen knows a little bit about these but doesnt use them for anything
+	} sysregs;
+
+	struct SioController
+	{
+		union
+		{
+			struct
+			{
+				u16 prescaler_type:2;
+			};
+			u16 value;
+		} mode;
+
+		union StatusReg
+		{
+			struct
+			{
+				u16 TX_RDY:1;
+				u16 RX_RDY:1;
+				u16 TX_EMPTY:1;
+				u16 nothing:1;
+				u16 OVERRUN:1;
+				u16 nothing2:2;
+				u16 DSR:1;
+				u16 nothing3:1;
+				u16 IRQ:1;
+			};
+			u16 value;
+		};
+
+		union ControlReg
+		{
+			struct 
+			{
+				u16 TX_ENA:1;
+				u16 DTR:1; //this differs from mame's code (this seems to be the actual DTR signal. )
+				u16 nothing:2;
+				u16 IACK:1;
+				u16 nothing2:1;
+				u16 RESET:1;
+				u16 nothing3:3;
+				u16 TX_IENA:1;
+				u16 RX_IENA:1;
+				u16 DSR_IENA:1;
+				u16 PORT_SEL:1; //this differs from mame's code (this seems to be the port select). but that doesnt make sense because the 5x registers should be used for the other port. is the other port the actual serial i/o module?
+			};
+			u16 value;
+		};
+
+		StatusReg status;
+		ControlReg control;
+		u16 baud_reg;
+		//this is just used for diagnostic purposes (maybe it should be labeled as such?)
+		float CalculateBaud();
+
+		void Reset();
+
+	} sio[2];
+
+  struct CPU
+  {
+		enum eException //taken from mednafen
+		{
+			eException_INT = 0,
+			eException_MOD = 1,
+			eException_TLBL = 2,
+			eException_TLBS = 3,
+			eException_ADEL = 4, // Address error on load
+			eException_ADES = 5, // Address error on store
+			eException_IBE = 6, // Instruction bus error
+			eException_DBE = 7, // Data bus error
+			eException_SYSCALL = 8, // System call
+			eException_BP = 9, // Breakpoint
+			eException_RI = 10, // Reserved instruction
+			eException_COPU = 11,  // Coprocessor unusable
+			eException_OV = 12,	// Arithmetic overflow
+			eException_None = 16
+		};
+
+    union
+    {
+      struct
+      {
+        u32 r0, //should this be called zero or r0? well, psxjin and mednafen call it r0 so we'll stick with it
+					at, v0, v1, a0, a1, a2, a3,
+          t0, t1, t2, t3, t4, t5, t6, t7,
+          s0, s1, s2, s3, s4, s5, s6, s7,
+          t8, t9, k0, k1, gp, 
+					sp, //29 - stack pointer
+					s8, //30 - ??
+					ra, //31 - return address (link register)
+          lo, hi;
+          //pc;
+      };
+      
+      //Lo, Hi in r[33] and r[34];
+      //PC in r[35]
+      u32 r[34]; 
+    } regs;
+
+		union SR_REG
+		{
+			//these bits must be zero when read from the register (not wired to anything) [todo - check whether they cache values]
+			static const int ZERO_MASK = 0x8D8000C0;
+
+			//info taken from http://psx.rules.org/system.txt
+			struct
+			{
+				u32
+					IEc:1, //Interrupts Enabled current (0=enabled, 1=disabled) 
+					KUc:1, //KUcurrent: privilege level (0=user, 1=kernel)
+					IEp:1, //?
+					KUp:1, //KUpushed: KUc pushes here on an exception, rfe pops KUo here
+					IEo:1, //Interrupts Enabled (0=enabled, 1=disabled) (rfe pops KUp here)
+					KUo:1, //KUother?: KUp gets pushed here on an exception
+					zeros:2, 
+					IM:8, //interrupt mask fields (are these used in any way? im not sure. you would expect at least one of them to be) [bit2 maybe?]
+					IsC:1, //Isolate [data] Cache: unhook data cache from memory. PSX has no data cache, so this causes memory writes to get discarded
+					SwC:1, //Swap Cache: Not sure what this does on PSX but its suggested to use with IsC to invalidate the I-Cache. May need to investigate this.
+					PZ:1, //When set cache parity bits are written as 0
+					CM:1, //something relating to data cache
+					PE:1, //Cache parity error. Does not cause exception.
+					TS:1, //TLB shutdown. Gets set if a programm address simultaniously matches 2 TLB entries.
+					BEV:1, //boot exception vectors (0=ram, 1=rom [kseg1])
+					zeros_2:2, 
+					RE:1, //reverse endianness. hope nobody uses this!
+					zeros_3:2, 
+					CU0:1, //coprocessor 0 control (0=kernel mode, 1=user mode); controls access to certain instructions
+					CU1:1, //coprocessor 1 enabled (does nothing in PSX. should it return zeros?)
+					CU2:1, //coprocessor 2 enabled
+					zeros_4:1;
+			};
+			u32 value;
+		};
+		union CAUSE_REG
+		{
+			struct
+			{
+				u32 zeros_1:2;
+				u32 ExcCode:4;
+				u32 zeros_2:2;
+				u32 Sw:2; //software interrupts ?
+				u32 IP:6; //interrupts pending (external interrupts latched? IP[5..0] = Interrupt[5..0] according to r2000 arch doc)
+				u32 zeros_3:12;
+				u32 CE:2; //coprocessor error-which coprocessor threw a Coprocessor Unusable exception?
+				u32 zeros_4:1;
+				u32 BD:1; //set to 1 if the last exception was taken while executing in a branch delay slot
+			};
+			u32 value;
+		};
+
+		union
+		{
+			struct
+			{
+				u32
+					Index,     Random,    EntryLo0,  EntryLo1,
+					Context,   PageMask,  Wired,     Reserved0,
+					BadVAddr,  Count,     EntryHi,   Compare;
+				
+				SR_REG SR; //12 - status register
+				CAUSE_REG Cause; //13 - cause register
+	
+				u32	EPC; //14 - the PC of the victim
+				u32 PRid; //15 - ??
+
+				u32
+					Config,    LLAddr,    WatchLO,   WatchHI,
+					XContext,  Reserved1, Reserved2, Reserved3,
+					Reserved4, Reserved5, ECC,       CacheErr,
+					TagLo,     TagHi,     ErrorEPC,  Reserved6;
+			};
+			u32 r[32];
+		} cp0;
+
+		enum eFormat
+		{
+			eFormat_IType, eFormat_RType, eFormat_JType_J, eFormat_JType_JAL, eFormat_CType, eFormat_Other
+		};
+
+		struct Instruction_ITYPE
+		{
+			u32 immediate:16;
+			s32 signed_offset() const { return (s16)immediate; }
+			s32 signed_target() const { return (signed_offset()<<2) + 4; /*hack!!! dunno how this PC accounting is supposed to work*/ }
+			u32 rt:5;
+			u32 rs:5;
+			u32 base() const { return rs; }
+			u32 opcode:6;
+		};
+
+		struct Instruction_CTYPE
+		{
+			u32 function:6;
+			u32 zeros:5;
+			u32 rd:5;
+			u32 rt:5;
+			u32 format:5;
+			u32 cpnum:2;
+			u32 opcode_hi:4;
+		};
+
+		union Instruction_RTYPE
+		{
+			struct 
+			{
+				u32 function:6;
+				u32 sa:5;
+				u32 rd:5;
+				u32 rt:5;
+				u32 rs:5;
+				u32 opcode:6;
+			};
+			u32 value;
+			u32 break_code() const { return (value>>6)&0xFFFFF; }
+		};
+
+		struct Instruction_JTYPE
+		{
+			u32 target:26;
+			u32 opcode:6;
+		};
+
+		union Instruction
+		{
+			Instruction_ITYPE ITYPE;
+			Instruction_RTYPE RTYPE;
+			Instruction_JTYPE JTYPE;
+			Instruction_CTYPE CTYPE;
+			u32 value;
+		};
+
+		struct DecodedInstruction
+		{
+			Instruction instr;
+			eOp op;
+		};
+
+		struct {
+			bool IsRunning() const { return timer>0; }
+			u32 timer;
+			u32 lo, hi;
+		} unit_muldiv;
+
+		struct 
+		{
+			u32 in_fetch_addr;
+			DecodedInstruction decode; //call this output?
+		} p_fetch;
+
+		struct 
+		{
+			u32 instr;
+			u32 regs[3];
+		} p_rd;
+
+		enum eMemOp
+		{
+			eMemOp_Unset, eMemOp_None, 
+			eMemOp_StoreWord, eMemOp_StoreHalfword, eMemOp_StoreByte,
+			eMemOp_LoadWord, eMemOp_LoadHalfwordSigned, eMemOp_LoadHalfwordUnsigned, eMemOp_LoadByteSigned, eMemOp_LoadByteUnsigned,
+			eMemOp_MTC, eMemOp_MFC,
+		};
+
+		struct ALU_OUTPUT
+		{
+			union
+			{
+				u32 addr;
+			};
+			union {
+				u32 value;
+				u32 rt;
+			};
+			eMemOp op;
+		};
+
+		struct ALU_PC_OUTPUT
+		{
+			u32 pc;
+			bool enabled;
+		};
+
+		struct P_ALU
+		{
+			DecodedInstruction decode;
+			//TODO its a shame to copy a big alu output every time.. try to avoid that somehow? thats a serious micro-optimization though..
+			ALU_OUTPUT out_mem;
+			ALU_PC_OUTPUT out_pc;
+			u32 in_pc;
+			CPU::eException exception;
+		} p_alu;
+
+		enum eStall
+		{
+			eStall_None=0,
+			eStall_MulDiv=1,
+		};
+
+		u32 stall_depends;
+		u32 stall_user;
+
+		struct
+		{
+			DecodedInstruction decode;
+			ALU_OUTPUT in_from_alu;
+		} p_mem;
+
+
+		enum eDelayState
+		{
+			eDelayState_None,
+			eDelayState_Branch, //set PC to a branch target arg
+			eDelayState_BranchRelative, //set PC relative (arg as s32) to current PC (that will be the PC of the instruction in the branch delay slot)
+			eDelayState_StoreWord, //store a word arg2 to memory at arg
+			eDelayState_StoreHalfword, //store a halfword arg2 to memory at arg
+			eDelayState_StoreByte,  //store a byte arg2 to memory at arg
+			eDelayState_SetGPR, //set GPR arg to value arg2
+			eDelayState_MTCz, //set MTCz, reg # arg, to value arg2 (z and reg are packed into arg)
+		};
+
+		struct DelayState
+		{
+			eDelayState state;
+			u32 arg,arg2;
+		} delay;
+  } cpu;
+
+	enum eConsoleType
+	{
+		eConsoleType_Normal,
+		eConsoleType_DTL
+	};
+
+	struct
+	{
+		u32 ram_size;
+		u32 ram_mask;
+	} config;
+
+	void poweron(eConsoleType type);
+	void reset();
+
+	//execs one psx cycle
+	void exec_cycle();
+	void exec_shed(eScheduleItemType type);
+
+	static CPU::eFormat util_decode_format(u32 opcode);
+	void TraceALU();
+	void cpu_break(const u32 code);
+  void cpu_run_alu_bioshack(); //called once per cycle to implement bios hacks (stdout mostly)
+	void cpu_run_alu_bioshack_putchar(const u32 regval);
+
+	//debug-pokes a value into the psx address space (maybe rename to poke)
+	//TODO - make a check argument for sanity checking (to keep from patching the wrong thing)
+	void patch(const u32 addr, const u32 val);
+
+	//executes one cpu cycle
+  void cpu_exec_cycle();
+
+	//run each of the pipeline stages
+	void cpu_run_fetch();
+	void cpu_run_muldiv();
+	void cpu_run_alu();
+	void cpu_run_mem();
+	void cpu_run_wb();
+
+	//trigger an exception
+	void cpu_exception(CPU::eException ex, u32 pc_victim);
+
+	//coprocessor interfaces to be called from the alu pipeline
+	void cpu_copz_mtc(const u32 z, const u32 rd, const u32 value);
+	void cpu_cop0_mtc(const u32 rd, const u32 value);
+	u32 cpu_copz_mfc(const u32 z, const u32 rd);
+	u32 cpu_cop0_mfc(const u32 rd);
+	
+	//main memory io interfaces
+	u32 cpu_fetch(const u32 addr);
+	template<int size> u32 cpu_rdmem(const u32 addr);
+	template<int size, bool POKE> void cpu_wrmem(const u32 addr, const u32 val);
+	template<int size> void cpu_wrmem(const u32 addr, const u32 val);
+
+	//memory mapping handlers
+	void cpu_wr_ram(const int size, const u32 addr, const u32 val);
+	u32 cpu_rd_ram(const int size, const u32 addr);
+	void cpu_wr_scratch(const int size, const u32 addr, const u32 val);
+	u32 cpu_rd_scratch(const int size, const u32 addr);
+	void cpu_wr_bios(const int size, const u32 addr, const u32 val);
+	u32 cpu_rd_bios(const int size, const u32 addr);
+	void cpu_wr_pio(const int size, const u32 addr, const u32 val);
+	u32 cpu_rd_pio(const int size, const u32 addr);
+	void cpu_wr_quick(u8* const buf, const int size, const u32 addr, const u32 val);
+	u32 cpu_rd_quick(const u8* const buf, const int size, const u32 addr);
+	void cpu_wr_hwreg(const int size, const u32 addr, const u32 val);
+	u32 cpu_rd_hwreg(const int size, const u32 addr);
+	
+	void spu_wr(const int size, const u32 addr, const u32 val);
+	u32 spu_rd(const int size, const u32 addr);
+	
+	void sio_wr(const int size, const u32 addr, const u32 val);
+	u32 sio_rd(const int size, const u32 addr);
+	//sets the dtr rising edge signal for the specified port (e.g. strobe signal; port should latch its values then presumably)
+	void sio_dtr(const u32 port);
+
+	u32 irq_rd(const int size, const u32 addr);
+	void irq_wr(const int size, const u32 addr, const u32 val);
+	void irq_update();
+
+	//miscellaneous not real stuff
+	u32 counter;
+	u64 abscounter;
+	//this will be used to boot the game if an appropriate signal is received
+	PSX_EXE_Header exeBootHeader;
+
+	enum eFakeBreakOp
+	{
+		eFakeBreakOp_None=0,
+		eFakeBreakOp_BootEXE=1,
+		eFakeBreakOp_BiosHack=2,
+	};
+
+	void RunForever();
+	void vblank_trigger();
+};
+
diff --git a/PsxHawk.Core/types.h b/PsxHawk.Core/types.h
new file mode 100644
index 0000000000..52e8522b36
--- /dev/null
+++ b/PsxHawk.Core/types.h
@@ -0,0 +1,22 @@
+/*
+compiler types and configuration
+*/
+
+#pragma once
+
+#include <stdlib.h>
+
+typedef __int8 s8;
+typedef __int16 s16;
+typedef __int32 s32;
+typedef __int64 s64;
+typedef unsigned __int8 u8;
+typedef unsigned __int16 u16;
+typedef unsigned __int32 u32;
+typedef unsigned __int64 u64;
+
+#define ABORT(message) { printf("%s\n",message); exit(0); }
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#ifndef CTASSERT
+#define	CTASSERT(x)		typedef char __assert ## y[(x) ? 1 : -1]
+#endif