From 0acbb11e97fd2fd16d3baf09c7da0a5dc4b7a845 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Sun, 27 Oct 2013 22:07:40 +0000
Subject: [PATCH] move HawkFile to BizHawk.Common along with a small web of
 dependencies and then add "using BizHawk.Common" to 100 files

---
 .../BizHawk.Client.Common.csproj              |   2 +-
 BizHawk.Client.Common/RomGame.cs              |   1 +
 .../SevenZipSharpArchiveHandler.cs            |  63 +++
 BizHawk.Client.Common/XmlGame.cs              |   2 +
 BizHawk.Client.Common/movie/InputAdapters.cs  |   2 +
 BizHawk.Client.Common/movie/MovieImport.cs    |   2 +-
 BizHawk.Common/BizHawk.Common.csproj          |   6 +
 BizHawk.Common/Extensions.cs                  | 457 +++++++++++++++++
 .../HawkFile.cs                               | 139 ++----
 BizHawk.Common/Types.cs                       |  31 ++
 BizHawk.Common/Util.cs                        |  11 +
 BizHawk.Emulation/CPUs/68000/OpcodeTable.cs   |   2 +
 BizHawk.Emulation/CPUs/HuC6280/HuC6280.cs     |   2 +
 BizHawk.Emulation/CPUs/MOS 6502X/Execute.cs   |   3 +
 .../Computers/Commodore64/SaveState.cs        |   2 +
 BizHawk.Emulation/Consoles/Calculator/TI83.cs |   2 +
 .../Consoles/Coleco/ColecoVision.cs           |   2 +
 BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs |   2 +
 .../Consoles/Nintendo/GBA/Meteor.cs           |   2 +
 .../Consoles/Nintendo/Gameboy/Gambatte.cs     |   2 +
 .../Consoles/Nintendo/Gameboy/GambatteLink.cs |   2 +
 .../Consoles/Nintendo/N64/N64.cs              |   2 +
 .../Consoles/Nintendo/NES/APU.cs              |   1 +
 .../Nintendo/NES/Boards/BANDAI-FCG-1.cs       |   4 +-
 .../Consoles/Nintendo/NES/Boards/Camerica.cs  |   4 +-
 .../Nintendo/NES/Boards/JALECO_JF_05_06_07.cs |   4 +-
 .../Nintendo/NES/Boards/JALECO_JF_19.cs       |   4 +-
 .../Nintendo/NES/Boards/MLT-ACTION52.cs       |   4 +-
 .../Consoles/Nintendo/NES/Boards/MLT-MAX15.cs |   4 +-
 .../Nintendo/NES/Boards/MMC3_family/HKROM.cs  |   2 +
 .../Nintendo/NES/Boards/MMC3_family/MMC3.cs   |   1 +
 .../NES/Boards/MMC3_family/Mapper049.cs       |   4 +-
 .../NES/Boards/MMC3_family/Mapper052.cs       |   4 +-
 .../NES/Boards/MMC3_family/Mapper115.cs       |   4 +-
 .../NES/Boards/MMC3_family/Mapper191.cs       |   2 +
 .../NES/Boards/MMC3_family/Mapper245.cs       |   4 +-
 .../NES/Boards/MMC3_family/Mapper249.cs       |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper015.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper045.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper057.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper058.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper069.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper078.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper090.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper116.cs |   2 +
 .../Consoles/Nintendo/NES/Boards/Mapper176.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper178.cs |   5 +-
 .../Consoles/Nintendo/NES/Boards/Mapper200.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper207.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper225.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper226.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper227.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper230.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper231.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper233.cs |   5 +-
 .../Consoles/Nintendo/NES/Boards/Mapper242.cs |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper50.cs  |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper61.cs  |   4 +-
 .../Consoles/Nintendo/NES/Boards/Mapper62.cs  |   4 +-
 .../Nintendo/NES/Boards/NAMCOT_m19_m210.cs    |   4 +-
 .../Consoles/Nintendo/NES/Boards/NES-EVENT.cs |   4 +-
 .../NES/Boards/Namcot1xx/Mapper154.cs         |   4 +-
 .../Nintendo/NES/Boards/PxROM_FxROM.cs        |   4 +-
 .../Consoles/Nintendo/NES/Boards/SEEPROM.cs   |   2 +
 .../Nintendo/NES/Boards/Sunsoft2_m89.cs       |   4 +-
 .../Nintendo/NES/Boards/Sunsoft2_m93.cs       |   4 +-
 .../Consoles/Nintendo/NES/Boards/Sunsoft3.cs  |   4 +-
 .../NES/Boards/TAITO_74_161_161_32.cs         |   4 +-
 .../Nintendo/NES/Boards/TENGEN-800032.cs      |   4 +-
 .../Nintendo/NES/Boards/Taito_X1_005.cs       |   4 +-
 .../Nintendo/NES/Boards/Taito_X1_017.cs       |   4 +-
 .../Consoles/Nintendo/NES/Boards/VRC1.cs      |   4 +-
 .../Consoles/Nintendo/NES/Boards/VRC2_4.cs    |   2 +
 .../Consoles/Nintendo/NES/Boards/VRC3.cs      |   4 +-
 .../Consoles/Nintendo/NES/Boards/VRC6.cs      |   2 +
 .../Consoles/Nintendo/NES/Boards/VRC7.cs      |   2 +
 .../Consoles/Nintendo/NES/PPU.regs.cs         |   1 +
 .../Consoles/Nintendo/SNES/LibsnesCore.cs     |   2 +
 BizHawk.Emulation/Consoles/PC Engine/ADPCM.cs |   2 +
 .../Consoles/PC Engine/ArcadeCard.cs          |   2 +
 .../Consoles/PC Engine/PCEngine.cs            |   2 +
 .../Consoles/PC Engine/ScsiCDBus.cs           |   2 +
 BizHawk.Emulation/Consoles/PC Engine/VCE.cs   |   2 +
 BizHawk.Emulation/Consoles/PC Engine/VDC.cs   |   2 +
 BizHawk.Emulation/Consoles/PC Engine/VPC.cs   |   2 +
 .../Consoles/Sega/Genesis/GenVDP.cs           |   2 +
 .../Consoles/Sega/Genesis/Genesis.cs          |   5 +-
 BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs    |   2 +
 BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs    |   3 +
 .../Consoles/Sega/Saturn/Yabause.cs           |   2 +
 .../DiscSystem/Blobs/Blob_ECM.cs              |   2 +
 BizHawk.Emulation/Sound/HuC6280PSG.cs         |   2 +
 BizHawk.Emulation/Sound/MMC5Audio.cs          |   2 +
 BizHawk.Emulation/Sound/Sunsoft5BAudio.cs     |   2 +
 BizHawk.Emulation/Sound/VRC6Alt.cs            |   2 +
 BizHawk.Emulation/Util.cs                     | 472 +-----------------
 BizHawk.MultiClient/AVOut/WavWriter.cs        |   2 +
 BizHawk.MultiClient/ArchiveChooser.cs         |   1 +
 BizHawk.MultiClient/MainForm.cs               |   1 +
 BizHawk.MultiClient/Program.cs                |   3 +
 BizHawk.MultiClient/movie/PlayMovie.cs        |   1 +
 BizHawk.MultiClient/tools/GB/GBGPUView.cs     |   1 +
 BizHawk.MultiClient/tools/GBA/GBAGPUView.cs   |   1 +
 .../tools/HexEditor/HexEditor.cs              |   1 +
 .../tools/NES/NESGraphicsConfig.cs            |   1 +
 .../tools/SNES/SNESGraphicsDebugger.cs        |   1 +
 106 files changed, 853 insertions(+), 610 deletions(-)
 create mode 100644 BizHawk.Client.Common/SevenZipSharpArchiveHandler.cs
 create mode 100644 BizHawk.Common/Extensions.cs
 rename {BizHawk.Client.Common => BizHawk.Common}/HawkFile.cs (85%)
 create mode 100644 BizHawk.Common/Types.cs
 create mode 100644 BizHawk.Common/Util.cs

diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index f1e25e819b..dcfddc065c 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -95,7 +95,6 @@
     <Compile Include="CoreFileProvider.cs" />
     <Compile Include="FirmwareManager.cs" />
     <Compile Include="Global.cs" />
-    <Compile Include="HawkFile.cs" />
     <Compile Include="helpers\InputValidate.cs" />
     <Compile Include="KeyTurbo.cs" />
     <Compile Include="movie\InputAdapters.cs" />
@@ -114,6 +113,7 @@
     <Compile Include="helpers\StringHelpers.cs" />
     <Compile Include="RomGame.cs" />
     <Compile Include="SavestateManager.cs" />
+    <Compile Include="SevenZipSharpArchiveHandler.cs" />
     <Compile Include="tools\Cheat.cs" />
     <Compile Include="tools\CheatList.cs" />
     <Compile Include="tools\RamSearchEngine.cs" />
diff --git a/BizHawk.Client.Common/RomGame.cs b/BizHawk.Client.Common/RomGame.cs
index eb43355584..b92dfbc315 100644
--- a/BizHawk.Client.Common/RomGame.cs
+++ b/BizHawk.Client.Common/RomGame.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
diff --git a/BizHawk.Client.Common/SevenZipSharpArchiveHandler.cs b/BizHawk.Client.Common/SevenZipSharpArchiveHandler.cs
new file mode 100644
index 0000000000..a55ea832bd
--- /dev/null
+++ b/BizHawk.Client.Common/SevenZipSharpArchiveHandler.cs
@@ -0,0 +1,63 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+
+using BizHawk.Common;
+
+namespace BizHawk.Client.Common
+{
+	/// <summary>
+	/// Implementation of IHawkFileArchiveHandler using SevenZipSharp pure managed code
+	/// </summary>
+	public class SevenZipSharpArchiveHandler : IHawkFileArchiveHandler
+	{
+		public void Dispose()
+		{
+			if (extractor != null)
+			{
+				extractor.Dispose();
+				extractor = null;
+			}
+		}
+
+		public bool CheckSignature(string fileName, out int offset, out bool isExecutable)
+		{
+			SevenZip.FileChecker.ThrowExceptions = false;
+			return SevenZip.FileChecker.CheckSignature(fileName, out offset, out isExecutable) != SevenZip.InArchiveFormat.None;
+		}
+
+		public IHawkFileArchiveHandler Construct(string path)
+		{
+			SevenZipSharpArchiveHandler ret = new SevenZipSharpArchiveHandler();
+			ret.Open(path);
+			return ret;
+		}
+
+		void Open(string path)
+		{
+			extractor = new SevenZip.SevenZipExtractor(path);
+		}
+
+		SevenZip.SevenZipExtractor extractor;
+
+		public List<HawkFileArchiveItem> Scan()
+		{
+			List<HawkFileArchiveItem> ret = new List<HawkFileArchiveItem>();
+			for (int i = 0; i < extractor.ArchiveFileData.Count; i++)
+			{
+				var afd = extractor.ArchiveFileData[i];
+				if (afd.IsDirectory) continue;
+				var ai = new HawkFileArchiveItem { name = HawkFile.Util_FixArchiveFilename(afd.FileName), size = (long)afd.Size, archiveIndex = i, index = ret.Count };
+				ret.Add(ai);
+			}
+
+			return ret;
+		}
+
+		public void ExtractFile(int index, Stream stream)
+		{
+			extractor.ExtractFile(index, stream);
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/BizHawk.Client.Common/XmlGame.cs b/BizHawk.Client.Common/XmlGame.cs
index 707b1e3b4e..3305856bac 100644
--- a/BizHawk.Client.Common/XmlGame.cs
+++ b/BizHawk.Client.Common/XmlGame.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Xml;
 
+using BizHawk.Common;
+
 namespace BizHawk.Client.Common
 {
 	public class XmlGame
diff --git a/BizHawk.Client.Common/movie/InputAdapters.cs b/BizHawk.Client.Common/movie/InputAdapters.cs
index e1022473ed..815f387753 100644
--- a/BizHawk.Client.Common/movie/InputAdapters.cs
+++ b/BizHawk.Client.Common/movie/InputAdapters.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 
+using BizHawk.Common;
+
 namespace BizHawk.Client.Common
 {
 	/// <summary>
diff --git a/BizHawk.Client.Common/movie/MovieImport.cs b/BizHawk.Client.Common/movie/MovieImport.cs
index 74316fd672..e91a6359cd 100644
--- a/BizHawk.Client.Common/movie/MovieImport.cs
+++ b/BizHawk.Client.Common/movie/MovieImport.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.IO;
 
-#pragma warning disable 219
+using BizHawk.Common;
 
 namespace BizHawk.Client.Common
 {
diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj
index 15497a6fd8..6c4a82917e 100644
--- a/BizHawk.Common/BizHawk.Common.csproj
+++ b/BizHawk.Common/BizHawk.Common.csproj
@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -42,9 +44,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Extensions.cs" />
+    <Compile Include="HawkFile.cs" />
     <Compile Include="MruStack.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Types.cs" />
     <Compile Include="UndoHistory.cs" />
+    <Compile Include="Util.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/BizHawk.Common/Extensions.cs b/BizHawk.Common/Extensions.cs
new file mode 100644
index 0000000000..af95b77589
--- /dev/null
+++ b/BizHawk.Common/Extensions.cs
@@ -0,0 +1,457 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Diagnostics;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+namespace BizHawk.Common
+{
+	public static class Extensions
+	{
+		public static string GetDirectory(this Assembly asm)
+		{
+			string codeBase = asm.CodeBase;
+			UriBuilder uri = new UriBuilder(codeBase);
+			string path = Uri.UnescapeDataString(uri.Path);
+			return Path.GetDirectoryName(path);
+		}
+
+		public static int LowerBoundBinarySearch<T, TKey>(this IList<T> list, Func<T, TKey> keySelector, TKey key) where TKey : IComparable<TKey>
+		{
+			int min = 0;
+			int max = list.Count;
+			int mid = 0;
+			TKey midKey;
+			while (min < max)
+			{
+				mid = (max + min) / 2;
+				T midItem = list[mid];
+				midKey = keySelector(midItem);
+				int comp = midKey.CompareTo(key);
+				if (comp < 0)
+				{
+					min = mid + 1;
+				}
+				else if (comp > 0)
+				{
+					max = mid - 1;
+				}
+				else
+				{
+					return mid;
+				}
+			}
+
+			//did we find it exactly?
+			if (min == max && keySelector(list[min]).CompareTo(key) == 0)
+			{
+				return min;
+			}
+
+			mid = min;
+
+			//we didnt find it. return something corresponding to lower_bound semantics
+
+			if (mid == list.Count)
+				return max; //had to go all the way to max before giving up; lower bound is max
+			if (mid == 0)
+				return -1; //had to go all the way to min before giving up; lower bound is min
+
+			midKey = keySelector(list[mid]);
+			if (midKey.CompareTo(key) >= 0) return mid - 1;
+			else return mid;
+		}
+
+		public static string ToHexString(this int n, int numdigits)
+		{
+			return string.Format("{0:X" + numdigits + "}", n);
+		}
+
+		public static void CopyTo(this Stream src, Stream dest)
+		{
+			int size = (src.CanSeek) ? Math.Min((int)(src.Length - src.Position), 0x2000) : 0x2000;
+			byte[] buffer = new byte[size];
+			int n;
+			do
+			{
+				n = src.Read(buffer, 0, buffer.Length);
+				dest.Write(buffer, 0, n);
+			} while (n != 0);
+		}
+
+		public static void CopyTo(this MemoryStream src, Stream dest)
+		{
+			dest.Write(src.GetBuffer(), (int)src.Position, (int)(src.Length - src.Position));
+		}
+
+		public static void CopyTo(this Stream src, MemoryStream dest)
+		{
+			if (src.CanSeek)
+			{
+				int pos = (int)dest.Position;
+				int length = (int)(src.Length - src.Position) + pos;
+				dest.SetLength(length);
+
+				while (pos < length)
+					pos += src.Read(dest.GetBuffer(), pos, length - pos);
+			}
+			else
+				src.CopyTo((Stream)dest);
+		}
+
+
+		public static bool IsBinary(this string str)
+		{
+			for (int i = 0; i < str.Length; i++)
+			{
+				char c = str[i];
+				if (c == '0' || c == '1')
+					continue;
+				return false;
+			}
+			return true;
+		}
+
+		public static bool Bit(this byte b, int index)
+		{
+			return (b & (1 << index)) != 0;
+		}
+
+		public static bool Bit(this int b, int index)
+		{
+			return (b & (1 << index)) != 0;
+		}
+
+		public static bool Bit(this ushort b, int index)
+		{
+			return (b & (1 << index)) != 0;
+		}
+
+		public static string GetPrecedingString(this string str, string value)
+		{
+			int index = str.IndexOf(value);
+			if (index < 0)
+				return null;
+			if (index == 0)
+				return "";
+			return str.Substring(0, index);
+		}
+
+		public static bool In(this string str, params string[] options)
+		{
+			foreach (string opt in options)
+			{
+				if (opt.Equals(str, StringComparison.CurrentCultureIgnoreCase)) return true;
+			}
+			return false;
+		}
+
+		public static bool In(this string str, IEnumerable<string> options)
+		{
+			foreach (string opt in options)
+			{
+				if (opt.Equals(str, StringComparison.CurrentCultureIgnoreCase)) return true;
+			}
+			return false;
+		}
+
+		public static bool In<T>(this string str, IEnumerable<T> options, Func<T, string, bool> eval)
+		{
+			foreach (T opt in options)
+			{
+				if (eval(opt, str) == true)
+					return true;
+			}
+			return false;
+		}
+
+		public static bool NotIn(this string str, params string[] options)
+		{
+			foreach (string opt in options)
+			{
+				if (opt.ToLower() == str.ToLower()) return false;
+			}
+			return true;
+		}
+
+		public static bool NotIn(this string str, IEnumerable<string> options)
+		{
+			foreach (string opt in options)
+			{
+				if (opt.ToLower() == str.ToLower()) return false;
+			}
+			return true;
+		}
+
+		public static bool In(this int i, params int[] options)
+		{
+			foreach (int j in options)
+			{
+				if (i == j) return true;
+			}
+			return false;
+		}
+
+		public static bool In(this int i, IEnumerable<int> options)
+		{
+			foreach (int j in options)
+			{
+				if (i == j) return true;
+			}
+			return false;
+		}
+
+		public static bool ContainsStartsWith(this IEnumerable<string> options, string str)
+		{
+			foreach (string opt in options)
+			{
+				if (opt.StartsWith(str)) return true;
+			}
+			return false;
+		}
+
+		public static string GetOptionValue(this IEnumerable<string> options, string str)
+		{
+			try
+			{
+				foreach (string opt in options)
+				{
+					if (opt.StartsWith(str))
+					{
+						return opt.Split('=')[1];
+					}
+				}
+			}
+			catch (Exception) { }
+			return null;
+		}
+
+		public static bool IsValidRomExtentsion(this string str, params string[] romExtensions)
+		{
+			string strUpper = str.ToUpper();
+			foreach (string ext in romExtensions)
+			{
+				if (strUpper.EndsWith(ext.ToUpper())) return true;
+			}
+			return false;
+		}
+
+		public static string ToCommaSeparated(this List<string> list)
+		{
+			var sb = new StringBuilder();
+			for (int i = 0; i < list.Count; i++)
+			{
+				if (i > 0) sb.Append(",");
+				sb.Append(list[i]);
+			}
+			return sb.ToString();
+		}
+
+		public static void SaveAsHex(this byte[] buffer, TextWriter writer)
+		{
+			for (int i = 0; i < buffer.Length; i++)
+			{
+				writer.Write("{0:X2}", buffer[i]);
+			}
+			writer.WriteLine();
+		}
+
+		public unsafe static void SaveAsHexFast(this byte[] buffer, TextWriter writer)
+		{
+			char* table = Util.HexConvPtr;
+			if (buffer.Length > 0)
+			{
+				int len = buffer.Length;
+				fixed (byte* src = &buffer[0])
+					for (int i = 0; i < len; i++)
+					{
+						writer.Write(table[src[i] >> 4]);
+						writer.Write(table[src[i] & 15]);
+					}
+			}
+			writer.WriteLine();
+		}
+
+		public static void SaveAsHex(this byte[] buffer, TextWriter writer, int length)
+		{
+			for (int i = 0; i < length; i++)
+			{
+				writer.Write("{0:X2}", buffer[i]);
+			}
+			writer.WriteLine();
+		}
+
+		public static void SaveAsHex(this short[] buffer, TextWriter writer)
+		{
+			for (int i = 0; i < buffer.Length; i++)
+			{
+				writer.Write("{0:X4}", buffer[i]);
+			}
+			writer.WriteLine();
+		}
+
+		public static void SaveAsHex(this ushort[] buffer, TextWriter writer)
+		{
+			for (int i = 0; i < buffer.Length; i++)
+			{
+				writer.Write("{0:X4}", buffer[i]);
+			}
+			writer.WriteLine();
+		}
+
+		public static void SaveAsHex(this int[] buffer, TextWriter writer)
+		{
+			for (int i = 0; i < buffer.Length; i++)
+			{
+				writer.Write("{0:X8}", buffer[i]);
+			}
+			writer.WriteLine();
+		}
+
+		public static void SaveAsHex(this uint[] buffer, TextWriter writer)
+		{
+			for (int i = 0; i < buffer.Length; i++)
+			{
+				writer.Write("{0:X8}", buffer[i]);
+			}
+			writer.WriteLine();
+		}
+
+		public static void Write(this BinaryWriter bw, int[] buffer)
+		{
+			for (int i = 0; i < buffer.Length; i++)
+				bw.Write(buffer[i]);
+		}
+
+		public static void Write(this BinaryWriter bw, uint[] buffer)
+		{
+			for (int i = 0; i < buffer.Length; i++)
+				bw.Write(buffer[i]);
+		}
+
+		public static void Write(this BinaryWriter bw, short[] buffer)
+		{
+			for (int i = 0; i < buffer.Length; i++)
+				bw.Write(buffer[i]);
+		}
+
+		public static void Write(this BinaryWriter bw, ushort[] buffer)
+		{
+			for (int i = 0; i < buffer.Length; i++)
+				bw.Write(buffer[i]);
+		}
+
+		public static int[] ReadInt32s(this BinaryReader br, int num)
+		{
+			int[] ret = new int[num];
+			for (int i = 0; i < num; i++)
+				ret[i] = br.ReadInt32();
+			return ret;
+		}
+
+		public static short[] ReadInt16s(this BinaryReader br, int num)
+		{
+			short[] ret = new short[num];
+			for (int i = 0; i < num; i++)
+				ret[i] = br.ReadInt16();
+			return ret;
+		}
+
+		public static ushort[] ReadUInt16s(this BinaryReader br, int num)
+		{
+			ushort[] ret = new ushort[num];
+			for (int i = 0; i < num; i++)
+				ret[i] = br.ReadUInt16();
+			return ret;
+		}
+
+		public static void ReadFromHex(this byte[] buffer, string hex)
+		{
+			if (hex.Length % 2 != 0)
+				throw new Exception("Hex value string does not appear to be properly formatted.");
+			for (int i = 0; i < buffer.Length && i * 2 < hex.Length; i++)
+			{
+				string bytehex = "" + hex[i * 2] + hex[i * 2 + 1];
+				buffer[i] = byte.Parse(bytehex, NumberStyles.HexNumber);
+			}
+		}
+
+		private static int Hex2Int(char c)
+		{
+			if (c <= '9')
+				return c - '0';
+			else if (c <= 'F')
+				return c - '7';
+			else
+				return c - 'W';
+		}
+
+		public static void ReadFromHexFast(this byte[] buffer, string hex)
+		{
+			//if (hex.Length % 2 != 0)
+			//	throw new Exception("Hex value string does not appear to be properly formatted.");
+			for (int i = 0; i < buffer.Length && i * 2 < hex.Length; i++)
+			{
+				buffer[i] = (byte)(Hex2Int(hex[i * 2]) * 16 + Hex2Int(hex[i * 2 + 1]));
+			}
+			/*
+			var b = new byte[buffer.Length];
+			b.ReadFromHex(hex);
+			for (int i = 0; i < buffer.Length; i++)
+			{
+				if (b[i] != buffer[i])
+					throw new Exception();
+			}*/
+		}
+
+		public static void ReadFromHex(this short[] buffer, string hex)
+		{
+			if (hex.Length % 4 != 0)
+				throw new Exception("Hex value string does not appear to be properly formatted.");
+			for (int i = 0; i < buffer.Length && i * 4 < hex.Length; i++)
+			{
+				string shorthex = "" + hex[i * 4] + hex[(i * 4) + 1] + hex[(i * 4) + 2] + hex[(i * 4) + 3];
+				buffer[i] = short.Parse(shorthex, NumberStyles.HexNumber);
+			}
+		}
+
+		public static void ReadFromHex(this ushort[] buffer, string hex)
+		{
+			if (hex.Length % 4 != 0)
+				throw new Exception("Hex value string does not appear to be properly formatted.");
+			for (int i = 0; i < buffer.Length && i * 4 < hex.Length; i++)
+			{
+				string ushorthex = "" + hex[i * 4] + hex[(i * 4) + 1] + hex[(i * 4) + 2] + hex[(i * 4) + 3];
+				buffer[i] = ushort.Parse(ushorthex, NumberStyles.HexNumber);
+			}
+		}
+
+		public static void ReadFromHex(this int[] buffer, string hex)
+		{
+			if (hex.Length % 8 != 0)
+				throw new Exception("Hex value string does not appear to be properly formatted.");
+			for (int i = 0; i < buffer.Length && i * 8 < hex.Length; i++)
+			{
+				//string inthex = "" + hex[i * 8] + hex[(i * 8) + 1] + hex[(i * 4) + 2] + hex[(i * 4) + 3] + hex[(i*4
+				string inthex = hex.Substring(i * 8, 8);
+				buffer[i] = int.Parse(inthex, NumberStyles.HexNumber);
+			}
+		}
+
+		//public static void SaveAsHex(this uint[] buffer, BinaryWriter bw)
+		//{
+		//    for (int i = 0; i < buffer.Length; i++)
+		//        bw.Write(buffer[i]);
+		//}
+
+		//these don't work??? they dont get chosen by compiler
+		public static void WriteBit(this BinaryWriter bw, Bit bit) { bw.Write((bool)bit); }
+		public static Bit ReadBit(this BinaryReader br) { return br.ReadBoolean(); }
+	}
+
+
+}
\ No newline at end of file
diff --git a/BizHawk.Client.Common/HawkFile.cs b/BizHawk.Common/HawkFile.cs
similarity index 85%
rename from BizHawk.Client.Common/HawkFile.cs
rename to BizHawk.Common/HawkFile.cs
index 3737cb2c30..f9d631d5be 100644
--- a/BizHawk.Client.Common/HawkFile.cs
+++ b/BizHawk.Common/HawkFile.cs
@@ -7,101 +7,12 @@ using System.Linq;
 //This is so we could drop in an unamanged dearchiver library optionally later as a performance optimization without ruining the portability of the code.
 //Also, we want to be able to use HawkFiles in BizHawk.Common withuot bringing in a large 7-zip dependency
 
-namespace BizHawk.Client.Common
+namespace BizHawk.Common
 {
 	//todo:
 	//split into "bind" and "open (the bound thing)"
 	//scan archive to flatten interior directories down to a path (maintain our own archive item list)
 
-	public interface IHawkFileArchiveHandler : IDisposable
-	{
-		//todo - could this receive a hawkfile itself? possibly handy, in very clever scenarios of mounting fake files
-		bool CheckSignature(string fileName, out int offset, out bool isExecutable);
-
-		List<HawkFileArchiveItem> Scan();
-
-		IHawkFileArchiveHandler Construct(string path);
-
-		void ExtractFile(int index, Stream stream);
-	}
-
-	public class HawkFileArchiveItem
-	{
-		/// <summary>
-		/// member name
-		/// </summary>
-		public string name;
-
-		/// <summary>
-		/// size of member file
-		/// </summary>
-		public long size;
-
-		/// <summary>
-		/// the index of this archive item
-		/// </summary>
-		public int index;
-
-		/// <summary>
-		/// the index WITHIN THE ARCHIVE (for internal tracking by a IHawkFileArchiveHandler) of the member
-		/// </summary>
-		public int archiveIndex;
-	}
-
-	/// <summary>
-	/// Implementation of IHawkFileArchiveHandler using SevenZipSharp pure managed code
-	/// </summary>
-	class SevenZipSharpArchiveHandler : IHawkFileArchiveHandler
-	{
-		public void Dispose()
-		{
-			if(extractor != null)
-			{
-				extractor.Dispose();
-				extractor = null;
-			}
-		}
-
-		public bool CheckSignature(string fileName, out int offset, out bool isExecutable)
-		{
-			SevenZip.FileChecker.ThrowExceptions = false;
-			return SevenZip.FileChecker.CheckSignature(fileName, out offset, out isExecutable) != SevenZip.InArchiveFormat.None;
-		}
-
-		public IHawkFileArchiveHandler Construct(string path)
-		{
-			SevenZipSharpArchiveHandler ret = new SevenZipSharpArchiveHandler();
-			ret.Open(path);
-			return ret;
-		}
-
-		void Open(string path)
-		{
-			extractor = new SevenZip.SevenZipExtractor(path);
-		}
-
-		SevenZip.SevenZipExtractor extractor;
-
-		public List<HawkFileArchiveItem> Scan()
-		{
-			List<HawkFileArchiveItem> ret = new List<HawkFileArchiveItem>();
-			for (int i = 0; i < extractor.ArchiveFileData.Count; i++)
-			{
-				var afd = extractor.ArchiveFileData[i];
-				if (afd.IsDirectory) continue;
-				var ai = new HawkFileArchiveItem {name = HawkFile.Util_FixArchiveFilename(afd.FileName), size = (long) afd.Size, archiveIndex = i, index = ret.Count};
-				ret.Add(ai);
-			}
-
-			return ret;
-		}
-
-		public void ExtractFile(int index, Stream stream)
-		{
-			extractor.ExtractFile(index, stream);
-		}
-	}
-
 	/// <summary>
 	/// HawkFile allows a variety of objects (actual files, archive members) to be treated as normal filesystem objects to be opened, closed, and read.
 	/// It can understand paths in 'canonical' format which includes /path/to/archive.zip|member.rom as well as /path/to/file.rom
@@ -113,7 +24,7 @@ namespace BizHawk.Client.Common
 		/// <summary>
 		/// Set this with an instance which can construct archive handlers as necessary for archive handling.
 		/// </summary>
-		public static IHawkFileArchiveHandler ArchiveHandlerFactory = new SevenZipSharpArchiveHandler();
+		public static IHawkFileArchiveHandler ArchiveHandlerFactory;
 
 		/// <summary>
 		/// Utility: Uses full HawkFile processing to determine whether a file exists at the provided path
@@ -506,6 +417,50 @@ namespace BizHawk.Client.Common
 			if (member == null) return root;
 			else return string.Format("{0}|{1}", root, member);
 		}
+	
+	} //class HawkFile
 
+
+	/// <summary>
+	/// Bridge between HawkFile and the frontend's implementation of archive management
+	/// </summary>
+	public interface IHawkFileArchiveHandler : IDisposable
+	{
+		//todo - could this receive a hawkfile itself? possibly handy, in very clever scenarios of mounting fake files
+		bool CheckSignature(string fileName, out int offset, out bool isExecutable);
+
+		List<HawkFileArchiveItem> Scan();
+
+		IHawkFileArchiveHandler Construct(string path);
+
+		void ExtractFile(int index, Stream stream);
 	}
-}
+
+	/// <summary>
+	/// Members returned by IHawkFileArchiveHandler
+	/// </summary>
+	public class HawkFileArchiveItem
+	{
+		/// <summary>
+		/// member name
+		/// </summary>
+		public string name;
+
+		/// <summary>
+		/// size of member file
+		/// </summary>
+		public long size;
+
+		/// <summary>
+		/// the index of this archive item
+		/// </summary>
+		public int index;
+
+		/// <summary>
+		/// the index WITHIN THE ARCHIVE (for internal tracking by a IHawkFileArchiveHandler) of the member
+		/// </summary>
+		public int archiveIndex;
+	}
+
+} //namespace BizHawk.Common
+ 
\ No newline at end of file
diff --git a/BizHawk.Common/Types.cs b/BizHawk.Common/Types.cs
new file mode 100644
index 0000000000..61ab3cb8a8
--- /dev/null
+++ b/BizHawk.Common/Types.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Diagnostics;
+
+namespace BizHawk.Common
+{
+
+	//I think this is a little faster with uint than with byte
+	public struct Bit
+	{
+		Bit(uint val) { this.val = val; }
+		uint val;
+		public static implicit operator Bit(int rhs) { Debug.Assert((rhs & ~1) == 0); return new Bit((uint)(rhs)); }
+		public static implicit operator Bit(uint rhs) { Debug.Assert((rhs & ~1) == 0); return new Bit((uint)(rhs)); }
+		public static implicit operator Bit(byte rhs) { Debug.Assert((rhs & ~1) == 0); return new Bit((uint)(rhs)); }
+		public static implicit operator Bit(bool rhs) { return new Bit(rhs ? (byte)1 : (byte)0); }
+		public static implicit operator long(Bit rhs) { return (long)rhs.val; }
+		public static implicit operator int(Bit rhs) { return (int)rhs.val; }
+		public static implicit operator uint(Bit rhs) { return (uint)rhs.val; }
+		public static implicit operator byte(Bit rhs) { return (byte)rhs.val; }
+		public static implicit operator bool(Bit rhs) { return rhs.val != 0; }
+		public override string ToString()
+		{
+			return val.ToString();
+		}
+		public static bool operator ==(Bit lhs, Bit rhs) { return lhs.val == rhs.val; }
+		public static bool operator !=(Bit lhs, Bit rhs) { return lhs.val != rhs.val; }
+		public override int GetHashCode() { return val.GetHashCode(); }
+		public override bool Equals(object obj) { return this == (Bit)obj; } //this is probably wrong
+	}
+
+}
\ No newline at end of file
diff --git a/BizHawk.Common/Util.cs b/BizHawk.Common/Util.cs
new file mode 100644
index 0000000000..158e917b33
--- /dev/null
+++ b/BizHawk.Common/Util.cs
@@ -0,0 +1,11 @@
+public unsafe static class Util
+{
+	static readonly char[] HexConvArr = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+	static System.Runtime.InteropServices.GCHandle HexConvHandle;
+	public static char* HexConvPtr;
+	static unsafe Util()
+	{
+		HexConvHandle = System.Runtime.InteropServices.GCHandle.Alloc(HexConvArr, System.Runtime.InteropServices.GCHandleType.Pinned);
+		HexConvPtr = (char*)HexConvHandle.AddrOfPinnedObject().ToPointer();
+	}
+}
\ No newline at end of file
diff --git a/BizHawk.Emulation/CPUs/68000/OpcodeTable.cs b/BizHawk.Emulation/CPUs/68000/OpcodeTable.cs
index f302f484bf..574b5cbc91 100644
--- a/BizHawk.Emulation/CPUs/68000/OpcodeTable.cs
+++ b/BizHawk.Emulation/CPUs/68000/OpcodeTable.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.CPUs.M68000
 {
     partial class MC68000
diff --git a/BizHawk.Emulation/CPUs/HuC6280/HuC6280.cs b/BizHawk.Emulation/CPUs/HuC6280/HuC6280.cs
index 666a49e08e..df717a9628 100644
--- a/BizHawk.Emulation/CPUs/HuC6280/HuC6280.cs
+++ b/BizHawk.Emulation/CPUs/HuC6280/HuC6280.cs
@@ -2,6 +2,8 @@
 using System.Globalization;
 using System.IO;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.CPUs.H6280
 {
     public sealed partial class HuC6280
diff --git a/BizHawk.Emulation/CPUs/MOS 6502X/Execute.cs b/BizHawk.Emulation/CPUs/MOS 6502X/Execute.cs
index a50788c08e..eecfa4360f 100644
--- a/BizHawk.Emulation/CPUs/MOS 6502X/Execute.cs	
+++ b/BizHawk.Emulation/CPUs/MOS 6502X/Execute.cs	
@@ -1,6 +1,9 @@
 //http://nesdev.parodius.com/6502_cpu.txt
+
 using System;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.CPUs.M6502
 {
 	public partial class MOS6502X
diff --git a/BizHawk.Emulation/Computers/Commodore64/SaveState.cs b/BizHawk.Emulation/Computers/Commodore64/SaveState.cs
index 90f999a820..413a059e21 100644
--- a/BizHawk.Emulation/Computers/Commodore64/SaveState.cs
+++ b/BizHawk.Emulation/Computers/Commodore64/SaveState.cs
@@ -6,6 +6,8 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Computers.Commodore64
 {
     static class SaveState
diff --git a/BizHawk.Emulation/Consoles/Calculator/TI83.cs b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
index 94eb6b54ff..95d5a1744d 100644
--- a/BizHawk.Emulation/Consoles/Calculator/TI83.cs
+++ b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
@@ -2,6 +2,8 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Collections.Generic;
+
+using BizHawk.Common;
 using BizHawk.Emulation.CPUs.Z80;
 
 //http://www.ticalc.org/pub/text/calcinfo/
diff --git a/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
index a4a98f91d4..1efc87352b 100644
--- a/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
+++ b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+
+using BizHawk.Common;
 using BizHawk.Emulation.CPUs.Z80;
 using BizHawk.Emulation.Sound;
 
diff --git a/BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs b/BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
index 93033d4ac6..7b08a5ddad 100644
--- a/BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
+++ b/BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Globalization;
 using System.IO;
+
+using BizHawk.Common;
 using BizHawk.Emulation.CPUs.Z80;
 
 namespace BizHawk.Emulation.Consoles.Coleco
diff --git a/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
index d48efee691..007d76dd85 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.IO;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo.GBA
 {
 	public class GBA : IEmulator, IVideoProvider, ISyncSoundProvider
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
index a2c04b889f..0355aff6e2 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.GB
 {
 	/// <summary>
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs
index 5803cd24a3..371bb4993d 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.GB
 {
 	public class GambatteLink : IEmulator, IVideoProvider, ISyncSoundProvider
diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
index 266033cf92..b00d25b732 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
@@ -4,6 +4,8 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo.N64
 {
 	public class N64 : IEmulator, IVideoProvider
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs
index 56fc435106..071d05bd92 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs
@@ -14,6 +14,7 @@ using System.Collections.Generic;
 
 //TODO - refactor length counter to be separate component
 
+using BizHawk.Common;
 
 namespace BizHawk.Emulation.Consoles.Nintendo
 {
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
index 3e2639b56a..e4dd2cbd96 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA mapper 16 & 159
 	/*
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs
index e3fddbf187..a285b219ab 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA mapper 071
 	//TODO - apparently this mapper contains good nes timing test cases
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
index 5f912d196e..4d28db4dec 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	/*
 	PRG-ROM - 32kb/16kb
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
index 340ca8db6d..3363d30f4e 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//iNES Mapper 92
 	//Example Games:
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
index 10cc6ea2a3..23b6634ac2 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class MLT_ACTION52 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
index f948cf3d52..c252c88ae6 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class MLT_MAX15 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
index 66d2f990fe..3ab7b19da7 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
@@ -1,3 +1,5 @@
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//aka MMC6 aka StarTropics and StarTropics 2
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
index 06f73e0380..ab8d4a6335 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
@@ -4,6 +4,7 @@
 //Code for emulating iNES mappers 4,12,44,45,47,49,52,74,114,115,116,118,119,165,205,214,215,245,249,250,254
 
 using System;
+using BizHawk.Common;
 
 namespace BizHawk.Emulation.Consoles.Nintendo
 {
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
index fdb13f55fa..5903f92ffc 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//http://wiki.nesdev.com/w/index.php/INES_Mapper_044
 	public sealed class Mapper049 : MMC3Board_Base
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
index 71421b4b26..c216cceba7 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper52 : MMC3Board_Base
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
index 81e0ccc9d4..3dd4b66eee 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//this class also handles mapper 248
 	//FCEUX uses 115 to implement 248 as well (as of 09-apr-2012 it does it buggily in the case of Bao Qing Tian (As))
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
index 7c53b7ebe6..13ca2cdfaf 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
@@ -1,5 +1,7 @@
 using System;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper191 : MMC3Board_Base
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
index f012151a8b..66618b967c 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper245 : MMC3Board_Base
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
index 3e2b725edc..2833dbd038 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper249 : MMC3Board_Base
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs
index 9ed9bd9958..c597a0d479 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper015 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs
index 8d5c306302..fc2dfdf05f 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper045 : MMC3Board_Base
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs
index 7d1c968e11..28109ff09d 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper057 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs
index 65741abf64..f353d4d0f2 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper058 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs
index 7dd6b7b8ae..8a38ddac64 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//Mapper 069 is FME7 
 	//or, Sunsoft-5, which is FME7 with additional sound hardware
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs
index 427e091e0d..4b02daf15c 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper078 : NES.NESBoardBase 
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs
index c00cbcf38f..e35363fdd6 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper090 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs
index bfea4a2fae..4f417ccbc2 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs
@@ -2,6 +2,8 @@
 
 using System;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper116 : NES.NESBoardBase
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs
index b5a3093285..bae41ec199 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper176 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs
index e20a08374b..25c82f1750 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs
@@ -1,4 +1,7 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper178 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs
index 67466118d6..dfd5777c9b 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper200 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs
index 6c4a53c94e..f877bca305 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	/*
 	*  Here are Disch's original notes:  
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs
index bc67e32821..064db9984c 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper225 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs
index 3a086c052b..3a4e27b9af 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper226 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs
index d363a4ac9a..ebd73a82c2 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper227 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs
index 5a5c9f5862..a8af48b078 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper230 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs
index da6a745aa2..4a138a02a6 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper231 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs
index 9f11fd7da7..8414388600 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs
@@ -1,4 +1,7 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper233 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs
index 53df3c9073..341d19f78a 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	/*
 PCB Class: Unknown
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs
index 2cd6d1e0c9..a90e8f61cc 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper50 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs
index 883fc12e8b..9bb962fc4a 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper61 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs
index 7c796ab0a2..8f5e4409f9 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Mapper62 : NES.NESBoardBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs
index a323284b6d..408ae577d9 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA mapper 19 + 210
 	//210 lacks the sound and nametable control
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
index 7eecfcabdd..2a02af1d72 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA mapper 105
 	public sealed class NES_EVENT : NES.NESBoardBase
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
index 2786f3c26d..f9979dcea8 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	/*
 	Example Games:
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs
index c9ef7f9470..5a48609920 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA MMC2 Mike Tyson's Punch-Out!!
 	//AKA MMC4 (similar enough to combine in one fle)
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs
index 45cc4263f0..0110018954 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs
@@ -1,5 +1,7 @@
 using System;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	/// <summary>
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs
index a92acb83cc..72027f1286 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA Sunsoft-2 chip (SUNSOFT-3 pcb)
 	//game=Tenka no Goikenban: Mito Koumon ; chip=sunsoft-2 ; pcb = SUNSOFT-3
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs
index dd92e07209..e47175eee9 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//game=shanghai ; chip=sunsoft-2 ; pcb=SUNSOFT-3R
 	//game=fantasy zone ; chip=sunsoft-1 ; pcb = SUNSOFT-4
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
index 2ae43792b6..9add74523d 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA mapper 67
 	//this may be confusing due to general chaos with the early sunsoft mappers. see docs/sunsoft.txt
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs
index f47bbf3b03..38708a3cb1 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//Mapper 152
 	//Arkanoid 2 (J)
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs
index c2db232e4c..82e8553977 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA mapper 64
 	public sealed class TENGEN_800032 : NES.NESBoardBase
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs
index 9d6d21e3b2..7d5be0398b 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA mapper 80
 
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs
index 954eeddec8..f0e701e34b 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	public sealed class Taito_X1_017 : NES.NESBoardBase 
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs
index 0f6024aaec..a65f1d2a7e 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//AKA mapper 75
 	public sealed class VRC1 : NES.NESBoardBase
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs
index b8c9f5610a..11e8a40768 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs
@@ -2,6 +2,8 @@
 
 using System;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//mapper 21 + 22 + 23 + 25 (docs largely in 021.txt for VRC4 and 22.txt for VRC2)
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs
index b2eb02bf8d..de5511f401 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Consoles.Nintendo
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//mapper 73 AKA salamander
 	//different IRQ logic than other VRC
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs
index 4453a701f3..111afe923b 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs
@@ -1,5 +1,7 @@
 using System;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//mapper 24 + 26
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs
index b7a6fbb576..c9f923366a 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo
 {
 	//mapper 85
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
index 260f56ba86..0909230220 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
@@ -12,6 +12,7 @@
 				//};
 
 using System;
+using BizHawk.Common;
 
 
 namespace BizHawk.Emulation.Consoles.Nintendo
diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
index 966b2b0116..ef15d9c767 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
@@ -15,6 +15,8 @@ using System.IO;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Nintendo.SNES
 {
 
diff --git a/BizHawk.Emulation/Consoles/PC Engine/ADPCM.cs b/BizHawk.Emulation/Consoles/PC Engine/ADPCM.cs
index 07084b6fbb..beff5220b4 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/ADPCM.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/ADPCM.cs	
@@ -3,6 +3,8 @@ using BizHawk.Emulation.Sound;
 using System.IO;
 using System.Globalization;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.TurboGrafx
 {
     public sealed class ADPCM : ISoundProvider
diff --git a/BizHawk.Emulation/Consoles/PC Engine/ArcadeCard.cs b/BizHawk.Emulation/Consoles/PC Engine/ArcadeCard.cs
index f67eca550b..5bc3cf2e6e 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/ArcadeCard.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/ArcadeCard.cs	
@@ -2,6 +2,8 @@
 using System.IO;
 using System.Globalization;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.TurboGrafx
 {
     partial class PCEngine
diff --git a/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs
index c134e78772..34cebefc6b 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs	
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+
+using BizHawk.Common;
 using BizHawk.Emulation.CPUs.H6280;
 using BizHawk.Emulation.Sound;
 using BizHawk.DiscSystem;
diff --git a/BizHawk.Emulation/Consoles/PC Engine/ScsiCDBus.cs b/BizHawk.Emulation/Consoles/PC Engine/ScsiCDBus.cs
index 051b44f2d8..713cad4e99 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/ScsiCDBus.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/ScsiCDBus.cs	
@@ -4,6 +4,8 @@ using BizHawk.Emulation.Sound;
 using System.IO;
 using System.Globalization;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.TurboGrafx
 {
     // TODO we can adjust this to have Think take the number of cycles and not require
diff --git a/BizHawk.Emulation/Consoles/PC Engine/VCE.cs b/BizHawk.Emulation/Consoles/PC Engine/VCE.cs
index a309643862..5c1ab9266d 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/VCE.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/VCE.cs	
@@ -2,6 +2,8 @@
 using System.Globalization;
 using System.IO;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.TurboGrafx
 {
     // HuC6260 Video Color Encoder
diff --git a/BizHawk.Emulation/Consoles/PC Engine/VDC.cs b/BizHawk.Emulation/Consoles/PC Engine/VDC.cs
index 405111b64e..fc29d9b648 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/VDC.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/VDC.cs	
@@ -1,6 +1,8 @@
 using System;
 using System.Globalization;
 using System.IO;
+
+using BizHawk.Common;
 using BizHawk.Emulation.CPUs.H6280;
 
 namespace BizHawk.Emulation.Consoles.TurboGrafx
diff --git a/BizHawk.Emulation/Consoles/PC Engine/VPC.cs b/BizHawk.Emulation/Consoles/PC Engine/VPC.cs
index 5ec49497c9..77126ea572 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/VPC.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/VPC.cs	
@@ -1,5 +1,7 @@
 using System;
 using System.IO;
+
+using BizHawk.Common;
 using BizHawk.Emulation.CPUs.H6280;
 
 namespace BizHawk.Emulation.Consoles.TurboGrafx
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs b/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs
index a2774eb85b..ff32fcafdf 100644
--- a/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs
+++ b/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs
@@ -2,6 +2,8 @@
 using System.IO;
 using System.Globalization;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Sega
 {
     public sealed partial class GenVDP : IVideoProvider
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
index 7b17030a03..79083adfc7 100644
--- a/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
+++ b/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
@@ -3,11 +3,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.InteropServices;
+
+using BizHawk.Common;
 using BizHawk.Emulation.CPUs.M68000;
 using BizHawk.Emulation.CPUs.Z80;
 using BizHawk.Emulation.Sound;
 using Native68000;
-using System.Runtime.InteropServices;
+
 
 namespace BizHawk.Emulation.Consoles.Sega
 {
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
index c1e11ff49d..b810fa9235 100644
--- a/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
+++ b/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+
+using BizHawk.Common;
 using BizHawk.Emulation.CPUs.Z80;
 using BizHawk.Emulation.Sound;
 
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs b/BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs
index b2a35943dc..8f1c3f77ca 100644
--- a/BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs
+++ b/BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs
@@ -1,8 +1,11 @@
 using System;
 using System.Globalization;
 using System.IO;
+
+using BizHawk.Common;
 using BizHawk.Emulation.CPUs.Z80;
 
+
 namespace BizHawk.Emulation.Consoles.Sega
 {
 	public enum VdpMode { SMS, GameGear }
diff --git a/BizHawk.Emulation/Consoles/Sega/Saturn/Yabause.cs b/BizHawk.Emulation/Consoles/Sega/Saturn/Yabause.cs
index 89225527c7..a63e5bab5b 100644
--- a/BizHawk.Emulation/Consoles/Sega/Saturn/Yabause.cs
+++ b/BizHawk.Emulation/Consoles/Sega/Saturn/Yabause.cs
@@ -5,6 +5,8 @@ using System.Text;
 using System.Runtime.InteropServices;
 using System.IO;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Consoles.Sega.Saturn
 {
 	public class Yabause : IEmulator, IVideoProvider, ISyncSoundProvider
diff --git a/BizHawk.Emulation/DiscSystem/Blobs/Blob_ECM.cs b/BizHawk.Emulation/DiscSystem/Blobs/Blob_ECM.cs
index e8d77004d9..f3ea4c7ec8 100644
--- a/BizHawk.Emulation/DiscSystem/Blobs/Blob_ECM.cs
+++ b/BizHawk.Emulation/DiscSystem/Blobs/Blob_ECM.cs
@@ -27,6 +27,8 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 
+using BizHawk.Common;
+
 namespace BizHawk.DiscSystem
 {
 	partial class Disc
diff --git a/BizHawk.Emulation/Sound/HuC6280PSG.cs b/BizHawk.Emulation/Sound/HuC6280PSG.cs
index 9b29567b31..4fb6578481 100644
--- a/BizHawk.Emulation/Sound/HuC6280PSG.cs
+++ b/BizHawk.Emulation/Sound/HuC6280PSG.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Sound
 {
     // Emulates PSG audio unit of a PC Engine / Turbografx-16 / SuperGrafx.
diff --git a/BizHawk.Emulation/Sound/MMC5Audio.cs b/BizHawk.Emulation/Sound/MMC5Audio.cs
index ada74e0fd5..aa38541da1 100644
--- a/BizHawk.Emulation/Sound/MMC5Audio.cs
+++ b/BizHawk.Emulation/Sound/MMC5Audio.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Sound
 {
 	public class MMC5Audio
diff --git a/BizHawk.Emulation/Sound/Sunsoft5BAudio.cs b/BizHawk.Emulation/Sound/Sunsoft5BAudio.cs
index 746caebe9b..caf8e1c8c1 100644
--- a/BizHawk.Emulation/Sound/Sunsoft5BAudio.cs
+++ b/BizHawk.Emulation/Sound/Sunsoft5BAudio.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Sound
 {
 	// YM2149F variant
diff --git a/BizHawk.Emulation/Sound/VRC6Alt.cs b/BizHawk.Emulation/Sound/VRC6Alt.cs
index 234c44027c..25e093ec82 100644
--- a/BizHawk.Emulation/Sound/VRC6Alt.cs
+++ b/BizHawk.Emulation/Sound/VRC6Alt.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
+using BizHawk.Common;
+
 namespace BizHawk.Emulation.Sound
 {
 	public class VRC6Alt
diff --git a/BizHawk.Emulation/Util.cs b/BizHawk.Emulation/Util.cs
index 4f0b48463c..00cea5e7e2 100644
--- a/BizHawk.Emulation/Util.cs
+++ b/BizHawk.Emulation/Util.cs
@@ -8,450 +8,10 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 
+using BizHawk.Common;
+
 namespace BizHawk
 {
-	public static class Extensions
-	{
-		public static string GetDirectory(this Assembly asm)
-		{
-			string codeBase = asm.CodeBase;
-			UriBuilder uri = new UriBuilder(codeBase);
-			string path = Uri.UnescapeDataString(uri.Path);
-			return Path.GetDirectoryName(path);
-		}
-
-		public static int LowerBoundBinarySearch<T, TKey>(this IList<T> list, Func<T, TKey> keySelector, TKey key) where TKey : IComparable<TKey>
-		{
-			int min = 0;
-			int max = list.Count;
-			int mid = 0;
-			TKey midKey;
-			while (min < max)
-			{
-				mid = (max + min) / 2;
-				T midItem = list[mid];
-				midKey = keySelector(midItem);
-				int comp = midKey.CompareTo(key);
-				if (comp < 0)
-				{
-					min = mid + 1;
-				}
-				else if (comp > 0)
-				{
-					max = mid - 1;
-				}
-				else
-				{
-					return mid;
-				}
-			}
-
-			//did we find it exactly?
-			if (min == max && keySelector(list[min]).CompareTo(key) == 0)
-			{
-				return min;
-			}
-
-			mid = min;
-
-			//we didnt find it. return something corresponding to lower_bound semantics
-
-			if (mid == list.Count) 
-				return max; //had to go all the way to max before giving up; lower bound is max
-			if (mid == 0) 
-				return -1; //had to go all the way to min before giving up; lower bound is min
-
-			midKey = keySelector(list[mid]);
-			if (midKey.CompareTo(key) >= 0) return mid - 1;
-			else return mid;
-		}
-
-		public static string ToHexString(this int n, int numdigits)
-		{
-			return string.Format("{0:X" + numdigits + "}", n);
-		}
-
-		public static void CopyTo(this Stream src, Stream dest)
-		{
-			int size = (src.CanSeek) ? Math.Min((int)(src.Length - src.Position), 0x2000) : 0x2000;
-			byte[] buffer = new byte[size];
-			int n;
-			do
-			{
-				n = src.Read(buffer, 0, buffer.Length);
-				dest.Write(buffer, 0, n);
-			} while (n != 0);
-		}
-
-		public static void CopyTo(this MemoryStream src, Stream dest)
-		{
-			dest.Write(src.GetBuffer(), (int)src.Position, (int)(src.Length - src.Position));
-		}
-
-		public static void CopyTo(this Stream src, MemoryStream dest)
-		{
-			if (src.CanSeek)
-			{
-				int pos = (int)dest.Position;
-				int length = (int)(src.Length - src.Position) + pos;
-				dest.SetLength(length);
-
-				while (pos < length)
-					pos += src.Read(dest.GetBuffer(), pos, length - pos);
-			}
-			else
-				src.CopyTo((Stream)dest);
-		}
-
-
-		public static bool IsBinary(this string str)
-		{
-			for (int i = 0; i < str.Length; i++)
-			{
-				char c = str[i];
-				if (c == '0' || c == '1')
-					continue;
-				return false;
-			}
-			return true;
-		}
-
-		public static bool Bit(this byte b, int index)
-		{
-			return (b & (1 << index)) != 0;
-		}
-
-		public static bool Bit(this int b, int index)
-		{
-			return (b & (1 << index)) != 0;
-		}
-
-		public static bool Bit(this ushort b, int index)
-		{
-			return (b & (1 << index)) != 0;
-		}
-
-		public static string GetPrecedingString(this string str, string value)
-		{
-			int index = str.IndexOf(value);
-			if (index < 0)
-				return null;
-			if (index == 0)
-				return "";
-			return str.Substring(0, index);
-		}
-
-		public static bool In(this string str, params string[] options)
-		{
-			foreach (string opt in options)
-			{
-				if (opt.Equals(str, StringComparison.CurrentCultureIgnoreCase)) return true;
-			}
-			return false;
-		}
-
-		public static bool In(this string str, IEnumerable<string> options)
-		{
-			foreach (string opt in options)
-			{
-				if (opt.Equals(str, StringComparison.CurrentCultureIgnoreCase)) return true;
-			}
-			return false;
-		}
-
-		public static bool In<T>(this string str, IEnumerable<T> options, Func<T, string, bool> eval)
-		{
-			foreach (T opt in options)
-			{
-				if (eval(opt, str) == true)
-					return true;
-			}
-			return false;
-		}
-
-		public static bool NotIn(this string str, params string[] options)
-		{
-			foreach (string opt in options)
-			{
-				if (opt.ToLower() == str.ToLower()) return false;
-			}
-			return true;
-		}
-
-		public static bool NotIn(this string str, IEnumerable<string> options)
-		{
-			foreach (string opt in options)
-			{
-				if (opt.ToLower() == str.ToLower()) return false;
-			}
-			return true;
-		}
-
-		public static bool In(this int i, params int[] options)
-		{
-			foreach (int j in options)
-			{
-				if (i == j) return true;
-			}
-			return false;
-		}
-
-		public static bool In(this int i, IEnumerable<int> options)
-		{
-			foreach (int j in options)
-			{
-				if (i == j) return true;
-			}
-			return false;
-		}
-
-		public static bool ContainsStartsWith(this IEnumerable<string> options, string str)
-		{
-			foreach (string opt in options)
-			{
-				if (opt.StartsWith(str)) return true;
-			}
-			return false;
-		}
-
-		public static string GetOptionValue(this IEnumerable<string> options, string str)
-		{
-			try
-			{
-				foreach (string opt in options)
-				{
-					if (opt.StartsWith(str))
-					{
-						return opt.Split('=')[1];
-					}
-				}
-			}
-			catch (Exception) { }
-			return null;
-		}
-
-		public static bool IsValidRomExtentsion(this string str, params string[] romExtensions)
-		{
-			string strUpper = str.ToUpper();
-			foreach (string ext in romExtensions)
-			{
-				if (strUpper.EndsWith(ext.ToUpper())) return true;
-			}
-			return false;
-		}
-
-		public static string ToCommaSeparated(this List<string> list)
-		{
-			var sb = new StringBuilder();
-			for (int i = 0; i < list.Count; i++)
-			{
-				if (i > 0) sb.Append(",");
-				sb.Append(list[i]);
-			}
-			return sb.ToString();
-		}
-
-		public static void SaveAsHex(this byte[] buffer, TextWriter writer)
-		{
-			for (int i = 0; i < buffer.Length; i++)
-			{
-				writer.Write("{0:X2}", buffer[i]);
-			}
-			writer.WriteLine();
-		}
-
-		public unsafe static void SaveAsHexFast(this byte[] buffer, TextWriter writer)
-		{
-			char* table = Util.HexConvPtr;
-			if (buffer.Length > 0)
-			{
-				int len = buffer.Length;
-				fixed (byte* src = &buffer[0])
-					for (int i = 0; i < len; i++)
-					{
-						writer.Write(table[src[i] >> 4]);
-						writer.Write(table[src[i] & 15]);
-					}
-			}
-			writer.WriteLine();
-		}
-
-		public static void SaveAsHex(this byte[] buffer, TextWriter writer, int length)
-		{
-			for (int i = 0; i < length; i++)
-			{
-				writer.Write("{0:X2}", buffer[i]);
-			}
-			writer.WriteLine();
-		}
-
-		public static void SaveAsHex(this short[] buffer, TextWriter writer)
-		{
-			for (int i = 0; i < buffer.Length; i++)
-			{
-				writer.Write("{0:X4}", buffer[i]);
-			}
-			writer.WriteLine();
-		}
-
-		public static void SaveAsHex(this ushort[] buffer, TextWriter writer)
-		{
-			for (int i = 0; i < buffer.Length; i++)
-			{
-				writer.Write("{0:X4}", buffer[i]);
-			}
-			writer.WriteLine();
-		}
-
-		public static void SaveAsHex(this int[] buffer, TextWriter writer)
-		{
-			for (int i = 0; i < buffer.Length; i++)
-			{
-				writer.Write("{0:X8}", buffer[i]);
-			}
-			writer.WriteLine();
-		}
-
-		public static void SaveAsHex(this uint[] buffer, TextWriter writer)
-		{
-			for (int i = 0; i < buffer.Length; i++)
-			{
-				writer.Write("{0:X8}", buffer[i]);
-			}
-			writer.WriteLine();
-		}
-
-		public static void Write(this BinaryWriter bw, int[] buffer)
-		{
-			for (int i = 0; i < buffer.Length; i++)
-				bw.Write(buffer[i]);
-		}
-
-		public static void Write(this BinaryWriter bw, uint[] buffer)
-		{
-			for (int i = 0; i < buffer.Length; i++)
-				bw.Write(buffer[i]);
-		}
-
-		public static void Write(this BinaryWriter bw, short[] buffer)
-		{
-			for (int i = 0; i < buffer.Length; i++)
-				bw.Write(buffer[i]);
-		}
-
-		public static void Write(this BinaryWriter bw, ushort[] buffer)
-		{
-			for (int i = 0; i < buffer.Length; i++)
-				bw.Write(buffer[i]);
-		}
-
-		public static int[] ReadInt32s(this BinaryReader br, int num)
-		{
-			int[] ret = new int[num];
-			for (int i = 0; i < num; i++)
-				ret[i] = br.ReadInt32();
-			return ret;
-		}
-
-		public static short[] ReadInt16s(this BinaryReader br, int num)
-		{
-			short[] ret = new short[num];
-			for (int i = 0; i < num; i++)
-				ret[i] = br.ReadInt16();
-			return ret;
-		}
-
-        public static ushort[] ReadUInt16s(this BinaryReader br, int num)
-        {
-            ushort[] ret = new ushort[num];
-            for (int i = 0; i < num; i++)
-                ret[i] = br.ReadUInt16();
-            return ret;
-        }
-
-		public static void ReadFromHex(this byte[] buffer, string hex)
-		{
-			if (hex.Length % 2 != 0)
-				throw new Exception("Hex value string does not appear to be properly formatted.");
-			for (int i = 0; i < buffer.Length && i * 2 < hex.Length; i++)
-			{
-				string bytehex = "" + hex[i * 2] + hex[i * 2 + 1];
-				buffer[i] = byte.Parse(bytehex, NumberStyles.HexNumber);
-			}
-		}
-
-		private static int Hex2Int(char c)
-		{
-			if (c <= '9')
-				return c - '0';
-			else if (c <= 'F')
-				return c - '7';
-			else
-				return c - 'W';
-		}
-
-		public static void ReadFromHexFast(this byte[] buffer, string hex)
-		{
-			//if (hex.Length % 2 != 0)
-			//	throw new Exception("Hex value string does not appear to be properly formatted.");
-			for (int i = 0; i < buffer.Length && i * 2 < hex.Length; i++)
-			{
-				buffer[i] = (byte)(Hex2Int(hex[i * 2]) * 16 + Hex2Int(hex[i * 2 + 1]));
-			}
-			/*
-			var b = new byte[buffer.Length];
-			b.ReadFromHex(hex);
-			for (int i = 0; i < buffer.Length; i++)
-			{
-				if (b[i] != buffer[i])
-					throw new Exception();
-			}*/
-		}
-
-		public static void ReadFromHex(this short[] buffer, string hex)
-		{
-			if (hex.Length % 4 != 0)
-				throw new Exception("Hex value string does not appear to be properly formatted.");
-			for (int i = 0; i < buffer.Length && i * 4 < hex.Length; i++)
-			{
-				string shorthex = "" + hex[i * 4] + hex[(i * 4) + 1] + hex[(i * 4) + 2] + hex[(i * 4) + 3];
-				buffer[i] = short.Parse(shorthex, NumberStyles.HexNumber);
-			}
-		}
-
-		public static void ReadFromHex(this ushort[] buffer, string hex)
-		{
-			if (hex.Length % 4 != 0)
-				throw new Exception("Hex value string does not appear to be properly formatted.");
-			for (int i = 0; i < buffer.Length && i * 4 < hex.Length; i++)
-			{
-				string ushorthex = "" + hex[i * 4] + hex[(i * 4) + 1] + hex[(i * 4) + 2] + hex[(i * 4) + 3];
-				buffer[i] = ushort.Parse(ushorthex, NumberStyles.HexNumber);
-			}
-		}
-
-		public static void ReadFromHex(this int[] buffer, string hex)
-		{
-			if (hex.Length % 8 != 0)
-				throw new Exception("Hex value string does not appear to be properly formatted.");
-			for (int i = 0; i < buffer.Length && i * 8 < hex.Length; i++)
-			{
-				//string inthex = "" + hex[i * 8] + hex[(i * 8) + 1] + hex[(i * 4) + 2] + hex[(i * 4) + 3] + hex[(i*4
-				string inthex = hex.Substring(i*8,8);
-				buffer[i] = int.Parse(inthex, NumberStyles.HexNumber);
-			}
-		}
-
-		//public static void SaveAsHex(this uint[] buffer, BinaryWriter bw)
-		//{
-		//    for (int i = 0; i < buffer.Length; i++)
-		//        bw.Write(buffer[i]);
-		//}
-
-		//these don't work??? they dont get chosen by compiler
-		public static void WriteBit(this BinaryWriter bw, Bit bit) { bw.Write((bool)bit); }
-		public static Bit ReadBit(this BinaryReader br) { return br.ReadBoolean(); }
-	}
 
 	public static class Colors
 	{
@@ -471,34 +31,6 @@ namespace BizHawk
 		}
 	}
 
-
-
-	//I think this is a little faster with uint than with byte
-	public struct Bit
-	{
-		Bit(uint val) { this.val = val; }
-		uint val;
-		public static implicit operator Bit(int rhs) { Debug.Assert((rhs & ~1) == 0); return new Bit((uint)(rhs)); }
-		public static implicit operator Bit(uint rhs) { Debug.Assert((rhs & ~1) == 0); return new Bit((uint)(rhs)); }
-		public static implicit operator Bit(byte rhs) { Debug.Assert((rhs & ~1) == 0); return new Bit((uint)(rhs)); }
-		public static implicit operator Bit(bool rhs) { return new Bit(rhs ? (byte)1 : (byte)0); }
-		public static implicit operator long(Bit rhs) { return (long)rhs.val; }
-		public static implicit operator int(Bit rhs) { return (int)rhs.val; }
-		public static implicit operator uint(Bit rhs) { return (uint)rhs.val; }
-		public static implicit operator byte(Bit rhs) { return (byte)rhs.val; }
-		public static implicit operator bool(Bit rhs) { return rhs.val != 0; }
-		public override string ToString()
-		{
-			return val.ToString();
-		}
-		public static bool operator ==(Bit lhs, Bit rhs) { return lhs.val == rhs.val; }
-		public static bool operator !=(Bit lhs, Bit rhs) { return lhs.val != rhs.val; }
-		public override int GetHashCode() { return val.GetHashCode(); }
-		public override bool Equals(object obj) { return this == (Bit)obj; } //this is probably wrong
-	}
-
-
-
 	public unsafe static class Util
 	{
 		static readonly char[] HexConvArr = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
diff --git a/BizHawk.MultiClient/AVOut/WavWriter.cs b/BizHawk.MultiClient/AVOut/WavWriter.cs
index 69f304991f..7dae99f6a2 100644
--- a/BizHawk.MultiClient/AVOut/WavWriter.cs
+++ b/BizHawk.MultiClient/AVOut/WavWriter.cs
@@ -4,6 +4,8 @@ using System.Linq;
 using System.Text;
 using System.IO;
 
+using BizHawk.Common;
+
 namespace BizHawk.MultiClient
 {
 	/// <summary>
diff --git a/BizHawk.MultiClient/ArchiveChooser.cs b/BizHawk.MultiClient/ArchiveChooser.cs
index 8c61029bd9..061462dfa1 100644
--- a/BizHawk.MultiClient/ArchiveChooser.cs
+++ b/BizHawk.MultiClient/ArchiveChooser.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 55593b5912..4adbe27f03 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -22,6 +22,7 @@ using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Emulation.Consoles.Sega;
 using BizHawk.Emulation.Consoles.TurboGrafx;
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
diff --git a/BizHawk.MultiClient/Program.cs b/BizHawk.MultiClient/Program.cs
index b8bcf452cc..2f64b9d7e5 100644
--- a/BizHawk.MultiClient/Program.cs
+++ b/BizHawk.MultiClient/Program.cs
@@ -12,6 +12,7 @@ using Microsoft.VisualBasic.ApplicationServices;
 
 #pragma warning disable 618
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
@@ -68,6 +69,8 @@ namespace BizHawk.MultiClient
 			Global.Config = ConfigService.Load<Config>(PathManager.DefaultIniPath, new Config());
 			Global.Config.ResolveDefaults();
 
+			BizHawk.Common.HawkFile.ArchiveHandlerFactory = new SevenZipSharpArchiveHandler();
+
 #if WINDOWS
 			try { GlobalWinF.DSound = SoundEnumeration.Create(); }
 			catch
diff --git a/BizHawk.MultiClient/movie/PlayMovie.cs b/BizHawk.MultiClient/movie/PlayMovie.cs
index acfde6c7cb..5ec3b99ea5 100644
--- a/BizHawk.MultiClient/movie/PlayMovie.cs
+++ b/BizHawk.MultiClient/movie/PlayMovie.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO;
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
diff --git a/BizHawk.MultiClient/tools/GB/GBGPUView.cs b/BizHawk.MultiClient/tools/GB/GBGPUView.cs
index 730728d38b..611e7edf02 100644
--- a/BizHawk.MultiClient/tools/GB/GBGPUView.cs
+++ b/BizHawk.MultiClient/tools/GB/GBGPUView.cs
@@ -3,6 +3,7 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient.GBtools
diff --git a/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs b/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs
index 33b8bc6718..92bb81a63b 100644
--- a/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs
+++ b/BizHawk.MultiClient/tools/GBA/GBAGPUView.cs
@@ -3,6 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using BizHawk.MultiClient.GBtools;
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient.GBAtools
diff --git a/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs
index 077b7a035c..491ea8d133 100644
--- a/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs
@@ -8,6 +8,7 @@ using System.Windows.Forms;
 using System.Globalization;
 using System.IO;
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
diff --git a/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs b/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs
index e80fc0405d..c2fbc9d266 100644
--- a/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs
+++ b/BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs
@@ -3,6 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using BizHawk.Emulation.Consoles.Nintendo;
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
diff --git a/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs b/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs
index 2245f8dbfe..e3cfd386e4 100644
--- a/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs
+++ b/BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs
@@ -29,6 +29,7 @@ using System.Drawing;
 using System.Reflection;
 using System.Windows.Forms;
 
+using BizHawk.Common;
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Core;