diff --git a/.editorconfig b/.editorconfig
index 27259f5155..3d0b97c090 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,3 +2,12 @@ root = true
 
 [*]
 indent_style = tab
+
+[*.cs]
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_indent_switch_labels = true
+csharp_indent_case_contents = true
+csharp_indent_labels = one_less_than_current
diff --git a/Assets/gamedb/gamedb_goodnes.txt b/Assets/gamedb/gamedb_goodnes.txt
index 6c1262745c..f89ab9dae5 100644
--- a/Assets/gamedb/gamedb_goodnes.txt
+++ b/Assets/gamedb/gamedb_goodnes.txt
@@ -179,7 +179,7 @@ acc01149108010328c2839783c09b030650696a8	G	2-in-1 - Cosmo Cop + Cyber Monster (S
 7c4d0353d9f3ff2f064a47b11497fb159f41b1f0	U	2-in-1 - Donkey Kong Country + Jungle Book (Unl)	NES
 33930c8fd186490d99ee2fe387b987ac0831c123	G	2-in-1 - Donkey Kong Country 4 + Jungle Book 2 (Unl) [!]	NES
 25943e4d0130c62aed75d92fafab75f8470c0e75	C	2-in-1 - Donkey Kong Country 4 + Jungle Book 2 (Unl) [t1]	NES
-47fcca3baebba912638d0eda77fb1676e5f0bc8e	G	2-in-1 - Family Kid & Aladdin 4 (Ch) [!]	NES
+47fcca3baebba912638d0eda77fb1676e5f0bc8e	G	2-in-1 - Family Kid & Aladdin 4 (Ch) [!]	NES
 fdc4b64f9d981bf024c93c0bf39c332e2189eb2e	G	2-in-1 - Mortal Kombat 3 Extra 60 People + Super Shinobi (King005) (Ch) [!]	NES
 ec5e8712f994f929218cea18dc9d7dff7eb55495	G	2-in-1 - Mortal Kombat V Turbo 30 + Super Aladdin (Unl) [p1][!]	NES
 754512f9474fba9a3bf50cf315ff5b33d106b29c	U	2-in-1 - Mortal Kombat VI + Mortal Kombat VII (NT-639) (Ch)	NES
@@ -521,7 +521,7 @@ ebd9d408ae00cc23b460a60a77c39336008c5671	H	Abarenradin (Abarenbou Tengu Hack)	NE
 eafc03f2f232660ed3e9eccf27c2f2527c8fe50b	U	ABM Study Card v5.0 (Ch)	NES
 0f75aec9810879bdc65269bbb1596542bd23ddf5	H	Abnormal Contra (Hack)	NES
 64a897591d15f88ffd05773baf690dfa60f0d0d2	U	About 8 Eyes (R) (PD)	NES
-f8287728e18eefd9b190597555f1f370b183a388	U	About Advanced Dungeons & Dragons - Heroes of the Lance (R) (PD)	NES
+f8287728e18eefd9b190597555f1f370b183a388	U	About Advanced Dungeons & Dragons - Heroes of the Lance (R) (PD)	NES
 9f194dc9272c92ffa84f2ac2eee4dd0548f56c54	U	About Adventures in the Magic Kingdom (R) (PD)	NES
 c9671a576386702a8dc2242bd2b8f20e53025ffd	U	About Adventures of Bayou Billy, The (R) (PD)	NES
 2835208676b1e9ac56a06389762b58cd4caf186b	U	About Armadillo (R) (PD)	NES
@@ -563,7 +563,7 @@ a7db1747bc516ed061c4d5c70afcaa474ddb5cb0	U	Action53 Games 0.03 by Damian Yerrick
 e2e0219e2da3727d01306e46d358f69ef83c92e1	U	Action53 Games MGC2012_2MBIT by Damian Yerrick (PD)	NES
 d94968e5a043ff6a75d22a4351f86963c444b56f	U	Action53 Games MGC2012_4MBIT by Damian Yerrick (PD)	NES
 906b9c03ebb1fdb7ccfe263efcbb97ac19608757	H	Actual Haou no Tairiku (Haou no Tairiku Hack)	NES
-45bb116d48c9726104def6268a49384e628054fe	U	Add & Sub (Unl)	NES
+45bb116d48c9726104def6268a49384e628054fe	U	Add & Sub (Unl)	NES
 22ad5c56344105eee089b6fa8d00657180ed0e00	U	Add Em Up (Ch) (Wxn)	NES
 08c039c6114ee51b987b27d301b273c3c20114cc	G	Addams Family, The (E) (M3) [!]	NES
 c831410a86a9b759a1e5ec53e8e1ee6789c79569	G	Addams Family, The (U) [!]	NES
@@ -587,39 +587,39 @@ ec1811b0248129413f5be023c0b0d81a87f6e0d2	T	Addams Family, The - Pugsley's Scaven
 cd6914dd1a78ba33570b4e578f4347df2f4e31b6	C	Addams Family, The - Pugsley's Scavenger Hunt (U) [t1]	NES
 cf504f5bc99886f933161057a20a9539b6f86ed6	B	Adoventoro Tcheco v1.0 (Kero Kero Keroppi no Daibouken 2 Hack) [o1]	NES
 93985ed946c8f21bb18f8b88c4830eaf8b62d551	H	Adoventoro Tcheco v1.0 (Kero Kero Keroppi no Daibouken 2 Hack)	NES
-273f99684dbdfcf27cfca58136132898217bfbc5	G	Advanced Dungeons & Dragons - Dragon Strike (U) [!]	NES
-7a888c56b64ffd5a1b2653fa6b6d9c207fb6006f	B	Advanced Dungeons & Dragons - Dragon Strike (U) [b1]	NES
-d8737a92ad99191fa6653dc2094be81e6c9a1b9e	B	Advanced Dungeons & Dragons - Dragon Strike (U) [o1]	NES
-cca11ec6eb0721d6d2e7decbca51b66d5d8548c8	B	Advanced Dungeons & Dragons - Dragon Strike (U) [o2]	NES
-00ae1a7b6cdf1c9b624b29488f54485103b8dcf1	C	Advanced Dungeons & Dragons - Dragon Strike (U) [t1]	NES
-fba99cd8cfb0d44eaaee300dcd194520b41a92b2	G	Advanced Dungeons & Dragons - Dragons of Flame (J) [!]	NES
-f788bbc014cd740449e1a0299feae7234d69a5cf	B	Advanced Dungeons & Dragons - Dragons of Flame (J) [b1]	NES
-071c57824564e1081f721ced5db1981c6d3ca034	B	Advanced Dungeons & Dragons - Dragons of Flame (J) [o1]	NES
-25f20b279a150136b337b10f618a251a34c90b73	T	Advanced Dungeons & Dragons - Dragons of Flame (J) [T+Eng1.03_DvD Translations]	NES
-e40073be785c7cce9c256e4be575b425e8719340	G	Advanced Dungeons & Dragons - Heroes of the Lance (J) [!]	NES
-963bea44db79635410a56faa0eefcec79509ca93	U	Advanced Dungeons & Dragons - Heroes of the Lance (U) (Prototype)	NES
-d9328b02916d365c97ed21074333257968e55f91	G	Advanced Dungeons & Dragons - Heroes of the Lance (U) [!]	NES
-b091cd121984c85dd850979948401f6c10613e5a	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [b1]	NES
-e5564fb5a4b54dbd103803e2e15acd6d390b1cdf	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [b2]	NES
-cc4a023e907b5fa3f415ebb284d64f7b95f92114	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [b3]	NES
-5207100c4d9eb4dd9cd2e2f8b5814fa4ed3aca6e	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [o1]	NES
-9c2a89479470349deddb38cdbda242b26b6589fd	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [o2]	NES
-2611badd4923ab1ef83db2e98b6c944416dc1367	T	Advanced Dungeons & Dragons - Heroes of the Lance (U) [T+Rus0.30_Chief-Net]	NES
-5bc6b4d5e2b27983e678376a95b041ecb3abe819	G	Advanced Dungeons & Dragons - Hillsfar (J) [!]	NES
-5f86c4b515c1cdaf18dd22f60a2d59116e9b2f05	B	Advanced Dungeons & Dragons - Hillsfar (J) [b1]	NES
-988c9199cafb56b54691af8bedaf161fbf9353d1	B	Advanced Dungeons & Dragons - Hillsfar (J) [b2]	NES
-94af82688883d02b83733b36e300d1e742940e1a	B	Advanced Dungeons & Dragons - Hillsfar (J) [o1]	NES
-806eb65696593368bef9b62e63b1d8624c637030	G	Advanced Dungeons & Dragons - Hillsfar (U) [!]	NES
-4aedc8efec6f8df4bfbab548a9523778b6fc9594	B	Advanced Dungeons & Dragons - Hillsfar (U) [o1]	NES
-22261fef73fb2161c513632ff614af0ca17d8105	G	Advanced Dungeons & Dragons - Pool of Radiance (J) [!]	NES
-7eca79e1a9684dbbf30dd282c3b44f0fd25deae4	B	Advanced Dungeons & Dragons - Pool of Radiance (J) [b1]	NES
-8612381815f8d64128310ee201bb1b8560c98ab9	B	Advanced Dungeons & Dragons - Pool of Radiance (J) [b1][o1]	NES
-28eaac4e09ed87fa70a10cca7f70a112502f5c8f	B	Advanced Dungeons & Dragons - Pool of Radiance (J) [o1]	NES
-a056d59aae542b15ce5361ab49954e746863029b	B	Advanced Dungeons & Dragons - Pool of Radiance (J) [o2]	NES
-81eefb9fa6552b95bb086552a043097d6ecdd051	G	Advanced Dungeons & Dragons - Pool of Radiance (U) [!]	NES
-7ddd3a1811b62e94a59d1f5c17045dfd786640a7	B	Advanced Dungeons & Dragons - Pool of Radiance (U) [b1]	NES
-995527d6333875de6ab0d99b00a77b3b6901db8c	B	Advanced Dungeons & Dragons - Pool of Radiance (U) [b2]	NES
-b9aab0a607081b9409da575ce15aa5e1517e52d9	B	Advanced Dungeons & Dragons - Pool of Radiance (U) [o1]	NES
+273f99684dbdfcf27cfca58136132898217bfbc5	G	Advanced Dungeons & Dragons - Dragon Strike (U) [!]	NES
+7a888c56b64ffd5a1b2653fa6b6d9c207fb6006f	B	Advanced Dungeons & Dragons - Dragon Strike (U) [b1]	NES
+d8737a92ad99191fa6653dc2094be81e6c9a1b9e	B	Advanced Dungeons & Dragons - Dragon Strike (U) [o1]	NES
+cca11ec6eb0721d6d2e7decbca51b66d5d8548c8	B	Advanced Dungeons & Dragons - Dragon Strike (U) [o2]	NES
+00ae1a7b6cdf1c9b624b29488f54485103b8dcf1	C	Advanced Dungeons & Dragons - Dragon Strike (U) [t1]	NES
+fba99cd8cfb0d44eaaee300dcd194520b41a92b2	G	Advanced Dungeons & Dragons - Dragons of Flame (J) [!]	NES
+f788bbc014cd740449e1a0299feae7234d69a5cf	B	Advanced Dungeons & Dragons - Dragons of Flame (J) [b1]	NES
+071c57824564e1081f721ced5db1981c6d3ca034	B	Advanced Dungeons & Dragons - Dragons of Flame (J) [o1]	NES
+25f20b279a150136b337b10f618a251a34c90b73	T	Advanced Dungeons & Dragons - Dragons of Flame (J) [T+Eng1.03_DvD Translations]	NES
+e40073be785c7cce9c256e4be575b425e8719340	G	Advanced Dungeons & Dragons - Heroes of the Lance (J) [!]	NES
+963bea44db79635410a56faa0eefcec79509ca93	U	Advanced Dungeons & Dragons - Heroes of the Lance (U) (Prototype)	NES
+d9328b02916d365c97ed21074333257968e55f91	G	Advanced Dungeons & Dragons - Heroes of the Lance (U) [!]	NES
+b091cd121984c85dd850979948401f6c10613e5a	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [b1]	NES
+e5564fb5a4b54dbd103803e2e15acd6d390b1cdf	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [b2]	NES
+cc4a023e907b5fa3f415ebb284d64f7b95f92114	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [b3]	NES
+5207100c4d9eb4dd9cd2e2f8b5814fa4ed3aca6e	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [o1]	NES
+9c2a89479470349deddb38cdbda242b26b6589fd	B	Advanced Dungeons & Dragons - Heroes of the Lance (U) [o2]	NES
+2611badd4923ab1ef83db2e98b6c944416dc1367	T	Advanced Dungeons & Dragons - Heroes of the Lance (U) [T+Rus0.30_Chief-Net]	NES
+5bc6b4d5e2b27983e678376a95b041ecb3abe819	G	Advanced Dungeons & Dragons - Hillsfar (J) [!]	NES
+5f86c4b515c1cdaf18dd22f60a2d59116e9b2f05	B	Advanced Dungeons & Dragons - Hillsfar (J) [b1]	NES
+988c9199cafb56b54691af8bedaf161fbf9353d1	B	Advanced Dungeons & Dragons - Hillsfar (J) [b2]	NES
+94af82688883d02b83733b36e300d1e742940e1a	B	Advanced Dungeons & Dragons - Hillsfar (J) [o1]	NES
+806eb65696593368bef9b62e63b1d8624c637030	G	Advanced Dungeons & Dragons - Hillsfar (U) [!]	NES
+4aedc8efec6f8df4bfbab548a9523778b6fc9594	B	Advanced Dungeons & Dragons - Hillsfar (U) [o1]	NES
+22261fef73fb2161c513632ff614af0ca17d8105	G	Advanced Dungeons & Dragons - Pool of Radiance (J) [!]	NES
+7eca79e1a9684dbbf30dd282c3b44f0fd25deae4	B	Advanced Dungeons & Dragons - Pool of Radiance (J) [b1]	NES
+8612381815f8d64128310ee201bb1b8560c98ab9	B	Advanced Dungeons & Dragons - Pool of Radiance (J) [b1][o1]	NES
+28eaac4e09ed87fa70a10cca7f70a112502f5c8f	B	Advanced Dungeons & Dragons - Pool of Radiance (J) [o1]	NES
+a056d59aae542b15ce5361ab49954e746863029b	B	Advanced Dungeons & Dragons - Pool of Radiance (J) [o2]	NES
+81eefb9fa6552b95bb086552a043097d6ecdd051	G	Advanced Dungeons & Dragons - Pool of Radiance (U) [!]	NES
+7ddd3a1811b62e94a59d1f5c17045dfd786640a7	B	Advanced Dungeons & Dragons - Pool of Radiance (U) [b1]	NES
+995527d6333875de6ab0d99b00a77b3b6901db8c	B	Advanced Dungeons & Dragons - Pool of Radiance (U) [b2]	NES
+b9aab0a607081b9409da575ce15aa5e1517e52d9	B	Advanced Dungeons & Dragons - Pool of Radiance (U) [o1]	NES
 1e28999c356e61b1df86830e6a44a28064b5c817	G	Adventure Island (E) [!]	NES
 22ee75b82f4a6412aa6bb940e109704975b95185	G	Adventure Island (U) [!]	NES
 1fda3bdfb434a51ce1b0d8ecc1048bead586aa78	B	Adventure Island (U) [b1]	NES
@@ -762,7 +762,7 @@ a13dd4b5b89d9409f17cddac89d6cd9565ce515f	G	Adventures of Gilligan's Island, The
 3ab83784dae8e89b6008210e0b5cfbd70819afcf	C	Adventures of Gilligan's Island, The (U) [t1]	NES
 38b3d3a93b7d6f586eea866323bd3fb9e4eca3a8	H	Adventures of Ice Mario (SMB1 Hack) [a1]	NES
 6f8e6102756ba3bc48ae2a859f6f9d0b29f790df	H	Adventures of Ice Mario (SMB1 Hack)	NES
-31c22dc41dc70de595ba39e4851a71072d6c5f2c	U	Adventures of Lex & Grim, The (PD)	NES
+31c22dc41dc70de595ba39e4851a71072d6c5f2c	U	Adventures of Lex & Grim, The (PD)	NES
 c43118388202bf348bae335eb2311ab8a0562bcb	U	Adventures of Lolo (E) (VC)	NES
 d37c8003bf052404248ffaca106f7d32c75c8076	G	Adventures of Lolo (E) [!]	NES
 ad9ef7f61d97ecfc837f5f1eeb952935867306d7	G	Adventures of Lolo (J) [!]	NES
@@ -887,8 +887,8 @@ f532c6e8d7d0443005f236bcfa2e6da52c0ac538	G	Ai Senshi Nicol (FDS Conversion) [p2]
 df393788cf372f5b2e173ae3ee2b488d5d8b9efb	B	Aigiina no Yogen - From The Legend of Balubalouk (J) [b1]	NES
 e277bdd8af36aaef9637477498834b1ed2074ae8	B	Aigiina no Yogen - From The Legend of Balubalouk (J) [b2]	NES
 e58d3146df2f09b3f98e4a35d132e05aa3347843	B	Aigiina no Yogen - From The Legend of Balubalouk (J) [p1]	NES
-a4f42cbcb63f4d827055cbe1ced904ae0ccac4f7	T	Aigiina no Yogen - From The Legend of Balubalouk (J) [T+Eng0.30_KP Hacks&Trans]	NES
-6305751b6a7c3b24aa7f5f182dec3a4358bf3bcc	T	Aigiina no Yogen - From The Legend of Balubalouk (J) [T+Eng0.30_KP Hacks&Trans][t1]	NES
+a4f42cbcb63f4d827055cbe1ced904ae0ccac4f7	T	Aigiina no Yogen - From The Legend of Balubalouk (J) [T+Eng0.30_KP Hacks&Trans]	NES
+6305751b6a7c3b24aa7f5f182dec3a4358bf3bcc	T	Aigiina no Yogen - From The Legend of Balubalouk (J) [T+Eng0.30_KP Hacks&Trans][t1]	NES
 4bf385b7915e35d7fef3cd311caf9fdc7cb38048	C	Aigiina no Yogen - From The Legend of Balubalouk (J) [t1]	NES
 93e4145c080847cf0d1c95e69d0f78e957fa4101	H	Air (SMB1 Hack)	NES
 e6aa612a23d571cf1b2196d13f0a4ec420d15efb	U	AIR - NES Visual Novel System V20040617 by NES Hack Factory (PD)	NES
@@ -1558,14 +1558,14 @@ c1dd041495a2ea02ffbbc583344b87137df8e984	B	Back to the Future (U) [b4]	NES
 48404a7e46e0070aa1920130858315926d31b97e	B	Back to the Future (U) [o1]	NES
 5f262291edbcb4b4a72ca057bf8b379853af4556	T	Back to the Future (U) [T+Pol]	NES
 24cc7674f742deec05ed246824f1bd6511ffdad6	H	Back to the Future 4 by RyanVG (Back to the Future Hack)	NES
-641de451615a4f7004039308628c043b5ade6c31	H	Back to the Future 5 & 6 by RyanVG (Back to the Future II & III Hack)	NES
+641de451615a4f7004039308628c043b5ade6c31	H	Back to the Future 5 & 6 by RyanVG (Back to the Future II & III Hack)	NES
 4c79761269d0b9aaff4f9f9dcb28d8a106fa92b6	G	Back to the Future IV (Unl) [!]	NES
-42ac1fcea405552892bed982a90a99d1292e4cdb	G	Back to the Future Part II & III (U) [!]	NES
-8338134a546f6c068c2b9e1bfdec45cab78d9571	B	Back to the Future Part II & III (U) [b1]	NES
-4476ea6bbd674b081d4b36574c2746afad97abd6	B	Back to the Future Part II & III (U) [b2]	NES
-060e5dde73dc19d931d561b28251a7c501771182	B	Back to the Future Part II & III (U) [b3]	NES
-22ee09afdc4cb6f9790b9f87b0f49bcb19c6dce7	B	Back to the Future Part II & III (U) [o1]	NES
-081f5da36bb4aaa0ad0b3bfafbf71a2ff1062697	C	Back to the Future Part II & III (U) [t1]	NES
+42ac1fcea405552892bed982a90a99d1292e4cdb	G	Back to the Future Part II & III (U) [!]	NES
+8338134a546f6c068c2b9e1bfdec45cab78d9571	B	Back to the Future Part II & III (U) [b1]	NES
+4476ea6bbd674b081d4b36574c2746afad97abd6	B	Back to the Future Part II & III (U) [b2]	NES
+060e5dde73dc19d931d561b28251a7c501771182	B	Back to the Future Part II & III (U) [b3]	NES
+22ee09afdc4cb6f9790b9f87b0f49bcb19c6dce7	B	Back to the Future Part II & III (U) [o1]	NES
+081f5da36bb4aaa0ad0b3bfafbf71a2ff1062697	C	Back to the Future Part II & III (U) [t1]	NES
 798d3f6cc1bf9a2dfcbb586c92fbd3e63ae7c172	U	Background Music by Tony Young (PD)	NES
 86d389f46bde561394a7e69ff960f747a5ef297b	U	Backstroke (Ch) (Wxn)	NES
 92584bffe7d2ee47a01b480826466f78ff59f7dc	U	Bad Apple 2 v2009-12-24 (PD)	NES
@@ -1988,9 +1988,9 @@ fc950662b264fea1ad9f240360fde542283f04e1	U	Batman Title Screen Remake by Macbee
 91643c910a8c26b65e32cd8e4e8426d78d33713c	H	Batman V1.1 by Macbee (Batman Hack)	NES
 e517ce0acda2a46341290b96fec12b2be51924ee	H	Batman V1.2 by Macbee (Batman Hack)	NES
 1a9fe00ebc831950bced93c556d1116543456460	U	Bator Demo (PD)	NES
-f6177c581ed0b1d4625ec478caec3aa5939dc229	G	Batsu & Terii - Makyou no Tetsujin Race (J) [!]	NES
-6a7a694a7bbcf59df990eec4be2c1157f104d43c	B	Batsu & Terii - Makyou no Tetsujin Race (J) [o1]	NES
-b7256a34856009ac3cdfeeb8142dd3fcc9c17c2e	G	Batsu & Terii - Makyou no Tetsujin Race (R) [!]	NES
+f6177c581ed0b1d4625ec478caec3aa5939dc229	G	Batsu & Terii - Makyou no Tetsujin Race (J) [!]	NES
+6a7a694a7bbcf59df990eec4be2c1157f104d43c	B	Batsu & Terii - Makyou no Tetsujin Race (J) [o1]	NES
+b7256a34856009ac3cdfeeb8142dd3fcc9c17c2e	G	Batsu & Terii - Makyou no Tetsujin Race (R) [!]	NES
 e3b20fb71dc6b44c911627cd321968a36578ea66	U	Battle Ball (1-0) by UDISI (PD)	NES
 5915f487be763881a1f06cfdce689b1e1a503dd2	U	Battle Ball (1-1) by UDISI (PD)	NES
 19fbe1d547f0cf085c99a80bbd3073f4d1ed33a0	U	Battle Ball (1-21) by UDISI (PD)	NES
@@ -2161,16 +2161,16 @@ bd753272dcf11cb9b4c5d1e8d45436754897c97d	B	Battleship (U) [b2]	NES
 086e81e018013de624c9d18fb24771e503d68c47	B	Battleship (U) [b4]	NES
 94dca436e97e7b6bfcfd4e13da6f08c5c81f2e2c	B	Battletank 2000 (Joust Hack) [o1]	NES
 5f0c7a2228e747d174590dc54a090daa73c74761	H	Battletank 2000 (Joust Hack)	NES
-a5ab91d6a0df0bce2349a6322c536f4705287a4f	G	Battletoads & Double Dragon - The Ultimate Team (E) [!]	NES
-61832d0f955cff169ff059bd557be4f522b15b7c	G	Battletoads & Double Dragon - The Ultimate Team (U) [!]	NES
-b87d42a12a0f94a08b8476b1b2a0f1a36e050e3c	B	Battletoads & Double Dragon - The Ultimate Team (U) [o1]	NES
-a2f86721e107a039157724de5f69d3c1625ca214	G	Battletoads & Double Dragon - The Ultimate Team (U) [p1][!]	NES
-3af7d0f3d2c7a105f958b205ae71fee6fa31536d	B	Battletoads & Double Dragon - The Ultimate Team (U) [p2]	NES
-dfe30b43464bb61470b4306d9f24f6ef43c685c2	B	Battletoads & Double Dragon - The Ultimate Team (U) [p3]	NES
-ecdfa52d66575bede303075206e73c4a0aeb619a	C	Battletoads & Double Dragon - The Ultimate Team (U) [t1]	NES
-01ba0fa9342c6f8e196eeb8dbf49a3407df37a34	C	Battletoads & Double Dragon - The Ultimate Team (U) [t2]	NES
-4cea01a1ca8d219a696c4c8b0f04465da3aa872f	C	Battletoads & Double Dragon - The Ultimate Team (U) [t3]	NES
-1b7750a413fcd4d907da8654a9b78c7aa0ed423c	H	Battletoads & Double Dragon - The Ultimate Team by myaso (Hack)	NES
+a5ab91d6a0df0bce2349a6322c536f4705287a4f	G	Battletoads & Double Dragon - The Ultimate Team (E) [!]	NES
+61832d0f955cff169ff059bd557be4f522b15b7c	G	Battletoads & Double Dragon - The Ultimate Team (U) [!]	NES
+b87d42a12a0f94a08b8476b1b2a0f1a36e050e3c	B	Battletoads & Double Dragon - The Ultimate Team (U) [o1]	NES
+a2f86721e107a039157724de5f69d3c1625ca214	G	Battletoads & Double Dragon - The Ultimate Team (U) [p1][!]	NES
+3af7d0f3d2c7a105f958b205ae71fee6fa31536d	B	Battletoads & Double Dragon - The Ultimate Team (U) [p2]	NES
+dfe30b43464bb61470b4306d9f24f6ef43c685c2	B	Battletoads & Double Dragon - The Ultimate Team (U) [p3]	NES
+ecdfa52d66575bede303075206e73c4a0aeb619a	C	Battletoads & Double Dragon - The Ultimate Team (U) [t1]	NES
+01ba0fa9342c6f8e196eeb8dbf49a3407df37a34	C	Battletoads & Double Dragon - The Ultimate Team (U) [t2]	NES
+4cea01a1ca8d219a696c4c8b0f04465da3aa872f	C	Battletoads & Double Dragon - The Ultimate Team (U) [t3]	NES
+1b7750a413fcd4d907da8654a9b78c7aa0ed423c	H	Battletoads & Double Dragon - The Ultimate Team by myaso (Hack)	NES
 37e99fa67463140b2875d1079ade1ea7f3f2821f	G	Battletoads (E) [!]	NES
 cbe809d8091d4421548e63c7b5e0b7ae972b45cf	G	Battletoads (J) [!]	NES
 a9fd5d06382c88293462161bd8d882eb859b98d0	C	Battletoads (J) [t2]	NES
@@ -2195,7 +2195,7 @@ a5b0bf325118b719367f8d7816504e04877452e7	B	Be-Bop-Highschool - Koukousei Gokurak
 f07f637a55fa92b6875adb08ab9864446141440c	H	Beast Machines (Ikari Hack)	NES
 b44a2ba9f96d3810d10801e6e3a4f68f112fbb6a	G	Beat n Box (K) (Unl) [!]	NES
 8bd8815ac4c09077145f2640bc37a5ac0e2b41ef	G	Beauty and the Beast (E) [!]	NES
-062f1bca6345f1346f96bf776768cb4a5fec7f2b	U	Beavis & Butt-head Title Screen by Macbee 1.0 (PD)	NES
+062f1bca6345f1346f96bf776768cb4a5fec7f2b	U	Beavis & Butt-head Title Screen by Macbee 1.0 (PD)	NES
 b47df8791af3e39ac486b5d09b313109e8aeebcf	G	Bee 52 (Camerica) [!]	NES
 4af2961903378200d6db3ebc2cb77a28af7e3c3c	B	Bee 52 (Camerica) [o1]	NES
 48a7de1e5288428c6efb51c2d036efcce7f13384	T	Bee 52 (Camerica) [T+Rus_Magicteam]	NES
@@ -2255,16 +2255,16 @@ b77195b1c6bfc9be2e2b7c8e00a4f1e4eb717f52	B	Bible Adventures (Wisdom Tree) (V1.3)
 9459027fe75f19e2bf8f6c86ffd3410445a2f28e	B	Bible Buffet (Wisdom Tree) (V6.0) [b1]	NES
 f28787091c0a1d219de7c1ac574b5f8ba94dfe04	B	Bible Buffet (Wisdom Tree) (V6.0) [o1]	NES
 10e4ad1a87f4522960574d651f2a832596ce156f	H	Bicycle Race (F-1 Race Hack)	NES
-75c71cc6d187c855b3e982edcea8eccb729ee917	G	Big Bird's Hide & Speak (U) [!]	NES
-12eb07f634424deb6a2336c2c3f0ce34722ebbca	B	Big Bird's Hide & Speak (U) [b1]	NES
-396b8bad5215abd2ce509edaf5cd4a65ed0c6548	B	Big Bird's Hide & Speak (U) [b1][o1]	NES
-1fdbfdda17130146dc78c3914976de451726d0e1	B	Big Bird's Hide & Speak (U) [b2]	NES
-5002d3ce6a5c809969e6eda26f58c872045e017c	B	Big Bird's Hide & Speak (U) [b3]	NES
-f529a06bd217c6e5678a6eb3e4bf6db5120a7d43	B	Big Bird's Hide & Speak (U) [b4]	NES
-56564ef56008813863efeb82acc0f9008c9a7175	B	Big Bird's Hide & Speak (U) [b6]	NES
-8d9dda7bfb0ee4192f8e1c6ddfed3167b565bb75	B	Big Bird's Hide & Speak (U) [b7]	NES
-91201e10a1e91f10a06b98512275108ebd7d3f1d	B	Big Bird's Hide & Speak (U) [o1]	NES
-89d7f554a62ce24f3442b64cfea4cc7bd5ecb0d1	B	Big Bird's Hide & Speak (U) [o2]	NES
+75c71cc6d187c855b3e982edcea8eccb729ee917	G	Big Bird's Hide & Speak (U) [!]	NES
+12eb07f634424deb6a2336c2c3f0ce34722ebbca	B	Big Bird's Hide & Speak (U) [b1]	NES
+396b8bad5215abd2ce509edaf5cd4a65ed0c6548	B	Big Bird's Hide & Speak (U) [b1][o1]	NES
+1fdbfdda17130146dc78c3914976de451726d0e1	B	Big Bird's Hide & Speak (U) [b2]	NES
+5002d3ce6a5c809969e6eda26f58c872045e017c	B	Big Bird's Hide & Speak (U) [b3]	NES
+f529a06bd217c6e5678a6eb3e4bf6db5120a7d43	B	Big Bird's Hide & Speak (U) [b4]	NES
+56564ef56008813863efeb82acc0f9008c9a7175	B	Big Bird's Hide & Speak (U) [b6]	NES
+8d9dda7bfb0ee4192f8e1c6ddfed3167b565bb75	B	Big Bird's Hide & Speak (U) [b7]	NES
+91201e10a1e91f10a06b98512275108ebd7d3f1d	B	Big Bird's Hide & Speak (U) [o1]	NES
+89d7f554a62ce24f3442b64cfea4cc7bd5ecb0d1	B	Big Bird's Hide & Speak (U) [o2]	NES
 6208f86f22c8445d3936ad5fd715069083ab6ab8	H	Big Kids Pro-Wrestling by RyanVG (Tag Team Pro-Wrestling Hack)	NES
 91cf3e24b02ae75b7be395e524d9545bee50ab81	G	Big Nose Freaks Out (Camerica) (Aladdin) [!]	NES
 60550d03da8eba47778b2c6ea708ca96364d0148	B	Big Nose Freaks Out (Camerica) (Aladdin) [o1]	NES
@@ -2312,10 +2312,10 @@ ed31a87395748473cc106d7fa454ba04a53f1dbd	B	Bikkuriman World - Gekitou Sei Senshi
 dab4f077c1220c1cee5c56d8c9fdaf797af78d15	B	Bikkuriman World - Gekitou Sei Senshi (J) [o2]	NES
 d07fc347b34340ec3bee5b5366d51a97d235f0f5	H	Bikkuriman World - Gekitou Sei Senshi (J) [p1][hM02]	NES
 14de52da6383e9f6c72d812c728d8be95cc4d8ff	T	Bikkuriman World - Gekitou Sei Senshi (J) [T+Eng]	NES
-bb3a2c8fcc6801a3658b5cd4e5c10bbbe1a96cb1	G	Bill & Ted's Excellent Video Game Adventure (U) [!]	NES
-e1abcfdf970177b00e8a3c8a37f433bbd66c6f58	B	Bill & Ted's Excellent Video Game Adventure (U) [b1]	NES
-1fd46ea2cb68aa9a02eb7e42703df393af6c65ef	B	Bill & Ted's Excellent Video Game Adventure (U) [b2]	NES
-b6e33ffe9574e09443c80bd07f20aa7cbdce98c8	B	Bill & Ted's Excellent Video Game Adventure (U) [o1]	NES
+bb3a2c8fcc6801a3658b5cd4e5c10bbbe1a96cb1	G	Bill & Ted's Excellent Video Game Adventure (U) [!]	NES
+e1abcfdf970177b00e8a3c8a37f433bbd66c6f58	B	Bill & Ted's Excellent Video Game Adventure (U) [b1]	NES
+1fd46ea2cb68aa9a02eb7e42703df393af6c65ef	B	Bill & Ted's Excellent Video Game Adventure (U) [b2]	NES
+b6e33ffe9574e09443c80bd07f20aa7cbdce98c8	B	Bill & Ted's Excellent Video Game Adventure (U) [o1]	NES
 a677abfc4fa5ddd76092e41ae02cf3fd7eb05f9b	G	Bill Elliott's NASCAR Challenge (U) [!]	NES
 e81f0dd2d7982ca6caefe8bc9afb09235cc58a47	B	Bill Elliott's NASCAR Challenge (U) [b1]	NES
 3320ccda897692e186aa559d4939dea6cab7aafd	B	Bill Elliott's NASCAR Challenge (U) [b2]	NES
@@ -2689,8 +2689,8 @@ ea8923de0101a2fa05aa86b193244e06746d5a9f	C	Booby Kids (J) [t1]	NES
 d73bff0c21555d9d313b3adaf95e56dcba0fdf94	B	Boogerman II (Rex-Soft) [o1]	NES
 1569ea8845e6bb128da9823fcb493d3aec0cc130	G	Boogerman II (Rex-Soft) [U][!].unf	NES
 b2d980ac5e1a19e11e8240fb627973c8642311b7	B	Boogerman II (Rex-Soft) [U][o1].unf	NES
-f3908331337357ec80b4a24f49b73ebbb0f3048d	T	Boris & Boa Boa (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
-a7346085c5d6b761d04b9b2744a2ede13603fe3e	H	Boris & Boa Boa (Nuts & Milk Hack)	NES
+f3908331337357ec80b4a24f49b73ebbb0f3048d	T	Boris & Boa Boa (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
+a7346085c5d6b761d04b9b2744a2ede13603fe3e	H	Boris & Boa Boa (Nuts & Milk Hack)	NES
 fbfd34bb9a3a36789b5dac2d7aed0bf85217c2fc	H	Boss Rush (Castlevania Hack) [a1]	NES
 1d8a29a5d9c203e7d735696ef2099a9e746226ab	H	Boss Rush (Castlevania Hack)	NES
 0096f2938f633e1708c5e310dd0d80e2ec628b67	U	Boss Test (PD)	NES
@@ -2780,7 +2780,7 @@ b65d1ff7c15dc37808fdc6c92919c868b1694b65	B	BreakThru (U) [b4]	NES
 bb336fb04e0003ea495afdc19cb13aad1007a230	B	BreakThru (U) [o5]	NES
 8e43fc66fb280ac4330320f2a979a0e48e34fa9a	T	BreakThru (U) [T+Rus1.2_Multisoft]	NES
 58114b87cd95478361eb22ce3b0f173ca81729fc	G	Brilliant Com Pack 2 (K) [!]	NES
-0538fdcac01639743e5fc053ef83089b6d7654cd	G	Bruce & Leo (Tom & Jerry) (Unl) [!]	NES
+0538fdcac01639743e5fc053ef83089b6d7654cd	G	Bruce & Leo (Tom & Jerry) (Unl) [!]	NES
 c3637f75754e7c3c665f5d9583502663dccf1ea0	B	Brush Roller (Unl) [b1]	NES
 1895e8d17b8721e49f802c0c247765f3dca1a1eb	B	Brush Roller (Unl) [o1]	NES
 314700b6c4e1006b4f48ba856fd290b07c54c6d2	U	Brush Roller (Unl)	NES
@@ -3139,8 +3139,8 @@ dc441137c9c0cf5fde9cb7fd8d8ae795777ca372	H	Captain Tsubasa Vol. II - Chin3 by Zi
 54d55d350114fd3346020c3f11b57774c9b7ea00	H	Captain Tsubasa Vol. II - China vs Japan (Hack)	NES
 d9d049618757de596a2e3230726cf7c4a099c961	H	Captain Tsubasa Vol. II - Chinese Team Going Forward in Rainstorm (Hack)	NES
 cd12f75b44883312c1c92817a47ca97bb082e585	H	Captain Tsubasa Vol. II - Chinese Team Running in the Rain (Hack)	NES
-45a1cded0f8ab9763fe99476e6c7d7192ad92f37	H	Captain Tsubasa Vol. II - Circle & Cross (Hack)	NES
-b915156298b2e589b7fa1711a19fb61d19f9ff8b	H	Captain Tsubasa Vol. II - Club Plus & Fix Edition (Hack)	NES
+45a1cded0f8ab9763fe99476e6c7d7192ad92f37	H	Captain Tsubasa Vol. II - Circle & Cross (Hack)	NES
+b915156298b2e589b7fa1711a19fb61d19f9ff8b	H	Captain Tsubasa Vol. II - Club Plus & Fix Edition (Hack)	NES
 ca77e6d6d0f3762fb0e28ef8393a6dfb3a859720	B	Captain Tsubasa Vol. II - Comback of Twins J Edition (Hack) [o1]	NES
 a94d3768b57d1037b76cae5e559937cea1152f22	H	Captain Tsubasa Vol. II - Comback of Twins J Edition (Hack)	NES
 ad449f5d79a68b2b98b0ace2907dd58d36e13011	H	Captain Tsubasa Vol. II - Comback of Twins K Edition (Hack)	NES
@@ -3257,7 +3257,7 @@ ed65670dcfadc367c4d141669654d27a29907aaa	H	Captain Tsubasa Vol. II - New Artists
 497c6fe476abef31de7d1e692aa5fb9ad31ad7ec	H	Captain Tsubasa Vol. II - New Platinum Partner (Hack)	NES
 72b411a5e93105c1c02f16419513884b547c550b	H	Captain Tsubasa Vol. II - New Road of Emperor Plus (Hack)	NES
 a02b202044bff2c06f9649e45adea5c10f88c764	H	Captain Tsubasa Vol. II - New Road of Emperor Remake Run Wildly Edition (Hack)	NES
-4ae227e0d97577b4f1d0a4386a7f2833b70bbede	H	Captain Tsubasa Vol. II - Nippon no Ovari by sisqo & kral 89 (Hack)	NES
+4ae227e0d97577b4f1d0a4386a7f2833b70bbede	H	Captain Tsubasa Vol. II - Nippon no Ovari by sisqo & kral 89 (Hack)	NES
 af9d5e442cac049bc6ee97bef21832c915f8fcbe	H	Captain Tsubasa Vol. II - OMG by Heroy (Hack)	NES
 1c7d72b8019bf8977f3694121c94de3a05707348	H	Captain Tsubasa Vol. II - Onur Edition 2011 (Hack)	NES
 c4947d4d58cffc8d80e6b3240e0f2e775d0e6a92	H	Captain Tsubasa Vol. II - Orbit of Honor (Hack)	NES
@@ -3275,7 +3275,7 @@ ad0c06288f4ac3427524ee33f72c64e2026828ce	H	Captain Tsubasa Vol. II - Prince Nye
 2025ce107819e051765845e15bdabbdcabb2450b	H	Captain Tsubasa Vol. II - Prince with Unlimited Allure (Hack)	NES
 6641d0f7166219e302b53a0391e78f2bdca0c942	H	Captain Tsubasa Vol. II - Prologue of New Legend (Hack)	NES
 32f51d3c805b1594bca7a5128663fcbe377f9df9	H	Captain Tsubasa Vol. II - Prologue of New Tanaru Legend (Hack)	NES
-1f229c31596e5dec91d410c72b616d519aea78d5	H	Captain Tsubasa Vol. II - Raiju & Ocelot Edition (Hack)	NES
+1f229c31596e5dec91d410c72b616d519aea78d5	H	Captain Tsubasa Vol. II - Raiju & Ocelot Edition (Hack)	NES
 ce161826da7f3e46f3943bc05da23b5c866aaaae	H	Captain Tsubasa Vol. II - Raise of Western (Hack)	NES
 adddaf33336b9721aa4dafb07eda260fd5229bdf	H	Captain Tsubasa Vol. II - Rampion Edition (Hack)	NES
 a0759a83d16996fc6084eb95af2f0db1b2f345e9	H	Captain Tsubasa Vol. II - Relin Edition v1.1 by mazong1123 (Hack)	NES
@@ -3313,7 +3313,7 @@ e8e48b44700c1efaf8c03e1752b03190febecc4f	H	Captain Tsubasa Vol. II - Sino-Korean
 e4d0b8f696fca5c834215e8f1c92ca7008687a46	H	Captain Tsubasa Vol. II - Soccer Kiss (Hack)	NES
 9de5ffb7096c436ec5914d1d6dbbff508487638b	H	Captain Tsubasa Vol. II - Soccer Master in Argentina (Hack)	NES
 15a5fc93c408ca75e9c7af3ec20355b101566941	H	Captain Tsubasa Vol. II - Sonunda Basardim Ilk Hackim (Hack)	NES
-dacfa7746cd9772000bf7a7797727bf69003b447	H	Captain Tsubasa Vol. II - Speed of Ball Controlable & All Footballer (Hack)	NES
+dacfa7746cd9772000bf7a7797727bf69003b447	H	Captain Tsubasa Vol. II - Speed of Ball Controlable & All Footballer (Hack)	NES
 ae4dcc4971b095da02cdd15506a95a848ad0994e	H	Captain Tsubasa Vol. II - Speed of Ball Controlable (Hack)	NES
 90f3a515d7fc88faa4dcecc02544df6dcfb28fff	H	Captain Tsubasa Vol. II - Star 4 (Hack)	NES
 390b7a42c5a05cb85ef3758886aec39e0433be95	H	Captain Tsubasa Vol. II - Story of Ryuji Amamiya (Hack)	NES
@@ -3359,7 +3359,7 @@ f1110e5206ebe7261caca6bf65dc8629ba3aa643	H	Captain Tsubasa Vol. II - The New Joi
 78d3750224ac99d57c8c549f49daf8bd4327f5e3	H	Captain Tsubasa Vol. II - The Road to the King of World Cup of Romania (Hack)	NES
 08d80198896115199a243fd8989549eb824bf19f	H	Captain Tsubasa Vol. II - The World of King (Hack)	NES
 fec3bd3b15e2c178ba6ccddf168321b86a5b4b90	H	Captain Tsubasa Vol. II - The World of Master (Hack)	NES
-d638f9a142c98b9a295a303e5de3a9fb32731daf	H	Captain Tsubasa Vol. II - The World of Matsuyama & Emperor (Hack)	NES
+d638f9a142c98b9a295a303e5de3a9fb32731daf	H	Captain Tsubasa Vol. II - The World of Matsuyama & Emperor (Hack)	NES
 db23d6e2e46a103a98ab28da85c9d8ca6ff46177	H	Captain Tsubasa Vol. II - Three Musketeers of Uruguay (Hack)	NES
 9bc51e53dcb4a006d4548909b3d0d8046a1b80ab	H	Captain Tsubasa Vol. II - Tiger Arrive by hy1897 (Hack)	NES
 263445f5044a2ecda0da9bb742033c143d8111ae	H	Captain Tsubasa Vol. II - Tiger Arrive III (Hack)	NES
@@ -3369,9 +3369,9 @@ bea5f2dd7f36a90f796bfb4b5dbb8caec26cc8cf	H	Captain Tsubasa Vol. II - Tiger Threa
 dec1df219d5440f0dfd1bb89bf8c9cf112052187	H	Captain Tsubasa Vol. II - Tiger Wake Up (Hack)	NES
 abcc4f5e5956bd4b81907417f9c9449627cbb209	H	Captain Tsubasa Vol. II - To Cleave a Path Toward the World (Hack)	NES
 4b938a7c140412a36d901ec34d4e6e3ab2316733	H	Captain Tsubasa Vol. II - Tong's Final Perfect Edition (Hack)	NES
-1fbd50eac32baa20a3c691607e2b7dccabc5a988	H	Captain Tsubasa Vol. II - True & False Poland (Hack)	NES
+1fbd50eac32baa20a3c691607e2b7dccabc5a988	H	Captain Tsubasa Vol. II - True & False Poland (Hack)	NES
 c56e2fc9b792d1d4955f09d9406645f4dda3b422	H	Captain Tsubasa Vol. II - Two Brothers Edition (Hack)	NES
-909592b6fa254e85e6dfdd39450602ccd087d337	H	Captain Tsubasa Vol. II - Two Dragons Among Sky & Land (Hack)	NES
+909592b6fa254e85e6dfdd39450602ccd087d337	H	Captain Tsubasa Vol. II - Two Dragons Among Sky & Land (Hack)	NES
 3ce8b238c3112085e1c8fb7803c37dfeeb5121c0	H	Captain Tsubasa Vol. II - Two Stars (Hack)	NES
 9dc7a0de94dc1533aa787cb326ae285b1cf3100c	H	Captain Tsubasa Vol. II - Ucuncu Edition (Hack)	NES
 f12da591683afe725fbd7c31f6dcb96d943c1be1	H	Captain Tsubasa Vol. II - United Team (Hack)	NES
@@ -3413,8 +3413,8 @@ d78d1b5a76ba5e791ed37678b0099bfb51c69e09	H	Captain Tsubasa Vol. II by EricPonti
 fc72f4d7e9b57f86d30510db962162cee3d81ad7	H	Captain Tsubasa Vol. II by Farouk (Hack)	NES
 5278e84254d596732eabccb63f59133f98cbc700	H	Captain Tsubasa Vol. II by Greatsocrar (90807) (Hack)	NES
 84f25e8916f06b02034f0f2d1629f6a26c2f5db6	H	Captain Tsubasa Vol. II by Hambg (Hack)	NES
-19fdc8c7b290cc0b4baa05217c4003a26caff94c	H	Captain Tsubasa Vol. II by Kral89 & Sisqo (101003) (Hack)	NES
-ece3a2266a8274efcae34d605821c526573418a8	H	Captain Tsubasa Vol. II by Kral89 & Sisqo (90824) (Hack)	NES
+19fdc8c7b290cc0b4baa05217c4003a26caff94c	H	Captain Tsubasa Vol. II by Kral89 & Sisqo (101003) (Hack)	NES
+ece3a2266a8274efcae34d605821c526573418a8	H	Captain Tsubasa Vol. II by Kral89 & Sisqo (90824) (Hack)	NES
 509f6256210049d730719f86852393dd51459352	H	Captain Tsubasa Vol. II by RUI (V071103) (Hack)	NES
 5723575f7f28cac92ea1b620eec3f5e5c0769d37	H	Captain Tsubasa Vol. II by Shinigami (120419) (Hack)	NES
 f895c25e330122f9d848bc3c19dbec92c0fa6a9c	H	Captain Tsubasa Vol. II by Xiangfuxi (081104) (Hack)	NES
@@ -3828,12 +3828,12 @@ f53c5c4f9e6b3d0bdb9960157aef5deba002c8f7	U	Chinese Character Demo (PD)	NES
 4f68fe97f00351696f83fb6a4b1ad868474316e9	G	Chinese Checkers (Sachen-JAP) [U][!].unf	NES
 6662918d3ca6b789b71b7dffd0288d04edeb617a	G	Chinese Checkers (Sachen-USA) [!]	NES
 a58b71b4b9ff14be13f3539405b23bccbca93b69	G	Chinese Checkers (Sachen-USA) [U][!].unf	NES
-0db90c9ca321bb3accc6e376cab46018d934e149	G	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][!]	NES
-f874f6cceea1b5bfb950ae05e636238550c8b5f0	U	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][a1]	NES
-711ce9a3c6672fc26f5d3715fd6b240a1c2c2d42	U	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][a2]	NES
-9137af6f4a6da817eb5fd40ff4d5bdc9899151d5	B	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][o1]	NES
-9bc93a75bd86efa25173dc0190cb22f70f897890	T	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][T+Rus_Cool-Spot]	NES
-0b3ae3706a2038e6396cddd64c1a5f66f3db4634	T	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][T+Rus_Paha13]	NES
+0db90c9ca321bb3accc6e376cab46018d934e149	G	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][!]	NES
+f874f6cceea1b5bfb950ae05e636238550c8b5f0	U	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][a1]	NES
+711ce9a3c6672fc26f5d3715fd6b240a1c2c2d42	U	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][a2]	NES
+9137af6f4a6da817eb5fd40ff4d5bdc9899151d5	B	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][o1]	NES
+9bc93a75bd86efa25173dc0190cb22f70f897890	T	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][T+Rus_Cool-Spot]	NES
+0b3ae3706a2038e6396cddd64c1a5f66f3db4634	T	Chip & Dale 3 (Heavy Barrel) (Unl) [p1][T+Rus_Paha13]	NES
 0752c8fa49ef9ca6828ba2e08b22f2a673e5469c	G	Chip 'n Dale Rescue Rangers (E) [!]	NES
 93140bf336c482ec8bbec50fcd586a2889830e6b	T	Chip 'n Dale Rescue Rangers (E) [T+Fre100%_Terminus]	NES
 c16130b878cb7f4b799ba5eb373e066ac7e5b7d7	T	Chip 'n Dale Rescue Rangers (E) [T+Ger_TischlDeckDich]	NES
@@ -4008,10 +4008,10 @@ df432e5bd5c9afa1c91e7c76ff5e5521d136643d	U	Chu Chu Rocket V.d by DWEdit (PD)	NES
 d07c459890ae980bf2cd0ddfcb793ff9bdcbec74	U	Chu Chu Rocket V.h by DWEdit (PD)	NES
 681f4869dbee15da0f71d1ea6aca743b1acc787e	U	Chu Chu Rocket V.xx by DWEdit (PD)	NES
 828b78d6b479566b2e58c8764fcc8a8b08a1292f	U	Chu Da D (Ch)	NES
-d4f3b7146af41e6e6914002569d0952a00dd9a7c	U	Chu Han Zheng Ba - The War Between Chu & Han (Ch) (Wxn)	NES
-cc5f73da064f2d9960a4992b23c188e84fae7577	B	Chu Han Zheng Ba - The War Between Chu & Han (Ch) [b1]	NES
-1cf6a0e4337112405be96cad63a673d1193376dc	H	Chu Han Zheng Ba - The War Between Chu & Han (Ch) [f1]	NES
-3c7099746e8a9e63a6f2dcc86d1610944458a5fe	U	Chu Han Zheng Ba - The War Between Chu & Han (Ch)	NES
+d4f3b7146af41e6e6914002569d0952a00dd9a7c	U	Chu Han Zheng Ba - The War Between Chu & Han (Ch) (Wxn)	NES
+cc5f73da064f2d9960a4992b23c188e84fae7577	B	Chu Han Zheng Ba - The War Between Chu & Han (Ch) [b1]	NES
+1cf6a0e4337112405be96cad63a673d1193376dc	H	Chu Han Zheng Ba - The War Between Chu & Han (Ch) [f1]	NES
+3c7099746e8a9e63a6f2dcc86d1610944458a5fe	U	Chu Han Zheng Ba - The War Between Chu & Han (Ch)	NES
 8aeac2380737ada73c4b6e87f751751785e416bf	H	Chu Liu Xiang (Ch) (Wxn) [f1]	NES
 2abe3e855bc7d3ee0c38fd16f8d4fc387d3a991e	U	Chu Liu Xiang (Ch) (Wxn)	NES
 f69a7ff64f4f2c6f6ab89925b267e199152c00cd	U	Chu Liu Xiang (Ch)	NES
@@ -4517,7 +4517,7 @@ e283f529f23c1defcfdcf27b2eda4289f3c9d920	T	Cosmo Genesis (J) [T-Eng1.0_Aeon Gene
 fd3d9f8a6c862773194c3e23b420aabe9453d2d6	T	Cosmo Police Galivan (J) [T+Eng1.00_Jair]	NES
 6f38d0ada341f86f3055f689dd0f90c62556d91e	U	Cosmo Police Galivan (J)	NES
 ec493cbab694b87477ff240d3b86bca0c4e62451	G	Cosmos Cop (CN-08) (Unl) [!]	NES
-c4020f7aa09357974739e640673ef60af8386e21	H	Counteroffensive of Mamoru Izawa & Kazuki Sorimachi (Captain Tsubasa II Hack)	NES
+c4020f7aa09357974739e640673ef60af8386e21	H	Counteroffensive of Mamoru Izawa & Kazuki Sorimachi (Captain Tsubasa II Hack)	NES
 08c1a73e515cf5d3cc3573b6406a8ef351bc34f7	U	Cow Boy (Unl)	NES
 3f12e2ac5e074e7970735d896331bb7e5ef5bb73	G	Cowboy Kid (U) [!]	NES
 80eadde91d7172ef7694662aaaede874ecac7379	B	Cowboy Kid (U) [o1]	NES
@@ -5047,8 +5047,8 @@ eb9b77ea091d80f61a612f3b0a04fdc68ba2a23f	B	Dian Shi Ma Li (Ch) [b2]	NES
 fcfc928aecb25f3ee16dc42018b1c73d5283b5b4	B	Dian Shi Ma Li (Ch) [b2][o1]	NES
 4eccc37c236b3f18c308631c68c7b2ce1614d28c	B	Dian Shi Ma Li (Ch) [b3]	NES
 050671f45712f65fec84dc490214a6942a8c53ff	B	Dian Shi Ma Li (Ch) [p1]	NES
-1c3b08f68ebe4981b84c074520b96a42d3b45d79	B	Dick & Milk (Nuts & Milk Hack) [o1]	NES
-717328a839ca5aecc45cc1bdb48f5a0a87d913b9	H	Dick & Milk (Nuts & Milk Hack)	NES
+1c3b08f68ebe4981b84c074520b96a42d3b45d79	B	Dick & Milk (Nuts & Milk Hack) [o1]	NES
+717328a839ca5aecc45cc1bdb48f5a0a87d913b9	H	Dick & Milk (Nuts & Milk Hack)	NES
 6ac01a581a1fd6b74ed6092943bd63066e14dbf0	H	Dick Baseball (Baseball Hack)	NES
 29ecd49dc1a66ffc0a1abf9117a84a96a5f976a3	B	Dick Dug (Dig Dug Hack) [o1]	NES
 1cff27dd1346d2a068e56c26d0282a7773738fb9	B	Dick Dug (Dig Dug Hack) [o2]	NES
@@ -5257,11 +5257,11 @@ c26482ee39405d332aafcfff65fd378cbfd49cf6	T	Donkey Kong (W) (PRG1) [T+Nor1.00_Jus
 e745fda35e90bcbbe470fa62f5dfd9b7cadefa5a	T	Donkey Kong (W) (PRG1) [T+Rus_Cool-Spot]	NES
 037b98dffd8203777ec37a8acd54945f4baae3ae	T	Donkey Kong (W) (PRG1) [T+Spa_PaladinKnights]	NES
 7156d06e0e1cea71c71005aad8160939fa12efdf	H	Donkey Kong - Dendyman's Revenge (Hack)	NES
-b2ba46743405fd399e86b34211310805a17986b6	H	Donkey Kong 2 (Nuts & Milk Hack) [a1]	NES
-ea58fb27efbcc20f34ecb7781de299766b9ee76a	T	Donkey Kong 2 (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
-800163f4b72901412b6a1899c2ba13123375abfb	H	Donkey Kong 2 (Nuts & Milk Hack)	NES
-f0e1d4d624573b4f7be5273947871417d87cfe5a	T	Donkey Kong 2 Demo Ver.5 (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
-50b7580c05843cea716cf2624057df6bb9cfe061	H	Donkey Kong 2 Demo Ver.5 (Nuts & Milk Hack)	NES
+b2ba46743405fd399e86b34211310805a17986b6	H	Donkey Kong 2 (Nuts & Milk Hack) [a1]	NES
+ea58fb27efbcc20f34ecb7781de299766b9ee76a	T	Donkey Kong 2 (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
+800163f4b72901412b6a1899c2ba13123375abfb	H	Donkey Kong 2 (Nuts & Milk Hack)	NES
+f0e1d4d624573b4f7be5273947871417d87cfe5a	T	Donkey Kong 2 Demo Ver.5 (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
+50b7580c05843cea716cf2624057df6bb9cfe061	H	Donkey Kong 2 Demo Ver.5 (Nuts & Milk Hack)	NES
 c4e4062a91ea9fdbd575b77535bc7a4194e46694	U	Donkey Kong 3 (U) (GBA e-Reader)	NES
 2fdc5f68313f0fb619fa1f741cd517cc0cb18c56	T	Donkey Kong 3 (U) [T+Rus_Cool-Spot][a1]	NES
 ec6fa944c672a2522c8bc270a25842281c65ff5d	G	Donkey Kong 3 (W) [!]	NES
@@ -5446,7 +5446,7 @@ dd3490d98b8ced80263db9d17721e34dbf12db85	T	Double Dragon II - The Revenge (U) (P
 c46342b03cec7f9a895db964125760237340f116	H	Double Dragon II - The Revenge - Classic Strengthened Edition (Hack)	NES
 35844839991c094e86ab59205d5c0c29dda490f3	H	Double Dragon II - The Revenge - Clone of Bosses Edition (Hack)	NES
 a3c419051711233cd192405f14986059805626a4	H	Double Dragon II - The Revenge - Ultimate Strengthened Edition (Hack)	NES
-c19b034e5886c97da670b1381bb94dfa9873e96e	H	Double Dragon II - The Revenge by D.S.ghtMaster&KRIZAL (Hack)	NES
+c19b034e5886c97da670b1381bb94dfa9873e96e	H	Double Dragon II - The Revenge by D.S.ghtMaster&KRIZAL (Hack)	NES
 3a0fadff2b3beec2dc1f13b12eb7840af588aad7	H	Double Dragon II - The Revenge by KRIZAL (Hack)	NES
 dd37c6f3de1ceaed9a8bd1abcf9aafbf47b74059	H	Double Dragon II - The Revenge Control Hack by Evgeny (Hack)	NES
 9fca8eb7eb3a635ad71afa3e719aa5cd1ba9a7c3	H	Double Dragon III - Skip Level (Hack) [a1]	NES
@@ -5465,7 +5465,7 @@ f878cbd0d7065df4a4ca1733085f03955b64819f	C	Double Dragon III - The Rosetta Stone
 a0ccc44a8723ceb83a644c45fd6e724b4dadcb90	C	Double Dragon III - The Rosetta Stone (J) [t3]	NES
 9ad84eeb300efaf15a69955ffbc6d65dfc50f99c	H	Double Dragon III - The Rosetta Stone - Additional Moves by shinwa (Hack)	NES
 88d2150bac12098680e23e92be8f5de8869cc421	H	Double Dragon III - The Rosetta Stone - Bosses Usable Edition by shinwa (Hack)	NES
-f57e4ae9c12e05343b6dee3e4af21b2513971345	H	Double Dragon III - The Rosetta Stone - Combined Skill & Enemies Changed Edition (Hack)	NES
+f57e4ae9c12e05343b6dee3e4af21b2513971345	H	Double Dragon III - The Rosetta Stone - Combined Skill & Enemies Changed Edition (Hack)	NES
 2a88c78e830290d901a4010e5950f9149ab0db2d	H	Double Dragon III - The Rosetta Stone - Combined Skill Edition (Hack)	NES
 f2fdc2ae7491dec5c9980678645dbd9b65160709	H	Double Dragon III - The Rosetta Stone - Shuang Zai Long 3 by madcell (Hack)	NES
 a1da64a21156c537b75162f0b64da651eee1a6b8	H	Double Dragon III - The Rosetta Stone - Super Skill Edition (Hack)	NES
@@ -5995,7 +5995,7 @@ e81a4d42dd06ba171ef5e812623115b291f295b6	T	Dream Master (J) [T+Eng]	NES
 5a71c261b50146962940fbbd840be8617b47e07b	G	DreamGEAR 75-in-1 (Unl) [U][!].unf	NES
 907564f256368d67d9ce6b361896e7d375ad7589	U	Dreamworld Pogie (Prototype)	NES
 7525ca4bb891940d308164dee33c497d826c1960	H	Dreamworld Pogie Revival (Dreamworld Pogie Hack)	NES
-882a3686982874112af0d20875e3f7e9496a7392	U	Driar by Stefan Adolfsson & David Eriksson (PD)	NES
+882a3686982874112af0d20875e3f7e9496a7392	U	Driar by Stefan Adolfsson & David Eriksson (PD)	NES
 0cc28dc56c8ee9bb5114708b98348a592da9aec4	U	Dringle (Unl)	NES
 af8febe0ef1011e5838bf3c38933ecea06721042	U	Drip for NES Ported by quietust (2006-08-16) (PD) [U].unf	NES
 54261d0c387cd62161d5a0ad4cff9b0d3f48c3c7	U	Drip for NES Ported by quietust (2006-10) (PD) [U].unf	NES
@@ -6089,9 +6089,9 @@ bfcf258c012d2369ec581038abae2021f147f531	U	Duel, The by Bokudono (PD)	NES
 d6c42a64492dd75bf31b07fd8f0dba421b30ba99	B	Dumbass (PD) [b1]	NES
 19af20fc254fe8ff443f7db8d4461b7d71dee0cf	U	Dune War (Unl) (VT03)	NES
 26b782d3f6d080bb0fb0cbd236be3d0e7ad174b2	U	Dung Dung No 1 (Ch)	NES
-04295f33c9555d4694c57aa6423dbe1466b98836	G	Dungeon & Magic - Swords of Element (J) [!]	NES
-d8054f63f849e6b01497450d763867ba43423a26	B	Dungeon & Magic - Swords of Element (J) [b1]	NES
-f4b42da49b97bf4d93fde1016602087fe5c5b0cb	B	Dungeon & Magic - Swords of Element (J) [o1]	NES
+04295f33c9555d4694c57aa6423dbe1466b98836	G	Dungeon & Magic - Swords of Element (J) [!]	NES
+d8054f63f849e6b01497450d763867ba43423a26	B	Dungeon & Magic - Swords of Element (J) [b1]	NES
+f4b42da49b97bf4d93fde1016602087fe5c5b0cb	B	Dungeon & Magic - Swords of Element (J) [o1]	NES
 427506826bf9cf2ef144100be2e3f98d9e979798	G	Dungeon Kid (J) [!]	NES
 602ca2cada36025c04562dc174f7ceca284885b3	B	Dungeon Kid (J) [b1]	NES
 d8519092cf52b7a4f0fc94a9829ada12681c0279	C	Dungeon Kid (J) [t1]	NES
@@ -6219,8 +6219,8 @@ c4085b7a4aabd8ac27fdc2b647715d451a2bc04a	B	Eliminator Boat Duel (U) [b1]	NES
 d0ef1150ab6cdcb076a528cf2b18a780864d4bb3	B	Eliminator Boat Duel (U) [o1]	NES
 00009ecaf75344e39cc9a94805f5113c10f270a2	B	Eliminator Boat Duel (U) [o2]	NES
 02b277caef0970078dfb3f2dbb7ced731380ecfd	G	Elite (E) [!]	NES
-aa3b7bbb929efd9c2b364e63000ccb1cc107c2a0	B	Elite (E) [f1] (NTSC by Ian Bell & David Braben) [o1]	NES
-17c4f91469931ea309bfff4faba3f3c34deed3c7	H	Elite (E) [f1] (NTSC by Ian Bell & David Braben)	NES
+aa3b7bbb929efd9c2b364e63000ccb1cc107c2a0	B	Elite (E) [f1] (NTSC by Ian Bell & David Braben) [o1]	NES
+17c4f91469931ea309bfff4faba3f3c34deed3c7	H	Elite (E) [f1] (NTSC by Ian Bell & David Braben)	NES
 092849f8d75ac1206f63bb82e43c4f670fb8eed1	H	Elite Tecmo League (Tecmo Super Bowl Hack)	NES
 4d4faac62a455dfa8ada73480e6c67906b3957e1	H	Elite Tecmo League Clock (Tecmo Super Bowl Hack)	NES
 8bb770863ccded715de87dbccbf26e36c8363572	H	Elite Tecmo League S1 Week 03 (Tecmo Super Bowl Hack)	NES
@@ -6261,7 +6261,7 @@ f59d7b0cf20d9abaf6a7b7f1b66744ea55f9d2fa	G	Erika to Satoru no Yume Bouken (J) [!
 c42a1191d0292f208873e0e1ab122d7354c7925e	H	Erika to Satoru no Yume Bouken (J) [f1]	NES
 222ac701664930f295da954393e8eb9376017f33	B	Erika to Satoru no Yume Bouken (J) [f1][o1]	NES
 bc59e706bc0cda456e496b2403a41df61eebfdbb	B	Erika to Satoru no Yume Bouken (J) [hM04][b1]	NES
-00222d1ea57c7ee4bb614536642d03f02cbca769	H	Ernie & The Muppets Take It All Off (Sesame Street ABC Hack)	NES
+00222d1ea57c7ee4bb614536642d03f02cbca769	H	Ernie & The Muppets Take It All Off (Sesame Street ABC Hack)	NES
 4f4355afcfde87e651c32eda7610d67c02396ff8	G	Erunaaku no Zaihou (J) [!]	NES
 aff3198813f2e25c9684b63354f1da6bdf2d7c6d	B	Erunaaku no Zaihou (J) [b1]	NES
 8d68935e94134eec22a4259080b3ce5590e4f7a3	B	Erunaaku no Zaihou (J) [b2]	NES
@@ -6419,7 +6419,7 @@ a0375e7e0da9093417a9d081b7606ed9f5c71ac3	B	F-15 Strike Eagle (U) [o1]	NES
 96ab957763051c6b8d952567450469c9af99e3d4	B	F22 (Ch) [b1]	NES
 63c23c5bb78d256a0361e7a7a0ffb24d8c87cc11	T	Facemaker (Dr. PC Jr.) (Ch) [T+Rus_Cool-Spot]	NES
 dc8fde977a5a06d579f80d0861b235014b678a53	U	Facemaker (Dr. PC Jr.) (Ch)	NES
-ea97d054a53c65428d1c1ee27c2fc5c945944843	U	Fade to Black by Frederik Schultz & Morgan Johansson (PD)	NES
+ea97d054a53c65428d1c1ee27c2fc5c945944843	U	Fade to Black by Frederik Schultz & Morgan Johansson (PD)	NES
 9f3d83c3b6e620d9e67cf5cd49428c3f88a71ca4	H	Fall of the Moon v1.0 (Zelda Hack)	NES
 508dfa36b062dfd1a465301ada3a876acc402582	U	Falldown by Sivak (2008) (PD)	NES
 45543a0aed48f5d0943a8ee33ea8a9709c3bfa3d	H	Falling Mario by WA (SMB1 Hack)	NES
@@ -6441,7 +6441,7 @@ f07d48f7355480f855a60d0e8c65621f4e4c643d	H	Famicom Jump II - Saikyou no 7 Nin (J
 9c5381325383bf6c074b2c3cdcc825e138615a19	G	Famicom Meijin Sen (J) [!]	NES
 44c1d079b75deeb3e858240a0d4a10d5d7add87c	U	Famicom Meijin Sen (J) [a1]	NES
 aaf74b17bfe8c18fd672fcae18741956d1c3380e	B	Famicom Meijin Sen (J) [a1][o1]	NES
-6992f115820264ceaaff988cb4bfbe3c5e35ecc9	U	Famicom Pro Action Rocky Encoder-Decoder by Chris Covell, ReaperSMS & Jamethiel (PD)	NES
+6992f115820264ceaaff988cb4bfbe3c5e35ecc9	U	Famicom Pro Action Rocky Encoder-Decoder by Chris Covell, ReaperSMS & Jamethiel (PD)	NES
 21727912fe4ae683da2c7aadb029f355079964fd	U	Famicom Sequencer V0.5 (PD)	NES
 052e6915a4b6c15982d5b134fce7581210c7d8de	U	Famicom Shougi - Ryuuousen (J) (Prototype)	NES
 e4cc5f8e013fae686d97f3901c261b5abfcc9d5b	B	Famicom Shougi - Ryuuousen (J) [o1]	NES
@@ -6580,10 +6580,10 @@ a3d852930db34bb76c1ac1531311dd5552b8e7be	G	Fantasy Zone (Tengen) [!]	NES
 96aca644fb0450542d35573e99afdd1534f8191f	H	Fantasy Zone 2 - The Teardrop of Opa-Opa (J) [hFFE]	NES
 7b7b333f5f4da08f523256518b5244006c994090	B	Fantasy Zone 2 - The Teardrop of Opa-Opa (J) [o1]	NES
 808cc9050dcee35fa499d601e8567166bda4493a	C	Fantasy Zone 2 - The Teardrop of Opa-Opa (J) [t1]	NES
-2841d46704680033b183c7c07945dbbcb68427ed	G	Faria - A World of Mystery & Danger! (U) [!]	NES
-b9350d2ca19c4185b8cb32ffa5e51b114a5702fc	B	Faria - A World of Mystery & Danger! (U) [b1]	NES
-6129ba26219de2586562234e8f16a29ad6c586db	B	Faria - A World of Mystery & Danger! (U) [o1]	NES
-24027380173f2004a44870c8fee3eb9dd1027d76	C	Faria - A World of Mystery & Danger! (U) [t1]	NES
+2841d46704680033b183c7c07945dbbcb68427ed	G	Faria - A World of Mystery & Danger! (U) [!]	NES
+b9350d2ca19c4185b8cb32ffa5e51b114a5702fc	B	Faria - A World of Mystery & Danger! (U) [b1]	NES
+6129ba26219de2586562234e8f16a29ad6c586db	B	Faria - A World of Mystery & Danger! (U) [o1]	NES
+24027380173f2004a44870c8fee3eb9dd1027d76	C	Faria - A World of Mystery & Danger! (U) [t1]	NES
 e7fdd7976a9c834f171b3ac39ab69259e05a0afa	G	Faria - Fuuin no Tsurugi (J) [!]	NES
 d87116e7aee1b8fac894b30b4aaa50539aaedab9	B	Faria - Fuuin no Tsurugi (J) [b1]	NES
 2235a01f54223dd2609cef3dc3dc82b7775b9bfb	B	Faria - Fuuin no Tsurugi (J) [b2]	NES
@@ -6631,7 +6631,7 @@ e86add4e0badb9396c18bbc2b786b08a044dd83d	H	Faxanadu Uncensored Edition by Safari
 0db354cc152ff3413e401160d5f51871326628aa	C	FC Genjin - Freakthoropus Computerus (J) [t1]	NES
 99e513dba565f5b4f648bc0a1a0f52aff5a48946	U	FC Genjin - Freakthoropus Computerus (J)	NES
 99d5f61fc8fda02db984308368277a326c123977	U	FC Intro by emumax (PD)	NES
-416b236dd5babc127555185e15a22f70e718186e	U	FC WIN2000 (for Infrared Mouse & Keyboard) (Ch)	NES
+416b236dd5babc127555185e15a22f70e718186e	U	FC WIN2000 (for Infrared Mouse & Keyboard) (Ch)	NES
 07252ffa0df0f65d681e79ab2ba38250ec85c08b	U	FC-Subor V3.0 Music Demo (Unl)	NES
 e0d0eaaf0523d3442072134667198ea5ee342934	H	Fedsvd MLB (R.B.I. Baseball Hack) [a1]	NES
 6411512f09c63c6679c258b9c8cbd87791581f1f	H	Fedsvd MLB (R.B.I. Baseball Hack)	NES
@@ -6664,7 +6664,7 @@ c2add8e26655ba9b6774197dc1a6e730f0a92c0b	U	Feng Se Huan Xiang (ES-1138) (Ch)	NES
 083793f71533db327cbcbe0ae27d4a1483733777	U	Feng Yun (Ch) (Decrypted)	NES
 1a0ced71e62f11bccb4b2de3fe0433240e75357b	U	Feng Yun (Ch) (Wxn)	NES
 ea0d9f0df87a2c5b518642bb793d67b544ae5165	U	Feng Yun (Ch)	NES
-8008cd3ff792a2c7e5e34c34543394d6ffbf48b5	U	Fengli Dance 12-in-1 & 24-in-1 (Ch)	NES
+8008cd3ff792a2c7e5e34c34543394d6ffbf48b5	U	Fengli Dance 12-in-1 & 24-in-1 (Ch)	NES
 1f3c590a05e3897f4266302f744dd65e70e501b0	G	Ferrari - Grand Prix Challenge (E) [!]	NES
 146e39e962c6fff24724fe55d632ba4217cc3b67	G	Ferrari - Grand Prix Challenge (J) [!]	NES
 bee319db995fc25dd6ee88217e10420aab7310ca	G	Ferrari - Grand Prix Challenge (U) [!]	NES
@@ -6829,13 +6829,13 @@ b0f164556d8cb71b2c04bd7d9d306c0e7c026772	H	Final Fantasy Epica V2.0 by Clomax Do
 edafdca67ae322a086386b219d67c526de592f73	H	Final Fantasy Gaiden (FF1 Hack)	NES
 083294dfaa5238c750110ce0d95b57ebcd9c9ce6	H	Final Fantasy Hard Type by Red Wizard (FF1 Hack)	NES
 5b46b541851eefc0954bd7f15ef860dc43bf1fac	H	Final Fantasy Hardtype V1.1 (FF1 Hack)	NES
-4b22c2c88fc71eacf270ea51ef218944bb4c536a	G	Final Fantasy I & II (J) [!]	NES
-b3c2be46b4118df618a90969aec3836c36213187	B	Final Fantasy I & II (J) [b1]	NES
-f68f71e3475a0d2a3455eb4ea55aa7c6b4989329	B	Final Fantasy I & II (J) [b2]	NES
-e0a971450a7907f8e5ac1749638d03800c371cce	B	Final Fantasy I & II (J) [o1]	NES
-5c86afaee19c4d564be583d19639af9e3308a6c6	B	Final Fantasy I & II (J) [o1][T+Eng1.00_Demiforce]	NES
-704d46eb311a7d07268ea57de26cdacc3a83711a	T	Final Fantasy I & II (J) [T+Eng1.00_Demiforce,Grond]	NES
-ff5a216e3da57ee7133449a4ac6b0e8957a23595	T	Final Fantasy I & II (J) [T+Eng1.00_Demiforce]	NES
+4b22c2c88fc71eacf270ea51ef218944bb4c536a	G	Final Fantasy I & II (J) [!]	NES
+b3c2be46b4118df618a90969aec3836c36213187	B	Final Fantasy I & II (J) [b1]	NES
+f68f71e3475a0d2a3455eb4ea55aa7c6b4989329	B	Final Fantasy I & II (J) [b2]	NES
+e0a971450a7907f8e5ac1749638d03800c371cce	B	Final Fantasy I & II (J) [o1]	NES
+5c86afaee19c4d564be583d19639af9e3308a6c6	B	Final Fantasy I & II (J) [o1][T+Eng1.00_Demiforce]	NES
+704d46eb311a7d07268ea57de26cdacc3a83711a	T	Final Fantasy I & II (J) [T+Eng1.00_Demiforce,Grond]	NES
+ff5a216e3da57ee7133449a4ac6b0e8957a23595	T	Final Fantasy I & II (J) [T+Eng1.00_Demiforce]	NES
 ae373debd5a1d787eec28214c221fa4590c20844	U	Final Fantasy II (J) (VC)	NES
 1a9e01a29472f1161bd16e1b4d76994346a505f6	G	Final Fantasy II (J) [!]	NES
 de129faa757050a925e5060f65bdc390d3978eb4	H	Final Fantasy II (J) [hM02]	NES
@@ -6876,7 +6876,7 @@ ddc7b6b85ab0eaf26586d5a97aaa04c3620c2d1e	H	Final Fantasy II (J) [hM02][T-Eng1.0]
 20079a629ff38fb2e76cf3a6e78c782588c890ef	T	Final Fantasy II (J) [T+Bra100%_Thirteen Traducoes]	NES
 90a5ccc3119aa91947f086c3c9fc069a7f80ef09	T	Final Fantasy II (J) [T+Eng0.36_Toma,AlanMidas]	NES
 62ed16088e5293a9f238161c12fe59eaa196f1f8	T	Final Fantasy II (J) [T+Eng1.03_Demiforce]	NES
-b7a849df213b59cd43066d15eeec4df983c0b5f5	T	Final Fantasy II (J) [T+Eng1.03_Demiforce][f1] (Title & Weapon-Magic Exploit by Parasyte)	NES
+b7a849df213b59cd43066d15eeec4df983c0b5f5	T	Final Fantasy II (J) [T+Eng1.03_Demiforce][f1] (Title & Weapon-Magic Exploit by Parasyte)	NES
 de7fecb42947a24fbf632e2ccfccbdba69a857fb	T	Final Fantasy II (J) [T+Eng1.03_Demiforce][f1] (Title by Parasyte v1.0)	NES
 73f8436f78cec36f4d205a2dc5cc25fe949efc22	T	Final Fantasy II (J) [T+Eng1.03PasoFami_Demiforce]	NES
 4e68ee5da3dbe2ed7348be072825364c87d2ab6a	T	Final Fantasy II (J) [T+Ita0.99a_Weapon Hunter]	NES
@@ -7085,7 +7085,7 @@ b7b3054034234ffaea975e4158f32f0f6bd12721	B	Fire Emblem Gaiden (J) [T+Eng97b2_J2E
 de04536e3fa70d9dbccf62e0dc2e58bf02ac94f4	H	Fire Emblem Gaiden by jibo818 (070502) (Hack)	NES
 ead6701e3998cd7f81c8e8fccd1bb12a0bd90169	H	Fire Emblem Gaiden by Lewis GT (070806) (Hack)	NES
 d0c52c96c29dd6144215e63047b39972982894d1	H	Fire Emblem Gaiden by scorpioywk v3.0a (Hack)	NES
-44b79228f44efc9acf9f878a08e8d8493c311ca7	H	Fire Emblem Map & Enemy by One Talent (Hack)	NES
+44b79228f44efc9acf9f878a08e8d8493c311ca7	H	Fire Emblem Map & Enemy by One Talent (Hack)	NES
 209f7ca3f4f9e179881aa9387dc6ad5dea4f4575	B	Fire Emblem Two Dragon Edition (Hack) [b1]	NES
 efa0e83b2bcb0f02fc81fc7b434ffe56209d3d67	H	Fire Emblem Two Dragon Edition (Hack)	NES
 85438df235e84b38452282aa2f96624f31986b59	B	Fire Flight Z (Formation Z Hack) [o1]	NES
@@ -7127,17 +7127,17 @@ c212375ac4a48de955e608af2ccc9cd36cc040fe	T	Fleet Commander (J) [T+Rus_Chief-Net]
 18e4116d04aa688a8a8629f3b6770ec8436d2778	G	Flight of the Intruder (U) [!]	NES
 425d371df518c142c9dfc9764e02ac53ada94d0e	B	Flight of the Intruder (U) [b1]	NES
 b823ee04d31bdf6937ddfc3a1e81f2fa8ea3cf2f	B	Flight of the Intruder (U) [o1]	NES
-9695b227545fca9cd6c95abf348ff51b175634f6	G	Flintstones, The - The Rescue of Dino & Hoppy (E) [!]	NES
-66b701bcf13ea261cf459058d141f078fc66652c	C	Flintstones, The - The Rescue of Dino & Hoppy (E) [t1]	NES
-9d1ba8a9cb5afe378bf4cdf94dee5eecd80ccf6b	U	Flintstones, The - The Rescue of Dino & Hoppy (J)	NES
-549de66388ff02e33a40bf7ef83e207f98a50888	G	Flintstones, The - The Rescue of Dino & Hoppy (U) [!]	NES
-db9f7f37cac7a00752beffe5a14c295f1722823e	B	Flintstones, The - The Rescue of Dino & Hoppy (U) [b1]	NES
-c0a6a7cbf5de4451aed7f5f8fe6b67df97c4c11b	B	Flintstones, The - The Rescue of Dino & Hoppy (U) [b2]	NES
-18c335127d0338318ac04d43b6ee434623db761c	B	Flintstones, The - The Rescue of Dino & Hoppy (U) [o1]	NES
-805737b473814baeeaf98bdacd2de810dae5c8e5	G	Flintstones, The - The Rescue of Dino & Hoppy (U) [p1][!]	NES
-ad651e65a9e7333a415f1071f0783a3f4ea53218	B	Flintstones, The - The Rescue of Dino & Hoppy (U) [p2]	NES
-deb230107c87863a7226d4466470aa5b824d6d0c	C	Flintstones, The - The Rescue of Dino & Hoppy (U) [t1]	NES
-4c2199ab578faf2cb1f244e5a562ecc0918f27ca	C	Flintstones, The - The Rescue of Dino & Hoppy (U) [t2]	NES
+9695b227545fca9cd6c95abf348ff51b175634f6	G	Flintstones, The - The Rescue of Dino & Hoppy (E) [!]	NES
+66b701bcf13ea261cf459058d141f078fc66652c	C	Flintstones, The - The Rescue of Dino & Hoppy (E) [t1]	NES
+9d1ba8a9cb5afe378bf4cdf94dee5eecd80ccf6b	U	Flintstones, The - The Rescue of Dino & Hoppy (J)	NES
+549de66388ff02e33a40bf7ef83e207f98a50888	G	Flintstones, The - The Rescue of Dino & Hoppy (U) [!]	NES
+db9f7f37cac7a00752beffe5a14c295f1722823e	B	Flintstones, The - The Rescue of Dino & Hoppy (U) [b1]	NES
+c0a6a7cbf5de4451aed7f5f8fe6b67df97c4c11b	B	Flintstones, The - The Rescue of Dino & Hoppy (U) [b2]	NES
+18c335127d0338318ac04d43b6ee434623db761c	B	Flintstones, The - The Rescue of Dino & Hoppy (U) [o1]	NES
+805737b473814baeeaf98bdacd2de810dae5c8e5	G	Flintstones, The - The Rescue of Dino & Hoppy (U) [p1][!]	NES
+ad651e65a9e7333a415f1071f0783a3f4ea53218	B	Flintstones, The - The Rescue of Dino & Hoppy (U) [p2]	NES
+deb230107c87863a7226d4466470aa5b824d6d0c	C	Flintstones, The - The Rescue of Dino & Hoppy (U) [t1]	NES
+4c2199ab578faf2cb1f244e5a562ecc0918f27ca	C	Flintstones, The - The Rescue of Dino & Hoppy (U) [t2]	NES
 354415e5472c4cbf4978744c97a9a53c6b61cb49	G	Flintstones, The - The Surprise at Dinosaur Peak! (E) [!]	NES
 5a6ae3e6897414758a8791783f3a482e5a2dd0fb	G	Flintstones, The - The Surprise at Dinosaur Peak! (U) [!]	NES
 a3bdfaa4d67de0f1468d9fe701a8988e2e732744	B	Flintstones, The - The Surprise at Dinosaur Peak! (U) [o1]	NES
@@ -7284,9 +7284,9 @@ ff9ba69080f51331a10df9c2f7531ab5a9a34e58	B	Front Line (J) [T-Chi][b1]	NES
 2b257fa8049678600b4db8461b56bfceee1056aa	H	Front Line 2 Hardcore (Front Line Hack)	NES
 a9966b9065b29defc48a2566136b634f74dd31e7	U	FS Demo by KZ-S (PD)	NES
 3759f6d43be742defb5b52117e5378645332c816	H	Fucked Up Bros 2 (SMB2 Hack)	NES
-0bc48f6ceee853de3535bb49227415e5d817ba0e	H	Fucked Up North & South (Hack)	NES
+0bc48f6ceee853de3535bb49227415e5d817ba0e	H	Fucked Up North & South (Hack)	NES
 794d30faa4ba81046405f3c6599b73c3a297b2ad	H	Fucker's Quest by Shitdic (Fester's Quest Hack)	NES
-b346af0a6ef44db9e251ed18a3925f8396868496	H	Fudan Mario by DU-6&Hi (SMB1 Hack)	NES
+b346af0a6ef44db9e251ed18a3925f8396868496	H	Fudan Mario by DU-6&Hi (SMB1 Hack)	NES
 1ae0646964ad522f78427d5f29401b197020a4df	G	Fudou Myouou Den (J) [!]	NES
 54f3061ca2ccc87342d44cec098a4c07d530d6ce	B	Fudou Myouou Den (J) [hFFE][b1]	NES
 056280af7a109617d1f0d21e228dcb9dbe394693	H	Fudou Myouou Den (J) [hM80]	NES
@@ -7525,8 +7525,8 @@ c6954c8d5030bd3f446644e2a02b3135d3bbff93	B	Garou Densetsu Special (Unl) [hM04][b
 fe0d1d3f7662bcba4c550440696d6fb24b3181a9	B	Garou Densetsu Special (Unl) [hM04][b5]	NES
 aec04b867e7de8dc7ace8563bd693b9199c4a33a	H	Garou Densetsu Special (Unl) [hM04][f1]	NES
 de38a34367495ff5e899b574e15495f78a5e5678	U	Garou Densetsu Special (Unl)	NES
-7f95489c35713f1befb5bfbfc6a51b523eaa1b50	T	Gary's Nuts (J) (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
-468e874670c5b8e7db979db02d5eb5d4bae256a4	H	Gary's Nuts (J) (Nuts & Milk Hack)	NES
+7f95489c35713f1befb5bfbfc6a51b523eaa1b50	T	Gary's Nuts (J) (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
+468e874670c5b8e7db979db02d5eb5d4bae256a4	H	Gary's Nuts (J) (Nuts & Milk Hack)	NES
 b5a669ea96249a23ca3b868ac1c7555e611ee83b	U	Gauntlet (PC10)	NES
 d3a2ad975e2e955e39fb3fd64e93ff983af81e0d	G	Gauntlet (Tengen) [!]	NES
 debb19b46939a296bad008cffbb3bb0f8d6608d3	B	Gauntlet (Tengen) [b1]	NES
@@ -7978,7 +7978,7 @@ bc39a2546b530fc84e90052d4077676da97ed679	T	Grand Master (J) [T-Eng_Stardust Crus
 aa0fb9dd052ee687ff02ed2713ed92a3887e76f0	U	Grand Master (J)	NES
 0f01b092ce5d02d5c6e3ea553290a06c8281ee24	U	Grandia (Ch) (Wxn)	NES
 8bcdc14b93f52cd4a657c18fee21cdc4ed6298a1	H	Graros (Seicross Hack)	NES
-f5d968639bb462819500cb33a3644487f177740b	U	Grave Digger by Tarnow, Hollis, Gillotti & Subramanian (PD)	NES
+f5d968639bb462819500cb33a3644487f177740b	U	Grave Digger by Tarnow, Hollis, Gillotti & Subramanian (PD)	NES
 d0da677def74b64e1b2d25748e2bce691566c4b0	B	Great Adventures of Weiny, The (Mario Bros Hack) [o1]	NES
 b0b0a350e4360fb03cf536c961f2f4fa68f98dbf	H	Great Adventures of Weiny, The (Mario Bros Hack)	NES
 a55e9323d89d855672dcb20dc29efd2f53ded972	G	Great Battle Cyber (J) [!]	NES
@@ -8019,9 +8019,9 @@ e327e3e3814f0ea008d347eeee1b72e378abb857	B	Gremlins 2 - The New Batch (U) [b1]	N
 abc3dfd1cc1fab09eb5edb6223570a26f974c9e8	C	Gremlins 2 - The New Batch (U) [t1]	NES
 34eea8840f666fca69d85f6dfa5fdf77a297b3b3	U	Greys Demo by Chris Covell (PD)	NES
 3b3dea215ac51563b049f9f5a643bc1e5e88c8aa	H	Grond's Final Fantasy (FF1 Hack)	NES
-3d1098ccc2250e8e007170d2143112d61f348a31	H	Grond's Final Fantasy Bugfix & Balancing (FF1 Hack) [a1]	NES
-076003fdac7b73059f8e45c9d9f8ae5a04af5c9c	H	Grond's Final Fantasy Bugfix & Balancing (FF1 Hack)	NES
-1e18667e99767f3ab6acf54b685986b230696722	H	Grond's Final Fantasy Bugfix & Balancing (v1.1) (FF1 Hack)	NES
+3d1098ccc2250e8e007170d2143112d61f348a31	H	Grond's Final Fantasy Bugfix & Balancing (FF1 Hack) [a1]	NES
+076003fdac7b73059f8e45c9d9f8ae5a04af5c9c	H	Grond's Final Fantasy Bugfix & Balancing (FF1 Hack)	NES
+1e18667e99767f3ab6acf54b685986b230696722	H	Grond's Final Fantasy Bugfix & Balancing (v1.1) (FF1 Hack)	NES
 0828f94fedee148987ac3cfa4a270d26306bc6b0	U	GSD Super Student Computer Cartridge (Ch)	NES
 f8229677bfad4050a24bfb9a78521a6e36d3cac4	G	Gu Ba Zhan Shi Xi Hua (Ch) [!]	NES
 bd147f4eeafe37d73524a0d0a6735a422376e482	U	Gu Ba Zhan Shi Xi Hua (Ch) [a1]	NES
@@ -8203,7 +8203,7 @@ e545041ff87271f56f975d73d7b772d37f06d2bb	H	Hanjuku Eiyuu (J) [hM02]	NES
 810a86d04016eeba01cdc826f80babb86619b8d7	H	Hanjuku Eiyuu (J) [hM02][a1]	NES
 e7305030fe0261de587b16c85a0acab9386bc858	B	Hanjuku Eiyuu (J) [o1]	NES
 11777a01cdb2d242233742d4a302c1af51f759e4	H	Hanjuku Eiyuu by fenglianxilin (070808) (Hack)	NES
-fbb406a103e79df26ac4ef208b7f9df16006ee44	H	Hansel & Gretel (SMB1 Hack)	NES
+fbb406a103e79df26ac4ef208b7f9df16006ee44	H	Hansel & Gretel (SMB1 Hack)	NES
 9be59e3c120046c2b9e68bb5f25d21f1b2dc8386	U	Happy Angel Legend (Unl)	NES
 9a07441300f5f13898f777020fe8cb04361d3ca6	H	Happy Birthday - BMF x 28 (SMB1 Hack)	NES
 65855650819327782bce279dbaea220090deeb6e	G	Happy Birthday Bugs (J) [!]	NES
@@ -9118,10 +9118,10 @@ af45f13c326ce6e8b5e29eb583faf5d9a74349b7	B	Iron Tank - The Invasion of Normandy
 3b4a5cb92fc0df0cb8e6fb4528a5414004005116	B	Iron Tank - The Invasion of Normandy (U) [o2]	NES
 f745f07efda10a0c685f693df47ed8b15b3aa458	C	Iron Tank - The Invasion of Normandy (U) [t1]	NES
 c8c011ab830e9aefd2c6335a40857fda48186356	C	Iron Tank - The Invasion of Normandy (U) [t2]	NES
-bf7b26e28cecc6a46131971210bfb10123ab9dab	G	Ironsword - Wizards & Warriors II (E) [!]	NES
-97b79e432f62403fb9f877090850c41112a9a168	G	Ironsword - Wizards & Warriors II (U) [!]	NES
-cdc3da09fdd4478b5c8f1640ea26604cdf096a62	B	Ironsword - Wizards & Warriors II (U) [b1]	NES
-84f6af51c04d27e877480bc9136d4c0401bb2461	B	Ironsword - Wizards & Warriors II (U) [o1]	NES
+bf7b26e28cecc6a46131971210bfb10123ab9dab	G	Ironsword - Wizards & Warriors II (E) [!]	NES
+97b79e432f62403fb9f877090850c41112a9a168	G	Ironsword - Wizards & Warriors II (U) [!]	NES
+cdc3da09fdd4478b5c8f1640ea26604cdf096a62	B	Ironsword - Wizards & Warriors II (U) [b1]	NES
+84f6af51c04d27e877480bc9136d4c0401bb2461	B	Ironsword - Wizards & Warriors II (U) [o1]	NES
 5d9402702b33d226e822dd4a39b9004dcd90b787	U	IRQ Flag Operation Test by Shay Green (30 Jun 2005) (PD)	NES
 7fbd5c094f63d8d0ad9cfb0730e809875bcdace6	U	IRQ Flag Timing Test by Shay Green (30 Jun 2005) (PD)	NES
 5b87d2e908ae68348ccb306764ac7ec9067395e3	U	IRQ Handler Test by Shay Green (30 Jun 2005) (PD)	NES
@@ -9390,15 +9390,15 @@ e54091563b9f39863a93f8c0260b3b5518628576	T	JJ - Tobidase Daisakusen Part 2 (J) [
 f19a702eefcb6467176916a6f612974dcba0fb19	T	JJ - Tobidase Daisakusen Part 2 (J) [T+Rus]	NES
 6c2aee3bfe22bdbcab6f707720b3675c2d439c42	T	JJ - Tobidase Daisakusen Part 2 (J) [T+Rus][t1]	NES
 90dd8e45ade16e684489d34343856b6a0b8dac26	C	JJ - Tobidase Daisakusen Part 2 (J) [t1]	NES
-935a56567d1e8516c104ead5e9ecbc6d8e9b0a1f	G	Joe & Mac - Caveman Ninja (E) [!]	NES
-36bafdf6f8d531fecb3553c1923eeafac4a05c28	G	Joe & Mac - Caveman Ninja (U) [!]	NES
-79a02ad09b776734e9e341d91137e989ea482f8e	B	Joe & Mac - Caveman Ninja (U) [b1]	NES
-6edbe6c00f8246a1f8c1a6fa543e9e2e83ea666e	B	Joe & Mac - Caveman Ninja (U) [o1]	NES
-e3b06ee583b47c55b5a1c9354482a27ad2cfbfde	G	Joe & Mac - Caveman Ninja (U) [p1][!]	NES
-bcf23b47befc698b9c8e1c2e1aa48529ac6ecf06	B	Joe & Mac - Caveman Ninja (U) [p2]	NES
-ef454083c6720b6f0a541257eb9a41758f27746c	B	Joe & Mac - Caveman Ninja (U) [p3]	NES
-f8139f01b7c3ca2b14cefec784ae64781c8f956d	C	Joe & Mac - Caveman Ninja (U) [t1] (No Time)	NES
-9031b847c51320960655849c750f027b20d05a80	C	Joe & Mac - Caveman Ninja (U) [t2]	NES
+935a56567d1e8516c104ead5e9ecbc6d8e9b0a1f	G	Joe & Mac - Caveman Ninja (E) [!]	NES
+36bafdf6f8d531fecb3553c1923eeafac4a05c28	G	Joe & Mac - Caveman Ninja (U) [!]	NES
+79a02ad09b776734e9e341d91137e989ea482f8e	B	Joe & Mac - Caveman Ninja (U) [b1]	NES
+6edbe6c00f8246a1f8c1a6fa543e9e2e83ea666e	B	Joe & Mac - Caveman Ninja (U) [o1]	NES
+e3b06ee583b47c55b5a1c9354482a27ad2cfbfde	G	Joe & Mac - Caveman Ninja (U) [p1][!]	NES
+bcf23b47befc698b9c8e1c2e1aa48529ac6ecf06	B	Joe & Mac - Caveman Ninja (U) [p2]	NES
+ef454083c6720b6f0a541257eb9a41758f27746c	B	Joe & Mac - Caveman Ninja (U) [p3]	NES
+f8139f01b7c3ca2b14cefec784ae64781c8f956d	C	Joe & Mac - Caveman Ninja (U) [t1] (No Time)	NES
+9031b847c51320960655849c750f027b20d05a80	C	Joe & Mac - Caveman Ninja (U) [t2]	NES
 5e44cea620e33e3c7c04c67163b0a9c612939c47	G	John Elway's Quarterback (U) [!]	NES
 d0e8588498ff005c311492c221b3c67721b8d42d	B	John Elway's Quarterback (U) [o1]	NES
 f67733b11991cc1c2301bf9d97df7c2b25a6bfdf	B	John Elway's Quarterback (U) [o2]	NES
@@ -9413,11 +9413,11 @@ e53a42ac93b757541e853695dd0c7ae50b437874	B	Jongbou (J) [f1][o1]	NES
 1c07244a8b98dde1f4ecb176097ca6aacd8c785d	B	Jongbou (J) [f1][o3]	NES
 ce8415b6a7585a752d1979ef87d4227591789e97	G	Jordan Vs Bird - One On One (U) [!]	NES
 538668aaa59db38e072cd1f499dead9236bbe13f	B	Jordan Vs Bird - One On One (U) [o1]	NES
-011a7ce0c86929a5788a67ed49c5dc587c53f991	U	Joshua & the Battle of Jericho (Wisdom Tree) (V5.0 CHR 6.0)	NES
-4d838a393823b2ab2fcca48b6cda6292f2992880	G	Joshua & the Battle of Jericho (Wisdom Tree) (V6.0) [!]	NES
-4856a12ba4f01e0ca41bfa6c95039fc302a60724	B	Joshua & the Battle of Jericho (Wisdom Tree) (V6.0) [b1]	NES
-e598d9753a823d39fda3cddc486a56ffb0ebee33	B	Joshua & the Battle of Jericho (Wisdom Tree) (V6.0) [b2]	NES
-eb320ad334f8f26044eb1084b070003bafc4e7d1	B	Joshua & the Battle of Jericho (Wisdom Tree) (V6.0) [o1]	NES
+011a7ce0c86929a5788a67ed49c5dc587c53f991	U	Joshua & the Battle of Jericho (Wisdom Tree) (V5.0 CHR 6.0)	NES
+4d838a393823b2ab2fcca48b6cda6292f2992880	G	Joshua & the Battle of Jericho (Wisdom Tree) (V6.0) [!]	NES
+4856a12ba4f01e0ca41bfa6c95039fc302a60724	B	Joshua & the Battle of Jericho (Wisdom Tree) (V6.0) [b1]	NES
+e598d9753a823d39fda3cddc486a56ffb0ebee33	B	Joshua & the Battle of Jericho (Wisdom Tree) (V6.0) [b2]	NES
+eb320ad334f8f26044eb1084b070003bafc4e7d1	B	Joshua & the Battle of Jericho (Wisdom Tree) (V6.0) [o1]	NES
 85f64db051e8c173a18905066052d412a8eb1d6c	G	Journey to Silius (E) [!]	NES
 275244538589393b552b159ab1d380090c8e8996	G	Journey to Silius (U) [!]	NES
 08c67ce185d2a4230d6c954bd90587192d2e34d2	B	Journey to Silius (U) [b1]	NES
@@ -9990,10 +9990,10 @@ f324e7c8c3ad102ecdcca011ecc494f6f345d768	G	Kirby's Adventure (U) (PRG1) [!]	NES
 455a81e5644317409d6047a7dccff56cb07cde89	H	Kirby's Adventure 2 (SMB1 Hack)	NES
 c6f778708182114b4f58093575cf51b5de9926b7	H	Kirby's Adventure FUCKED (Hack)	NES
 15175dfe4b255b3ffc1003e7ffc3d87888fd3acc	U	Kirby's Dreamland 3 Title Screen Demake by Macbee v1.0 (PD)	NES
-c445072c3362fa3fb2cc481706d5b1b96b368798	B	Kirby's Nuts (Nuts & Milk Hack) [o1]	NES
-67c1d833caa09444555711fdb32e7f16dfe61389	T	Kirby's Nuts (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
-d875bd8977d6486ac3c5c874d9d4f2cdcdc0841a	T	Kirby's Nuts by Kidwhatever (Nuts & Milk Hack) [T+Rus_Multisoft]	NES
-046d3a72942639a1a0c8a6eaa8c0a049051ea113	H	Kirby's Nuts by Kidwhatever (Nuts & Milk Hack)	NES
+c445072c3362fa3fb2cc481706d5b1b96b368798	B	Kirby's Nuts (Nuts & Milk Hack) [o1]	NES
+67c1d833caa09444555711fdb32e7f16dfe61389	T	Kirby's Nuts (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
+d875bd8977d6486ac3c5c874d9d4f2cdcdc0841a	T	Kirby's Nuts by Kidwhatever (Nuts & Milk Hack) [T+Rus_Multisoft]	NES
+046d3a72942639a1a0c8a6eaa8c0a049051ea113	H	Kirby's Nuts by Kidwhatever (Nuts & Milk Hack)	NES
 576b13815dbcfdb621b2654ab14b30a8080a8a4a	H	Kiri5 Star (SMB1 Hack) [a1]	NES
 58f4d00498313f5179fd5749e9c15efeef0b5910	H	Kiri5 Star (SMB1 Hack)	NES
 226da664994cee80f3af52fe98f77b92df291766	H	Kiri7 (SMB1 Hack)	NES
@@ -10182,7 +10182,7 @@ b338354bf584e2abccb625d88f543d27d5d9e542	H	Kunio-kun no Nekketsu Soccer League -
 340c0dc4d29883152e31a79aa5477b851dbdfeb2	H	Kunio-kun no Nekketsu Soccer League - Striker (Hack)	NES
 d39199f9c1550add08c12d5a13bbb59fcb6b3b2c	H	Kunio-kun no Nekketsu Soccer League - Super Maltreatment Edition (Hack)	NES
 4f78b071b96bf1b2c5e8098bf1529b1b333e246d	H	Kunio-kun no Nekketsu Soccer League - Super Striker (Hack)	NES
-f407cdd3308b4dd5ab48c74db33a8879e880f588	H	Kunio-kun no Nekketsu Soccer League - To Change Skill & Hit Keeper (Hack)	NES
+f407cdd3308b4dd5ab48c74db33a8879e880f588	H	Kunio-kun no Nekketsu Soccer League - To Change Skill & Hit Keeper (Hack)	NES
 3ca8ef95f367374000aa14223b7c0fd746a7f584	H	Kunio-kun no Nekketsu Soccer League - TT (Hack)	NES
 d64b96f6171876119a5af8bf0ead7e879ed8770d	H	Kunio-kun no Nekketsu Soccer League - Twin Shot by altinfener38 (Hack)	NES
 e45275579fd75471bd6c2f8ce8980c7bd6b907ab	H	Kunio-kun no Nekketsu Soccer League by oktucu (110806) (Hack)	NES
@@ -10272,7 +10272,7 @@ e6226a1bdf7c304438f4444df242f5ab5b4a1f67	B	Lagrange Point (J) [b1][o1]	NES
 ab6818c5e75516264d3a285ecbec5a4884683612	B	Lagrange Point (J) [b1][t1]	NES
 65557407307ca0313775510120b9e8b09f08e860	C	Lagrange Point (J) [t1]	NES
 cc44c4f1b8f8075e428389cde3b2c3ee583942e2	U	Lair's Secret (Unl)	NES
-bce119365efcbcab4bc03f7dc4f6dae5514ac172	H	Lam by darkdata (Milk & Nuts Hack)	NES
+bce119365efcbcab4bc03f7dc4f6dae5514ac172	H	Lam by darkdata (Milk & Nuts Hack)	NES
 6a0005e1bfd16f99cc79766e543dc624248d6cf8	U	LAN Master bu shiru (PD) (2011-06-10)	NES
 81763892417f2b2a89bfbac83b240ef5da322369	U	LAN Master by shiru (PD)	NES
 62fac07016d534852c9da61c060e8bd19ba5e6f0	G	Laser Invasion (U) [!]	NES
@@ -10339,7 +10339,7 @@ a86fb55799df29a70132e35ba305dad820068022	T	Legend of Kage, The (U) [T+Rus_Shedev
 f2755fe982e51a7f31a237aee03b91d364795629	H	Legend of Prince Valiant, The (E) [hM04]	NES
 773fefddc1a15ab045bc0e23151bf5d157e98bc5	C	Legend of Prince Valiant, The (E) [t1]	NES
 60bf4889b5b99b7441b91b4c9f4e8820bc4d0c7a	U	Legend of Robin Hood, The (U) (Prototype)	NES
-961e2890880a2185fd21ca25b6874c5d6ffcc6b8	H	Legend of Sean, The (Master Chu & The Drunkard Hu Hack)	NES
+961e2890880a2185fd21ca25b6874c5d6ffcc6b8	H	Legend of Sean, The (Master Chu & The Drunkard Hu Hack)	NES
 ee3a7feabc22fa45256416681496626493b7a2e9	H	Legend of Super Pikachu Bros 3 (SMB3 Hack)	NES
 2cc6cc45fa63f9354acd4f6b9d9deadfa88900c8	U	Legend of the Black Shawarma Medley (Music Demo) by Snowbro (PD)	NES
 1d195beeb4b3edbf8d1d53df8f7b756ad77890cf	H	Legend of the Blob Bros. 2 V1.0 by BMF54123 (SMB2 Hack)	NES
@@ -10700,7 +10700,7 @@ e1308b338c2b75bb5674547312d445cadcafa40c	U	Luan Shi San Guo (Ch)	NES
 7ed2f88638929b7e81a93510e19560ce0f4decf5	H	Luigi and the Christmas Quest (Final) (SMB1 Hack)	NES
 f880b618845829fe41d313d7386bea4545a97246	H	Luigi and the Christmas Quest (SMB1 Hack) [a1]	NES
 fcd6b2a1d32aca07ff8a1caa4a7e7ab09f8f243d	H	Luigi and the Christmas Quest (SMB1 Hack)	NES
-8fc67b2f8613c711def655519a390b41f5614ce0	H	Luigi and the New Quest (Level & Graphics Patch) (SMB1 Hack)	NES
+8fc67b2f8613c711def655519a390b41f5614ce0	H	Luigi and the New Quest (Level & Graphics Patch) (SMB1 Hack)	NES
 76515328e14754247618e9aed6cac87a49a2e494	H	Luigi and the New Quest (New Level Patch) (SMB1 Hack)	NES
 56bd3d597f4024ed558e34c5fa1e7dbee4c7f63d	H	Luigi and the New Quest (Partial Levels Patch) (SMB1 Hack)	NES
 b38c3b1d8bddf46e382ebfc8b13248214ba081a8	H	Luigi and the New Quest (SMB1 Hack) [a1]	NES
@@ -10751,10 +10751,10 @@ c8e128a54bf9aba9d9dd0f28a45f34e443ff0cdc	T	Lupin Sansei - Pandora no Isan (J) [T
 1d1f04e0bed7113be71d78eedc4cbd2a92bad32e	C	Lupin Sansei - Pandora no Isan (J) [t1]	NES
 18d0afcb194f5a7eca06efac29473fa22a499014	C	Lupin Sansei - Pandora no Isan (J) [t2]	NES
 96edd908d86043c856d189c3db7a95998771aae6	H	M Mario (SMB1 Hack)	NES
-e0064546070f426da5fdc9d05a1affa74d955882	U	M&M Heroes (Ch) (Wxn)	NES
-7bc4d849ea854df4ec39bc632d38ab888cfa30a0	H	M&M Heroes (Unl) [f1]	NES
-f63e163ed15f5bd977c0132679cb5f5a7f23f45a	T	M&M Heroes (Unl) [T+Rus_FedX IV]	NES
-a7ab98cadb51b86837fc9a71e72619c0d27a9a9d	U	M&M Heroes (Unl)	NES
+e0064546070f426da5fdc9d05a1affa74d955882	U	M&M Heroes (Ch) (Wxn)	NES
+7bc4d849ea854df4ec39bc632d38ab888cfa30a0	H	M&M Heroes (Unl) [f1]	NES
+f63e163ed15f5bd977c0132679cb5f5a7f23f45a	T	M&M Heroes (Unl) [T+Rus_FedX IV]	NES
+a7ab98cadb51b86837fc9a71e72619c0d27a9a9d	U	M&M Heroes (Unl)	NES
 9f026896275121d4cfb8ac34bd9e0cba96372508	U	M-Day (Ch) (Wxn)	NES
 afac4a56c2cf511e3cf983e16890adbf2f896bfd	G	M.C Kids (U) (Prototype) [!]	NES
 0fabf7ee8ed5bdc855daa5b16c49efc4b94497ba	G	M.C Kids (U) [!]	NES
@@ -10778,7 +10778,7 @@ deade5ae2b4f0948763b7e77b6561dfed5fdc8ff	B	M.U.S.C.L.E. (U) [o3]	NES
 0579081f3d7c4b5b756351bff82fd42f9e1eb54e	B	M.U.S.C.L.E. (U) [o4]	NES
 0414719a4ad314926d8d9b9fc8461d7303501ba0	B	M.U.S.C.L.E. (U) [o5]	NES
 4d7786106e6e550d993f20319428f27cae6ba998	U	M82 Game Selectable Working Product Display (E)	NES
-a58de11d0f58995d642fc3d556b3b554c3cb6493	U	Ma Bu Mi Zhen & Qu Wei Cheng Yu Wu (Ch)	NES
+a58de11d0f58995d642fc3d556b3b554c3cb6493	U	Ma Bu Mi Zhen & Qu Wei Cheng Yu Wu (Ch)	NES
 6b1d4795428ca175d83abcf06b4d6def3d7b9e11	B	Ma Li 12 (Yoshi no Cookie) [p1]	NES
 7c9daf77487a885367666c4f9dbc7714b0ce1439	B	Ma Li 12 (Yoshi no Cookie) [p1][o1]	NES
 39fcdb90ab5fe745eeebef591127dae761b02e81	U	Mac OS Demo (Large) by Chris Covell (PD)	NES
@@ -10994,9 +10994,9 @@ b8eabd4dfe1710ea8d74a990a2701ccda27d07d2	B	Making Love (Battle City Hack) [o1]	N
 0792c8302caf2641f3644146500d669bd21ef0d1	T	Making Love (Battle City Hack) [T+Rus_Cool-Spot][a1]	NES
 6efde8835d2f8c34875e24de8cdc353452d9f9b5	H	Making Love (Battle City Hack)	NES
 e5c0edeec0c4c45e4cfcf0ff0d48304ee90c215c	H	Male Lover Eon Man (Time Diver Eon Man Hack)	NES
-f76c5b3598b7869e57f438b861b6a198ef59a80e	B	Maluex (Nuts & Milk Hack) [o1]	NES
-544a5ed93d8ec8c34822f827126961377087e58d	B	Maluex (Nuts & Milk Hack) [o2]	NES
-4f26475c03365c125f9f9590bced09e3158f6a9a	H	Maluex (Nuts & Milk Hack)	NES
+f76c5b3598b7869e57f438b861b6a198ef59a80e	B	Maluex (Nuts & Milk Hack) [o1]	NES
+544a5ed93d8ec8c34822f827126961377087e58d	B	Maluex (Nuts & Milk Hack) [o2]	NES
+4f26475c03365c125f9f9590bced09e3158f6a9a	H	Maluex (Nuts & Milk Hack)	NES
 76edf6482110b1dcfebb2c57e00993ad80cc7878	U	Mandelbrot (PD)	NES
 3764bbd627f1a6b5790712019e06efa3a011d4e4	U	Manhole by KZ-S (PD) [a1]	NES
 b01b5adc58b6b81cae093e3ad43ad6fc4065237a	U	Manhole by KZ-S (PD)	NES
@@ -11072,8 +11072,8 @@ fca0c2983073ae17f1034077b0769e64dc33e179	B	Marble Madness (U) [o1]	NES
 14565b90be871acba746be154cdfc254c9c79193	H	Maria's Golf (Golf Hack)	NES
 038103f080bd837c11b8e82d03a57909006e2d4f	H	Marilunker (Spelunker Hack)	NES
 a86de28534e8d6b80a4e193a34073a6a58c30626	H	Marilunker by Tsurumidou (Spelunker Hack)	NES
-9ca35258a3637b43c45ef7f17a75c7b32ea969a8	G	Mario & Yoshi (E) [!]	NES
-5f69d6fe6299cd09e359f0db360495a40f8359fa	H	Mario + Toad (Nuts & Milk Hack)	NES
+9ca35258a3637b43c45ef7f17a75c7b32ea969a8	G	Mario & Yoshi (E) [!]	NES
+5f69d6fe6299cd09e359f0db360495a40f8359fa	H	Mario + Toad (Nuts & Milk Hack)	NES
 0c2494b25620c81cf4a514ed9659429e59b4c6ef	H	Mario 1337 (SMB1 Hack)	NES
 ff70fcbdf643b0c71cb2f8c170f315a4af755531	B	Mario 16 (1993) (Unl) [b1]	NES
 3a6f026690bbf5f13b1066e5b100f783a6928c8b	B	Mario 16 (1993) (Unl) [o1]	NES
@@ -11096,8 +11096,8 @@ e972a5ee5b0f8f68a08106bce39ae1c82d34e1d2	H	Mario a la Caza del Tesoro V1.0 Spani
 69b006cd318393e610e77ee22fd29ee4f10f0fda	H	Mario Adventure Island (Takahashi Meijin no Bouken Shima Hack)	NES
 34edbd53301273a8a31f1fade92003bf197d2926	T	Mario and Goombas by Cool-Spot (Mappy Hack) [T+Rus_Cool-Spot]	NES
 bc2eafe7d8c3b63595ecb75f19760e4ab5634e56	H	Mario and Goombas by Cool-Spot (Mappy Hack)	NES
-fdd6a65ea316ec531c0f96804bd02941add01b44	T	Mario and Luigi (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
-01b81f8e7ba17db3298822035435cd0c1ab87de6	H	Mario and Luigi (Nuts & Milk Hack)	NES
+fdd6a65ea316ec531c0f96804bd02941add01b44	T	Mario and Luigi (Nuts & Milk Hack) [T+Rus_Cool-Spot]	NES
+01b81f8e7ba17db3298822035435cd0c1ab87de6	H	Mario and Luigi (Nuts & Milk Hack)	NES
 e9bd0d304d265fa5a25c47cfed2d847605d3de76	H	Mario Bomb Jack (Mighty Bomb Jack Hack)	NES
 ef30e7d464a79dd4482b0da82c41504f46e477d2	H	Mario Bros in the Clouds (SMB1 Hack)	NES
 1bf3152946f6b697dd80aa9ba5b16bddab8ac0c2	G	Mario Bros. (E) (PRG1) [!]	NES
@@ -11235,7 +11235,7 @@ c90404b3c08265dfbc0677e7eb8a91eda8cf9a19	H	Mario Runner by Y.Project (Championsh
 441f1355cc8d159de0f82bd5471b5e25efac9448	H	Mario Satanic Freak Bros 2 (SMB2 Hack)	NES
 35cc22c2861cb67e3feee8bb10bcc22bf1c611e3	H	Mario Spy vs Spy (Spy vs Spy Hack)	NES
 38550a3ca3fc7f3263b26758ed37a9e3ba7e87fe	B	Mario Tails (SMB1 Hack) [b1]	NES
-fcd488c8f40e2956b1030d2b0e9ca4565694a5be	H	Mario Tank & Sub (SMB1 Hack)	NES
+fcd488c8f40e2956b1030d2b0e9ca4565694a5be	H	Mario Tank & Sub (SMB1 Hack)	NES
 764d9f6c2d2f9130c8de46fe9a0a408d3e96b13e	H	Mario Tokes A Doobie (SMB1 Hack)	NES
 2b5135b41e78505abf5489a2ab52faefee4a65fa	H	Mario Tower (SMB1 Hack)	NES
 48b8f691f3d73d8d2aa35c2f1e9c869c97d8b97b	H	Mario vs Monkey by Hax0r Kyo (Mario Bros Hack)	NES
@@ -11310,11 +11310,11 @@ a2b6008b8c2a65cd6e2312614505c463e1f4615f	B	Mashou (J) [hM02][b1]	NES
 1f1b2f43de9c29e41a9514a6019978529a9bfac8	C	Mashou (J) [t1]	NES
 1d9757ab82c6e1095bc88765e3ff012d0ad7375a	U	Masmix v0.06, The by Wojciech Andralojc (PD)	NES
 2a493dcfeeb0d7f928cb8862b8e8be295ed3c685	U	Master Chess (Ch) (Wxn)	NES
-62918362f30e4840ed4e7719339520cfefc92a2a	G	Master Chu & The Drunkard Hu (Color Dreams) [!]	NES
-569065844ea9f5c29fb80becef94190358dc9fe3	B	Master Chu & The Drunkard Hu (Color Dreams) [o1]	NES
-de04b54e6bb4bcfc3cb8a40669cf52499c51ff89	U	Master Chu & The Drunkard Hu (Joy Van)	NES
-9c98deede6eaa1c352d75c9cd8d1ca67ba16f77a	G	Master Chu & The Drunkard Hu (Sachen) [!]	NES
-08a2fbefe2e5543b9ef3e8342009456d67500884	G	Master Chu & The Drunkard Hu (Sachen) [U][!].unf	NES
+62918362f30e4840ed4e7719339520cfefc92a2a	G	Master Chu & The Drunkard Hu (Color Dreams) [!]	NES
+569065844ea9f5c29fb80becef94190358dc9fe3	B	Master Chu & The Drunkard Hu (Color Dreams) [o1]	NES
+de04b54e6bb4bcfc3cb8a40669cf52499c51ff89	U	Master Chu & The Drunkard Hu (Joy Van)	NES
+9c98deede6eaa1c352d75c9cd8d1ca67ba16f77a	G	Master Chu & The Drunkard Hu (Sachen) [!]	NES
+08a2fbefe2e5543b9ef3e8342009456d67500884	G	Master Chu & The Drunkard Hu (Sachen) [U][!].unf	NES
 00e58c05c1ddc011418b762e203283ba61510549	U	Master Fighter 3 (Unl) [a1]	NES
 0aeb922bd4bfe12fde656729e0ee0058276b7a95	U	Master Fighter 3 (Unl)	NES
 89ec66a8c33722a5bd1120bc69393b237e72de03	G	Master Fighter II (Unl) (UT1374 PCB) [!]	NES
@@ -11785,11 +11785,11 @@ b64e5757c43c4270c7ec4656823b3dd7f506a31c	U	Metal Max (J) (VC)	NES
 9a9401b7e009d560978053035ba854484258453f	H	Metal Max - Shining Strengthened Edition (Hack)	NES
 f0ded676241e773791a3209281b6290ca6c2a115	H	Metal Max by ZTOUYIA (090214) (Hack)	NES
 7af64b80c8857dba498a520298ab438b92a27a0d	H	Metal Max Night Edition by MISAKA KEN (Hack)	NES
-491f6a151cb43c794f1e0984e3645e946b5f5600	G	Metal Mech - Man & Machine (U) [!]	NES
-c46b547aaa2295d6e6daa978b971a47a1ea12906	B	Metal Mech - Man & Machine (U) [b1]	NES
-b5806e8504f79d790fc67bc31e6d2ccca2990011	B	Metal Mech - Man & Machine (U) [o1]	NES
-3e06e7b5db6da401ec312ab490b7069e8624a62f	B	Metal Mech - Man & Machine (U) [o2]	NES
-079f970b54f70e2144b5c9f197331f08a46b9aa2	B	Metal Mech - Man & Machine (U) [o3]	NES
+491f6a151cb43c794f1e0984e3645e946b5f5600	G	Metal Mech - Man & Machine (U) [!]	NES
+c46b547aaa2295d6e6daa978b971a47a1ea12906	B	Metal Mech - Man & Machine (U) [b1]	NES
+b5806e8504f79d790fc67bc31e6d2ccca2990011	B	Metal Mech - Man & Machine (U) [o1]	NES
+3e06e7b5db6da401ec312ab490b7069e8624a62f	B	Metal Mech - Man & Machine (U) [o2]	NES
+079f970b54f70e2144b5c9f197331f08a46b9aa2	B	Metal Mech - Man & Machine (U) [o3]	NES
 5aa98fc076e38002f08bfb3130cca0fbbe03058f	U	Metal Slader Glory (J) (VC)	NES
 a62908e4873cf88f4a3c571c2b06d3d7c51e7450	G	Metal Slader Glory (J) [!]	NES
 c62cc944e7cfac05ac9b99170dadfe1d8b5a3965	B	Metal Slader Glory (J) [b1]	NES
@@ -11828,7 +11828,7 @@ b0e1e0cd36b40aab2f9fecf057098abdad718cd3	T	Metroid (U) [T+Fre_Terminus]	NES
 6170e1db74b46a77ad701c0ec87bd129adccd037	T	Metroid (U) [T+Spa050_PaladinKnights]	NES
 574117fa7c66279a1373e25d792a40f45286fce2	T	Metroid (U) [T+Spa100b_ereza]	NES
 0d589c18ee0e59b7c7d17d7b6a698dcd968eb56e	T	Metroid (U) [T+Swe1.0_TheTranslator]	NES
-180d37be77a6bcbb5a572364ab214defe84ca0b8	H	Metroid - Unused GFX Tiles & 99 Energy Units by Grond (Metroid Hack)	NES
+180d37be77a6bcbb5a572364ab214defe84ca0b8	H	Metroid - Unused GFX Tiles & 99 Energy Units by Grond (Metroid Hack)	NES
 e7980c189177ab863b254a2a7a9683440557e3c0	H	Metroid - Wart's Invasion (Metroid Hack)	NES
 fe72d83deeb11b4579f7b07fb2e231137af396f0	H	Metroid - Zebian Illusion (Metroid Hack)	NES
 0be24e45e1ef766d67701aae299e1315c66e0979	H	Metroid 2000 (Metroid Hack)	NES
@@ -11994,7 +11994,7 @@ b47d159f82fe0ec2b458ead44337255f387f5179	C	Mighty Final Fight (U) [t1]	NES
 855f819f6745c64532be84cb771dcda43bed5abc	C	Mighty Final Fight (U) [t4]	NES
 c54abb5f91ff22e164510adb94be037661ffe0ee	C	Mighty Final Fight (U) [t5]	NES
 b63f9117a0d864ecf028c79cf0b759d02ca12dc7	H	Mighty Final Fight - Rock (Hack)	NES
-da6b671f63e0884a06edc4ffab18e80ef3815e5c	H	Mighty Final Fight - Skill & Enemies Changed (Hack)	NES
+da6b671f63e0884a06edc4ffab18e80ef3815e5c	H	Mighty Final Fight - Skill & Enemies Changed (Hack)	NES
 706a4d92a6f892f50768216222deb0943cf1c8fb	H	Mikamari 1 (SMB1 Hack)	NES
 291ecdfa63678f47489874c3b68bdbfe47a8651c	H	Mikamari 2 (SMB1 Hack)	NES
 4eaa8f7c55b779ffd5310062d0f6012b77fcb0d2	H	Mikamari 3 (SMB1 Hack)	NES
@@ -12469,7 +12469,7 @@ e9ebfd1a44a8b62ab774e421770f0caee34c34d4	U	Mr Brownstone by Snowbro (PD)	NES
 363c095b7d6b0b035365d55bbcd822c911adecf2	H	Mr. Happyface (Ms. Pac-Man Hack) [a1]	NES
 141991d10b5c2424d44bc2e8dfd62cd528e710ae	H	Mr. Happyface (Ms. Pac-Man Hack)	NES
 b5bf9531fe5900dc946e92114f7983088bfe232f	H	Mr. Men (Dig Dug II Hack)	NES
-141f8ddc64afb5f28a51b7265268ef76c1f11f4a	H	Mr. Pac-Man by Dave Augusta & Googie (v1.0) (Ms. Pac-Man Hack)	NES
+141f8ddc64afb5f28a51b7265268ef76c1f11f4a	H	Mr. Pac-Man by Dave Augusta & Googie (v1.0) (Ms. Pac-Man Hack)	NES
 7893f168fd56adad3546b5db267b286ff659a349	H	Mr. Sandman! by The Eadernator (SMB1 Hack)	NES
 697d523d2db7f1ebdcf91bf501422c6a033fbd44	B	Mr. Saturn's Dragon Quest v1.21 (Dragon Warrior PRG0 Hack) [o1]	NES
 93c5f1cb016f46ba5e1033997a8cd8bfdfa43e89	H	Mr. Saturn's Dragon Quest v1.21 (Dragon Warrior PRG0 Hack)	NES
@@ -12682,7 +12682,7 @@ cecd61c0a2321d44500bee546e04e382259b93f7	T	Nekketsu! Street Basket - Ganbare Dun
 13e673bd83bff5923729e259c42fed0995d989be	T	Nekketsu! Street Basket - Ganbare Dunk Heroes (J) [T-Eng.50]	NES
 7e129fa870424cbc23f274f373ae0e389c7d127f	U	Nekketsu! Street Basket - Ganbare Dunk Heroes (J)	NES
 ffd1705e5919b87d5a26d49a8f48d35d57497796	H	Nekketsu! Street Basket - Ganbare Dunk Heroes - Spirit Edition (Hack)	NES
-f5f295588ef93bb1ac44d16df184ac67ab678167	H	Nekketsu! Street Basket - Ganbare Dunk Heroes by AXI&AHE (v0.9) (Hack)	NES
+f5f295588ef93bb1ac44d16df184ac67ab678167	H	Nekketsu! Street Basket - Ganbare Dunk Heroes by AXI&AHE (v0.9) (Hack)	NES
 6a50ac4d84116cd39b57531a44f6509ef151829a	H	Nekketsu! Street Basket - Ganbare Dunk Heroes by D.S.ghtMaster+KRIZAL (Hack)	NES
 fbfa57623728465fd3c2582c8fc5930430502da9	H	Nekketsu! Street Basket - Ganbare Dunk Heroes by PU (100426) (Hack)	NES
 fb0a992bc148de44d82277b5cf4e3aba40ad6e38	G	Nemo - Pajama Hero (J) [!]	NES
@@ -13233,20 +13233,20 @@ ca1f630cfcf80e817e6e395b5bd52497f1604e63	B	Nobunaga's Ambition 2 (U) [o1]	NES
 a8fd3c5c20777b94d1204145104f72a93f83d225	U	Nomolos - Storming the Catsle Demo (PD)	NES
 9c5d4c2654998e874b3eda5e3f0af8b5e353575e	U	Nong Chang Xiao Jing Ling (NJ025) (Ch)	NES
 4e48b65b60f94a054b865f9e1cb3fd47cf9b4949	H	Normal (Lolo1 Hack)	NES
-766a602e239895343819c2980ecd296da14613e1	G	North & South (E) [!]	NES
-3c1f1f3ba8ce62899c2153116c3bd73ae058e554	T	North & South (E) [T+FreFinal_Generation IX]	NES
-023b6b9ac517453541324e3cca279588b94d5016	G	North & South (J) [!]	NES
-2a7f6052219e8ed69f307b8eb3d724fdded74ae1	G	North & South (U) [!]	NES
-da1d5fb3d856cee918a57e510a93d32e33af2843	B	North & South (U) [b1]	NES
-f2f1257a99f9fe3788851e62577798b7cb400cfb	B	North & South (U) [b1][o1]	NES
-58346ef19200fce9be100cc21284f31b6a1dad61	B	North & South (U) [b1][o2]	NES
-2342eec6311f597ea24bf418a9ff26030b5edd43	B	North & South (U) [b2]	NES
-7df0cc39d279659e4df9319aa74e24152a4db884	B	North & South (U) [b3]	NES
-2a08ba115a2ee1b6a7f07829bde5049dde11ec6c	B	North & South (U) [b4]	NES
-7dee9233fc66d18c92ac477965ba3f15892bda78	B	North & South (U) [b5]	NES
-f7ab568fd4b65dfcc89aeba81e7b127740967700	B	North & South (U) [b6]	NES
-1a38e957fc2953c987ea4f129f17edc6adc133f6	B	North & South (U) [b7]	NES
-53cbaf5517f6aba9a5eeba311ddfa03680898ac0	T	North & South (U) [T+Swe1.0_TheTranslator]	NES
+766a602e239895343819c2980ecd296da14613e1	G	North & South (E) [!]	NES
+3c1f1f3ba8ce62899c2153116c3bd73ae058e554	T	North & South (E) [T+FreFinal_Generation IX]	NES
+023b6b9ac517453541324e3cca279588b94d5016	G	North & South (J) [!]	NES
+2a7f6052219e8ed69f307b8eb3d724fdded74ae1	G	North & South (U) [!]	NES
+da1d5fb3d856cee918a57e510a93d32e33af2843	B	North & South (U) [b1]	NES
+f2f1257a99f9fe3788851e62577798b7cb400cfb	B	North & South (U) [b1][o1]	NES
+58346ef19200fce9be100cc21284f31b6a1dad61	B	North & South (U) [b1][o2]	NES
+2342eec6311f597ea24bf418a9ff26030b5edd43	B	North & South (U) [b2]	NES
+7df0cc39d279659e4df9319aa74e24152a4db884	B	North & South (U) [b3]	NES
+2a08ba115a2ee1b6a7f07829bde5049dde11ec6c	B	North & South (U) [b4]	NES
+7dee9233fc66d18c92ac477965ba3f15892bda78	B	North & South (U) [b5]	NES
+f7ab568fd4b65dfcc89aeba81e7b127740967700	B	North & South (U) [b6]	NES
+1a38e957fc2953c987ea4f129f17edc6adc133f6	B	North & South (U) [b7]	NES
+53cbaf5517f6aba9a5eeba311ddfa03680898ac0	T	North & South (U) [T+Swe1.0_TheTranslator]	NES
 f25301c5586eaf0bd53f95cbf264a0e4207731e2	U	Nothing Demo (PD)	NES
 7b3ff58b8684313b775fcffcdd24347060be5d38	G	Novel Diamond 999999-in-1 [U][p1][!].unf	NES
 077c8e387d2c605e4a1fb3b7a3b8e743feaffc64	U	NROM Template 0.01 by Damian Yerrick (2011) (PD)	NES
@@ -13278,28 +13278,28 @@ f67c0b6e6386ab3672759b7e1edbca7cfeecf4d5	H	Nude Punch Out (Punch-Out!! Hack)	NES
 9072be68ee2eaa942c474a7eba228640d7693ba9	U	Nuevo Tipo de Computadora (Game Star)	NES
 44b74d6a242b6446fa5a937884fb5a01da15a1cb	U	Nullsleep - Kuribos Requiem (PD)	NES
 15bb5ad31ef26025bb744e53e238f9880c90b9bd	U	NumberGuess by Vincent van der Leun (PD)	NES
-cca97fba72ca56809dd216618f5962eb6ea2f1aa	G	Nuts & Milk (J) [!]	NES
-38ad30d95aaa4376b282f98efd89df92846bb940	B	Nuts & Milk (J) [o1]	NES
-50ce8cec6085dd639292ae274bb5e913c9e1fc24	B	Nuts & Milk (J) [o2]	NES
-73b1aeb8c794ae7c1f662411c34d7ff11b362369	B	Nuts & Milk (J) [p1]	NES
-c01df7f32a0724e2258786a114f948e5d5ec7963	B	Nuts & Milk (J) [p1][o1]	NES
-e5a0ad38498935f360997c0925b539014618aa8a	T	Nuts & Milk (J) [T+Bra_JM-trad]	NES
-8a5022c666bab63216563f76ca202125af6cb0ba	T	Nuts & Milk (J) [T+Chi_MS emumax]	NES
-f8c39e1b575a1ff6775329bbca4b723059b42ed0	T	Nuts & Milk (J) [T+FreFinal_ks151]	NES
-7b84df69272bc4e29327c037ffd2d3d129df39be	T	Nuts & Milk (J) [T+Rus_CARI]	NES
-4a7726cbad59730bf05715e6549ddd0616637a1b	T	Nuts & Milk (J) [T+Rus_Cool-Spot]	NES
-4929bc380983b6b5cd0602c45b1964381e8ac170	T	Nuts & Milk (J) [T+Rus_Mario Soft]	NES
-bcff20a94a6d026ac3d061e90599a1c881ef0a1c	T	Nuts & Milk (J) [T+Rus_Multisoft]	NES
-5a93e79325dd52cceb312ad84ced5b0c055cd9b6	T	Nuts & Milk (J) [T-Chi_MS emumax]	NES
-5cccfd9cd3b6ab918003e46c8faf210255d5736a	T	Nuts & Milk (J) [T-Chi_MS emumax][a1]	NES
-b3d5d4f11b7d68d82c8ca5240f8239f930b1c688	T	Nuts & Milk (J) [T-Chi_MS emumax][a2]	NES
-e878b5c62b83cc13acf466480bc037c5d99b77e7	T	Nuts & Milk (J) [t1][T+Rus_Cool-Spot]	NES
-9a229b126f0573659448bba903a13048dd21c99a	C	Nuts & Milk (J) [t2] (9 Lives)	NES
-d8289a152855628af82aafefe5e3e9ed765d6523	C	Nuts & Milk (J) [t3] (50 Lives)	NES
-573df023388af04977b8ffd787987e66ea16efc6	C	Nuts & Milk (J) [t4] (100 Lives)	NES
-0b00c2eef9ed256599f9584b0ba366f838065fec	B	Nuts & Milk by PE (Hack) [o1]	NES
-bcff4b0d1d7dfea58018434e6a9aca29568a7844	T	Nuts & Milk by PE (Hack) [T+Rus_Cool-Spot]	NES
-8cdde663a326c50ab9d8cb434628dcd5490f3797	H	Nuts & Milk by PE (Hack)	NES
+cca97fba72ca56809dd216618f5962eb6ea2f1aa	G	Nuts & Milk (J) [!]	NES
+38ad30d95aaa4376b282f98efd89df92846bb940	B	Nuts & Milk (J) [o1]	NES
+50ce8cec6085dd639292ae274bb5e913c9e1fc24	B	Nuts & Milk (J) [o2]	NES
+73b1aeb8c794ae7c1f662411c34d7ff11b362369	B	Nuts & Milk (J) [p1]	NES
+c01df7f32a0724e2258786a114f948e5d5ec7963	B	Nuts & Milk (J) [p1][o1]	NES
+e5a0ad38498935f360997c0925b539014618aa8a	T	Nuts & Milk (J) [T+Bra_JM-trad]	NES
+8a5022c666bab63216563f76ca202125af6cb0ba	T	Nuts & Milk (J) [T+Chi_MS emumax]	NES
+f8c39e1b575a1ff6775329bbca4b723059b42ed0	T	Nuts & Milk (J) [T+FreFinal_ks151]	NES
+7b84df69272bc4e29327c037ffd2d3d129df39be	T	Nuts & Milk (J) [T+Rus_CARI]	NES
+4a7726cbad59730bf05715e6549ddd0616637a1b	T	Nuts & Milk (J) [T+Rus_Cool-Spot]	NES
+4929bc380983b6b5cd0602c45b1964381e8ac170	T	Nuts & Milk (J) [T+Rus_Mario Soft]	NES
+bcff20a94a6d026ac3d061e90599a1c881ef0a1c	T	Nuts & Milk (J) [T+Rus_Multisoft]	NES
+5a93e79325dd52cceb312ad84ced5b0c055cd9b6	T	Nuts & Milk (J) [T-Chi_MS emumax]	NES
+5cccfd9cd3b6ab918003e46c8faf210255d5736a	T	Nuts & Milk (J) [T-Chi_MS emumax][a1]	NES
+b3d5d4f11b7d68d82c8ca5240f8239f930b1c688	T	Nuts & Milk (J) [T-Chi_MS emumax][a2]	NES
+e878b5c62b83cc13acf466480bc037c5d99b77e7	T	Nuts & Milk (J) [t1][T+Rus_Cool-Spot]	NES
+9a229b126f0573659448bba903a13048dd21c99a	C	Nuts & Milk (J) [t2] (9 Lives)	NES
+d8289a152855628af82aafefe5e3e9ed765d6523	C	Nuts & Milk (J) [t3] (50 Lives)	NES
+573df023388af04977b8ffd787987e66ea16efc6	C	Nuts & Milk (J) [t4] (100 Lives)	NES
+0b00c2eef9ed256599f9584b0ba366f838065fec	B	Nuts & Milk by PE (Hack) [o1]	NES
+bcff4b0d1d7dfea58018434e6a9aca29568a7844	T	Nuts & Milk by PE (Hack) [T+Rus_Cool-Spot]	NES
+8cdde663a326c50ab9d8cb434628dcd5490f3797	H	Nuts & Milk by PE (Hack)	NES
 4381f42f7b69e00e4d44ba643331f0b8d4d6af12	U	Nyancat V1 by DerekB (PD)	NES
 486b47656c93db07fae5a8749278414531efb6ce	U	Nyancat V2 by DerekB (PD)	NES
 ab7e39224ff304c4619329c026cf9c079002921e	H	Oaty Invaders by Pope Hentai (Space Invaders Hack)	NES
@@ -14127,14 +14127,14 @@ fad06695ceb4520547470a3df1a7b5c561d056ca	U	Pattern Table Pixel-Flickering Demo F
 f052c4486726c3abac420bd6f411fbecd551d4ab	H	PCGC Tank Chinese (Battle City Hack)	NES
 c1df3c306ed45974b45c4832f72e93382f38a0e8	U	PCM Demo (PD) [a1]	NES
 72f4b89acfb66e7abeafc894507b8c8b8f3d4225	U	PCM Demo (PD)	NES
-9d75e5dcaa20e302b0820331d0995d1cb9b4c50d	H	Peach & Daisy - The Royal Quest (Alpha) (SMB1 Hack) [a1]	NES
-83e35177b4c0cbcb92d6ab975a2d876964eba303	H	Peach & Daisy - The Royal Quest (Alpha) (SMB1 Hack)	NES
-84701b4567b09170bdb5dd7eb0a0fd54afa64a50	H	Peach & Daisy and The Royal Games (SMB1 Hack)	NES
-8559c0dc7d22d61b77306d0f270e0bb3e27ca620	H	Peach & Daisy and The Royal Games with Hacked Music (SMB1 Hack)	NES
-2488999a27d64decba8545ad41b6884cf8b02fac	H	Peach & Daisy in The Ultimate Quest (SMB3 PRG0 Hack)	NES
-91ffa269fa5ffb549e9a12cc14bf7574b95b2226	H	Peach & Daisy in The Ultimate Quest (SMB3 PRG1 Hack) [a1]	NES
-6ac4ce8f754326ce7d6e1bc33f90528eeebd82cd	H	Peach & Daisy in The Ultimate Quest (SMB3 PRG1 Hack)	NES
-1218041ff94ed80d91b5b83f760bd78645791233	H	Peach & Daisy in The Ultimate Quest V2b (SMB3 PRG1 Hack)	NES
+9d75e5dcaa20e302b0820331d0995d1cb9b4c50d	H	Peach & Daisy - The Royal Quest (Alpha) (SMB1 Hack) [a1]	NES
+83e35177b4c0cbcb92d6ab975a2d876964eba303	H	Peach & Daisy - The Royal Quest (Alpha) (SMB1 Hack)	NES
+84701b4567b09170bdb5dd7eb0a0fd54afa64a50	H	Peach & Daisy and The Royal Games (SMB1 Hack)	NES
+8559c0dc7d22d61b77306d0f270e0bb3e27ca620	H	Peach & Daisy and The Royal Games with Hacked Music (SMB1 Hack)	NES
+2488999a27d64decba8545ad41b6884cf8b02fac	H	Peach & Daisy in The Ultimate Quest (SMB3 PRG0 Hack)	NES
+91ffa269fa5ffb549e9a12cc14bf7574b95b2226	H	Peach & Daisy in The Ultimate Quest (SMB3 PRG1 Hack) [a1]	NES
+6ac4ce8f754326ce7d6e1bc33f90528eeebd82cd	H	Peach & Daisy in The Ultimate Quest (SMB3 PRG1 Hack)	NES
+1218041ff94ed80d91b5b83f760bd78645791233	H	Peach & Daisy in The Ultimate Quest V2b (SMB3 PRG1 Hack)	NES
 a3714d4067896c3eafdc820fb75d72b2e9a44600	H	Peach's Nightmare - No Mercy (Beta) (SMB1 Hack)	NES
 9485ea0fca9c569c50b12c1bbdaf58d188ebca3f	H	Peach's Nightmare - No Mercy (SMB1 Hack)	NES
 c2f75c845b3ed54285153bf66cfa649ff9525931	H	Peachy Mario by Mana (SMB1 Hack)	NES
@@ -14151,12 +14151,12 @@ f8d094394bb036ffb0d7f4c6572c876d481eaaec	U	Pegasus 5-in-1 (Golden Five) (Unl)	NE
 8bb6485cafa110f01e60da35ce5d537b886c5cc3	U	Pegs by Sly Dog Studios (PD)	NES
 4d3d00d774ee6153d55878112c3aeeb48189b819	U	Penalty Kick (Ch) (Wxn)	NES
 cee202c3fbcc89608d6e333bdc290bd6224cc53e	H	Pencilvania (CV Hack)	NES
-f828bba945c4291586c9843a7bcff4400125cc88	U	Penguin & Seal, The (Dung Dung No 1) (Sachen) (Ch)	NES
-eac74d9de2001baa8fa76e740f9866d612612e33	G	Penguin & Seal, The (Sachen-HES) [!]	NES
-dab87920067b13c1252b47673ff078c882651ed0	B	Penguin & Seal, The (Sachen-HES) [o1]	NES
-41994a3c8f15bfbba09fe48ce2f98b9691fbfd7b	G	Penguin & Seal, The (Sachen-HES) [U][!].unf	NES
+f828bba945c4291586c9843a7bcff4400125cc88	U	Penguin & Seal, The (Dung Dung No 1) (Sachen) (Ch)	NES
+eac74d9de2001baa8fa76e740f9866d612612e33	G	Penguin & Seal, The (Sachen-HES) [!]	NES
+dab87920067b13c1252b47673ff078c882651ed0	B	Penguin & Seal, The (Sachen-HES) [o1]	NES
+41994a3c8f15bfbba09fe48ce2f98b9691fbfd7b	G	Penguin & Seal, The (Sachen-HES) [U][!].unf	NES
 74a1ae73ec743bc20f9959c3f4434b8c2a9b3cd5	U	Penguin (Ch) (Wxn)	NES
-84e0889f31db8949d9e4281a6dc84350d5caef19	H	Penguin (Nuts & Milk Hack)	NES
+84e0889f31db8949d9e4281a6dc84350d5caef19	H	Penguin (Nuts & Milk Hack)	NES
 8226578f38034a45a2023d7340115149ed2d96bf	H	Penguin Shoot (Battle City Hack)	NES
 19f3aa482f2ed6f46d81fcb55960c9e56c039cf2	B	Penguin-kun Wars (J) [b1]	NES
 f04547d268c367e4bf42c47b2c15a7fa41a60ee7	B	Penguin-kun Wars (J) [p1]	NES
@@ -14178,15 +14178,15 @@ ed96ab727ba734cda8f619ff171f5eeaf100c0f1	B	Perfect Bowling (J) [o1]	NES
 e2798f1b0f34fb4177b032ad37c6117632a2b8f7	G	Pesterminator - The Western Exterminator (Color Dreams) [!]	NES
 6427975ec1a6c8eb2b44fbd23727ca4673dee6f1	B	Pesterminator - The Western Exterminator (Color Dreams) [o1]	NES
 ec5b7cea33ded1afa919a8e2d975ba25e7cb2d8e	U	Pet 4-in-1 (Unl)	NES
-faf1e63eaf03dba975d9f40cccbe446a71386ab2	G	Peter Pan & The Pirates (U) [!]	NES
-bcf8aca930e0edfe72da7e836f121cce7ecfb0cd	B	Peter Pan & The Pirates (U) [b1]	NES
-0f71b02b1828d6fa3cf477b304e2e49c90333a40	B	Peter Pan & The Pirates (U) [b2]	NES
-6f633431bcb0ec6a5d2883ea742c4281f6fe7351	B	Peter Pan & The Pirates (U) [b3]	NES
-4596be40277f40d4c8c7546a25a08f912dbf7645	B	Peter Pan & The Pirates (U) [o1]	NES
-acc8e6a5efee672e34b11ad2d699ba2adbe91770	B	Peter Pan & The Pirates (U) [o2]	NES
-c51d1b51e599b5cf5743458ec7248c7653b461c2	B	Peter Pan & The Pirates (U) [o3]	NES
-4eac15442ca9bc0ba7591e219e5d24176df1fa57	B	Peter Pan & The Pirates (U) [o4]	NES
-93b0e1be6669692c19d51d35d4b8a31bdbf90573	C	Peter Pan & The Pirates (U) [t1]	NES
+faf1e63eaf03dba975d9f40cccbe446a71386ab2	G	Peter Pan & The Pirates (U) [!]	NES
+bcf8aca930e0edfe72da7e836f121cce7ecfb0cd	B	Peter Pan & The Pirates (U) [b1]	NES
+0f71b02b1828d6fa3cf477b304e2e49c90333a40	B	Peter Pan & The Pirates (U) [b2]	NES
+6f633431bcb0ec6a5d2883ea742c4281f6fe7351	B	Peter Pan & The Pirates (U) [b3]	NES
+4596be40277f40d4c8c7546a25a08f912dbf7645	B	Peter Pan & The Pirates (U) [o1]	NES
+acc8e6a5efee672e34b11ad2d699ba2adbe91770	B	Peter Pan & The Pirates (U) [o2]	NES
+c51d1b51e599b5cf5743458ec7248c7653b461c2	B	Peter Pan & The Pirates (U) [o3]	NES
+4eac15442ca9bc0ba7591e219e5d24176df1fa57	B	Peter Pan & The Pirates (U) [o4]	NES
+93b0e1be6669692c19d51d35d4b8a31bdbf90573	C	Peter Pan & The Pirates (U) [t1]	NES
 1c6ebffde98f4afaba4032d68a6d2713d7ce6c01	H	Phantasy Star The Hopeless (Air Fortress Hack)	NES
 de763651d0d6ab670935b86f412e24d853f4a6d1	G	Phantom Air Mission (E) [!]	NES
 373b6c4721e73142ea77be78439e741d6f86ad29	G	Phantom Fighter (U) [!]	NES
@@ -14609,7 +14609,7 @@ e5c46255f9723358115d9a15142a1d2ed8e2123f	U	Powerpak Boot Loader V1.10 (PD)	NES
 99155590ec76d5541aff7e49ed3f998517130ac2	U	Powerpak Boot Loader V1.11 (PD)	NES
 949f5a882611b0dd79333c5ba338e587d9fc986e	U	Powerpak NSF V1.20 (PD)	NES
 2e360a03a7b1e38dca4bf8d1153549b42a15bbf4	U	Powerpak NSF V1.34 (PD)	NES
-9e470702ad1466d62245453dc8c6bb50b92c30c2	U	PPU Palette RAM Access & Mirroring Test by Shay Green (15 Sep 2005) (PD)	NES
+9e470702ad1466d62245453dc8c6bb50b92c30c2	U	PPU Palette RAM Access & Mirroring Test by Shay Green (15 Sep 2005) (PD)	NES
 4aad1a570833e0365592ac54ea13019dcd3d15e4	U	PPU Timing V2 by Kevin Horton (PD)	NES
 a376886d844d36e0a073d39fb343c3955fa908e5	U	PR2_test (PD)	NES
 502923edd8e4efd7ff1b3c1eef302997ef3cff0b	U	PR8 NES Drum Synth v0.99 by Neil Baldwin (2011) (PD)	NES
@@ -14848,7 +14848,7 @@ d9492dd8f558b7db25e6fee6b95f008e9f7e6061	G	Qix (U) [!]	NES
 84ef8209b0dc88bf9794e3373c35e64dd7bbf375	B	Qix (U) [b2]	NES
 5411c6741a26912adcc0b5ec87813dca9cb77cce	B	Qix (U) [o1]	NES
 9440b56316739c25dd4a1470c36eb29fe41a7c11	H	Quadruple Dragons (FF1 Hack)	NES
-05dbd91abd97b747b4470f1ea2109274714b6532	U	Quadz by Michael Blain, Mark Schmit & Phil Yam (PD)	NES
+05dbd91abd97b747b4470f1ea2109274714b6532	U	Quadz by Michael Blain, Mark Schmit & Phil Yam (PD)	NES
 b053482f9ced7a1835fe961cc2373ff9521b74a2	U	Quantum Disco Brothers by wAMMA (PD) (PAL)	NES
 93efdadedba42f4ec7a6cdf5634187ff38b66f91	G	Quarter Back Scramble (J) [!]	NES
 10532a9c32080431fb5711ff42ef83187cf13639	G	Quarth (J) [!]	NES
@@ -14941,7 +14941,7 @@ ecd19585722f8985b1e898dae23231aa2f75cdc5	H	R.B.I. Baseball - Fantasy Baseball Le
 949b63ad49546c59901f143d6331dcb0f290fdad	H	R.B.I. Baseball - Greats of College Baseball by fightonusc (Hack)	NES
 4599d3da7bf2968980000c6dc6ba9fc4a1bc67a0	H	R.B.I. Baseball - Heaven Vs Hell by Britznoc (Hack)	NES
 a9947effb0e21f56beb66b771dc8f62d06ac33ba	H	R.B.I. Baseball - Hunt for October '06 by Fryak (Hack)	NES
-da4bb9c9b18ff1e37c13852824b28ed5563dfb51	H	R.B.I. Baseball - Japanese League & Negro League by DrNick (Hack)	NES
+da4bb9c9b18ff1e37c13852824b28ed5563dfb51	H	R.B.I. Baseball - Japanese League & Negro League by DrNick (Hack)	NES
 2d94e410ca61c704bb319ea7e4fc8980765fe97e	H	R.B.I. Baseball - Mexican League 1979 - Northern Division by Cafetero (Hack)	NES
 79230b44c7a4429f96bba1bce5da3306d04cdbf0	H	R.B.I. Baseball - Mexican League 1979 - Southern Division by Cafetero (Hack)	NES
 cd415b9405d8ae4d52038ef086b017c498fdbc3d	H	R.B.I. Baseball - Same Team Fix (Hack)	NES
@@ -15037,7 +15037,7 @@ e875c71d507573f1c4559e7b8e797a5f05adc6d2	B	Racket Attack (U) [b6]	NES
 f55f2a192bc6d0927fedd445cb0515c5284467f2	B	Racket Attack (U) [b8]	NES
 90716b3b6b4bb2bfb39f16248a257fe07557ba70	B	Racket Attack (U) [o1]	NES
 a2bc61169a2c21a68bc6d48441538e178bcb563b	B	Racket Attack (U) [o2]	NES
-b1197945728949126af2049e96d2433a7813a9da	G	Rackets & Rivals (E) [!]	NES
+b1197945728949126af2049e96d2433a7813a9da	G	Rackets & Rivals (E) [!]	NES
 66a0be81eb404220b2c519dcc3ca3432e883ac5a	G	Rad Racer (E) [!]	NES
 cda80a93a5fa2622064056b5bc5e93eeb1c811de	B	Rad Racer (PC10) [b1]	NES
 7e0332479069fe729f44f61d8f337d228efc2a07	U	Rad Racer (PC10)	NES
@@ -15202,12 +15202,12 @@ b00813ed6a0b4602b1384d6f7418052dc496dead	G	Reigen Doushi (J) [!]	NES
 cb58b0109a4dc4c1f757035842da3b79744f4e9e	B	Remote Control (U) [o1]	NES
 068c2b2053974a7cad3e7a0637bc6354f32694e0	B	Remote Control (U) [o2]	NES
 075b4a6af861726f45d0da61052769886a080e35	B	Remote Control (U) [o3]	NES
-982f6bc24423ecc04199c8fa3f8d156c9af1a9b3	G	Ren & Stimpy Show, The (U) [!]	NES
-07a8119abea8e83455f8aa45224418cc3af784a4	B	Ren & Stimpy Show, The (U) [b1]	NES
-2476bf9fed478b6612c50be88448cd14cf694a17	B	Ren & Stimpy Show, The (U) [b2]	NES
-ce765eceee5a44dbf2112f3e986c8cb0d11ac54d	B	Ren & Stimpy Show, The (U) [b3]	NES
-04b8201def7ae785ea69e592fa66f9a3f6838093	B	Ren & Stimpy Show, The (U) [o1]	NES
-14c3f7970827f6f231f142396843966a0be4478f	B	Ren & Stimpy Show, The (U) [o2]	NES
+982f6bc24423ecc04199c8fa3f8d156c9af1a9b3	G	Ren & Stimpy Show, The (U) [!]	NES
+07a8119abea8e83455f8aa45224418cc3af784a4	B	Ren & Stimpy Show, The (U) [b1]	NES
+2476bf9fed478b6612c50be88448cd14cf694a17	B	Ren & Stimpy Show, The (U) [b2]	NES
+ce765eceee5a44dbf2112f3e986c8cb0d11ac54d	B	Ren & Stimpy Show, The (U) [b3]	NES
+04b8201def7ae785ea69e592fa66f9a3f6838093	B	Ren & Stimpy Show, The (U) [o1]	NES
+14c3f7970827f6f231f142396843966a0be4478f	B	Ren & Stimpy Show, The (U) [o2]	NES
 c3e3e30408fda21ee2383e128b13e1b0f5650c32	U	Renegade (U) (VC)	NES
 bce48217b901a2bbd81fb89586661da6a442a179	G	Renegade (U) [!]	NES
 3da61d5ef055b8fb8f0eb9605b7bb08f3cbbd21c	B	Renegade (U) [b1]	NES
@@ -15234,7 +15234,7 @@ ce9be360c843606897cba2878e8ad3bd57134369	H	Retro Mario Bros 3 (Older) (SMB3 PRG1
 47958c4b9b18116ffd4aafad43aeb4bfa3ec173d	H	Retro Mario Bros 3 (SMB3 PRG1 Hack)	NES
 85e5e4241d7fb3cb4bd03f2ec44c3439960e2f49	U	Retrocoders' Demo for Y2Kode (PD)	NES
 5e4eb9f1a8b2a9dc60308c380659aa040d164545	U	Retrocoders' Music ROMS - Years Behind (PD)	NES
-482360d347ba7c0deb945f93d43cc85377fc3654	H	Return BC by Bishop & Multisoft (Battle City Hack)	NES
+482360d347ba7c0deb945f93d43cc85377fc3654	H	Return BC by Bishop & Multisoft (Battle City Hack)	NES
 4be8bc2dfd966d52c3dc27042813eaaadf4217e3	H	Return BC by Bishop (Battle City Hack)	NES
 caa8da6dcf9d28028dfd6d2e6e86537fd0be3eb1	B	Return of the Black Mage by Redrum (Warpman Hack) [o1]	NES
 717c53d094d0d7f01358568a92e938934a82960c	H	Return of the Black Mage by Redrum (Warpman Hack)	NES
@@ -16117,8 +16117,8 @@ c1332faaa9e40f1953a8f470b851f2a1f869715c	H	Sansuu 3 Nen - Keisan Game (J) [hM03]
 a9ce58ea73e0f63d264d0f79f23a077797fd52ff	B	Sansuu 3 Nen - Keisan Game (J) [hM03][o1]	NES
 dafe0132cf7850ddbc50bc3a0f516d8a0b6049c6	G	Sansuu 4 Nen - Keisan Game (J) (Prototype) [!]	NES
 7c5b6f8b54790e73d72088854253395360625d7f	G	Sansuu 4 Nen - Keisan Game (J) [!]	NES
-c6ac68e9dfaf87f774f8ff94a7a0eef3591e2d68	G	Sansuu 5 & 6 Nen - Keisan Game (J) (Prototype) [!]	NES
-6020dc7df0e63dc00293d2fea63aef698f608942	U	Sansuu 5 & 6 Nen - Keisan Game (J)	NES
+c6ac68e9dfaf87f774f8ff94a7a0eef3591e2d68	G	Sansuu 5 & 6 Nen - Keisan Game (J) (Prototype) [!]	NES
+6020dc7df0e63dc00293d2fea63aef698f608942	U	Sansuu 5 & 6 Nen - Keisan Game (J)	NES
 4631b718863e7e0819f8a5a20871df489667894f	U	Santa Claus (Ch) (Wxn)	NES
 4dd9861f9e77fd1d79058ec168d3659765f9b9a1	B	SARS Kung Fu 2003 by Jeremiah Johnson (Kung Fu Hack) [o1]	NES
 5d2b88a9b421114ee9161a32a4a4be36e4d33c95	H	SARS Kung Fu 2003 by Jeremiah Johnson (Kung Fu Hack)	NES
@@ -16151,8 +16151,8 @@ e0f27eda215acd60fd3333d971f353ade4022774	H	Schneider (Captain Tsubasa II Hack)	N
 e31b969724dc19ade8c2e82bd36b506653de7b58	U	Screen Saver Demo by KZ-S (PD)	NES
 49735dfc8bcbb6a53b484832f6ee8a2b3379935e	U	Screen2NES Zelda Demo V2 by Afroman (PD)	NES
 ac503144a0cf452f71a5ba3076f6c2ee130d58f0	U	Scroll Demo by HollowOne11 (PD)	NES
-31f013891c2daa44cda80afc5fe9ed632823750a	U	ScrollNES 0.1 2010 by NO CARRIER & Batsly Adams (PD) [a1]	NES
-64a95d6b75ee8a90df670e3740980063289a81a5	U	ScrollNES 0.1 2010 by NO CARRIER & Batsly Adams (PD)	NES
+31f013891c2daa44cda80afc5fe9ed632823750a	U	ScrollNES 0.1 2010 by NO CARRIER & Batsly Adams (PD) [a1]	NES
+64a95d6b75ee8a90df670e3740980063289a81a5	U	ScrollNES 0.1 2010 by NO CARRIER & Batsly Adams (PD)	NES
 5ced0cb435fb8c3e28f3f3bbfe55b6ca196970ba	G	SD Battle Oozumou - Heisei Hero Basho (J) [!]	NES
 077c2d4b9ef42e915e13c40bf7e88fce098d0f14	G	SD Gundam - Gachapon Senshi 2 - Capsule Senki (J) [!]	NES
 382496bc94169a2e13ddf946cdee66a8f15035f8	B	SD Gundam - Gachapon Senshi 2 - Capsule Senki (J) [b1]	NES
@@ -16664,8 +16664,8 @@ dc06b62c59901190ad2f04f6a9b857c16c2400ec	H	Skinhead Fight (Nekketsu Kakutou Dens
 d25f42a6f677399c05e08b8c164dfd43cb6be2b5	H	Skinhead on Ice (Nekketsu Hockey Hack)	NES
 1fd7896dfa2af88a0056fa712074b43f59c0e4da	H	Skinhead Racing (Downtown - Nekketsu Koushin Kyoku Hack)	NES
 d383d346725ed66ea41d619daa311867c9dc5c58	G	Sklad Nomer 18 (Unl) [!]	NES
-b191e5d30e31e1f8613c4b3fb40b770f97ae92ed	G	Skull & Crossbones (Tengen) [!]	NES
-6b05670da10c0ba5eb33c94fb931a5464741239e	B	Skull & Crossbones (Tengen) [o1]	NES
+b191e5d30e31e1f8613c4b3fb40b770f97ae92ed	G	Skull & Crossbones (Tengen) [!]	NES
+6b05670da10c0ba5eb33c94fb931a5464741239e	B	Skull & Crossbones (Tengen) [o1]	NES
 8427c83a22306c0ee376f782e948601985f49f5a	B	Skullanoid by Evan Lucore (Arkanoid Hack) [o1]	NES
 146cb857051c2fc6892e0a65b8246abf0bceabf3	H	Skullanoid by Evan Lucore (Arkanoid Hack)	NES
 3fc678eae782f6337e6522285b9b78b0541067a9	G	Sky Destroyer (J) [!]	NES
@@ -16974,11 +16974,11 @@ eb60b5015be750db9484d7f5a74fdd23ec22d150	G	Solar Jetman - Hunt for the Golden Wa
 65f10ecade7082e8cebd1e2cc9c18ba67746691c	B	Solar Jetman - Hunt for the Golden Warpship (U) [o1]	NES
 195959f8fc5daf5ed05dc8b7fd72a5e5a748a8bb	T	Solar Jetman - Hunt for the Golden Warpship (U) [T+Bra1.0_TraduROMS]	NES
 a632ae12fec13637ee1824bad5e4f6e180add3d8	T	Solar Jetman - Hunt for the Golden Warpship (U) [T+Rus_Chief-Net]	NES
-c05e8c0f26044ee2ed8873b9939f1a97e71fc29f	U	Solar Wars 2001 by Chris Covell, Joey Parsell & Michel Iwaniec (PD)	NES
-4d42ecc70c481f7fe68a8a2961ac27860fa97575	U	Solar Wars by Chris Covell, Joey Parsell & Michel Iwaniec (PD) [a1]	NES
-da5ecfca8ee9f6a313039266fe0c705db84978d3	U	Solar Wars by Chris Covell, Joey Parsell & Michel Iwaniec (PD)	NES
-ce8b4818719ecad6b35ce9ca4ef573467e160126	U	Solar Wars Silent V.1 by Chris Covell, Joey Parsell & Michel Iwaniec (PD)	NES
-728e45acb68985ce8cc73c5f97ab226992ccfc09	U	Solar Wars Silent V.2 by Chris Covell, Joey Parsell & Michel Iwaniec (PD)	NES
+c05e8c0f26044ee2ed8873b9939f1a97e71fc29f	U	Solar Wars 2001 by Chris Covell, Joey Parsell & Michel Iwaniec (PD)	NES
+4d42ecc70c481f7fe68a8a2961ac27860fa97575	U	Solar Wars by Chris Covell, Joey Parsell & Michel Iwaniec (PD) [a1]	NES
+da5ecfca8ee9f6a313039266fe0c705db84978d3	U	Solar Wars by Chris Covell, Joey Parsell & Michel Iwaniec (PD)	NES
+ce8b4818719ecad6b35ce9ca4ef573467e160126	U	Solar Wars Silent V.1 by Chris Covell, Joey Parsell & Michel Iwaniec (PD)	NES
+728e45acb68985ce8cc73c5f97ab226992ccfc09	U	Solar Wars Silent V.2 by Chris Covell, Joey Parsell & Michel Iwaniec (PD)	NES
 dc50b0576187261030236687f37540cd429749ae	H	Soldier VS Mario (SMB1 Hack)	NES
 67bd42b43a2e0fc012569c02ab18bf7ec679443f	T	Solitair (from Nuevo Tipo de Computadora) (Unl) [T+Rus_Cool-Spot]	NES
 b3fcfd458cb9ad4c69414b37b17b4c9cdd3d7abd	T	Solitair (from Nuevo Tipo de Computadora) (Unl) [T+Rus_Cool-Spot][a1]	NES
@@ -17245,7 +17245,7 @@ c9374202764fa52c749144b7ddcf26a9687a7d8a	B	Sqoon (U) [o3]	NES
 9bf0d67acdfde71eb391c7d35b6e45671c4fe35d	U	Square (Ch) (Wxn)	NES
 4072c52beeb14b128e0f1f497b4a72377fe59923	U	Square Box by Quietust (PD)	NES
 a864d3b913cefc885e01e0dacc53077ea7f5c727	U	Square Box by Quietust [U] (PD).unf	NES
-7517bed4dbdc71c3184a9632e460f223b7a2191f	U	Square City by Mankeli, Zonzki & Bananmos (PD)	NES
+7517bed4dbdc71c3184a9632e460f223b7a2191f	U	Square City by Mankeli, Zonzki & Bananmos (PD)	NES
 90c1266a1bfc51c6a8fd5ae75a90bd9b6d491949	G	Square Force (Unl) [!]	NES
 f00d2feb353450bd6294bb431a54cee729e56689	G	Square no Tom Sawyer (J) [!]	NES
 af6443e035e95a7917b773fc2a32a9d7709caae5	B	Square no Tom Sawyer (J) [b1]	NES
@@ -17566,11 +17566,11 @@ b3ed4ba03dba257229c68c4ea0173f8961bc00a2	B	Strider (U) [o1]	NES
 be18c598d75b1b8504952154938868723b045daa	C	Strider (U) [t1]	NES
 a25bfd8f0cf77ee96f6b07deebe6313eb3787ea3	G	Strike Wolf (MGC-014) (Unl) [!]	NES
 80cdb522e0d2adc41595c6dcec9fe330816b077e	H	Strip Aerobics (beta) by Golden Gun (Dance Aerobics Hack)	NES
-356fa145d802faa849c66b1c0e549de850cdffb1	U	Stroke & Match Golf (Ladies) (VS)	NES
-53ed0cca26f766bbeb6d10bf90dd2891bda93ebe	G	Stroke & Match Golf (VS) [!]	NES
-c988eb9e17969812cd4d09896fd28da9ae3a6a13	U	Stroke & Match Golf (VS) [a1]	NES
-6c756c8e4263a5b4dc8cc2502dc4e63fac6fab29	B	Stroke & Match Golf (VS) [a1][b1]	NES
-7bbd19e207a78c833f8ae5ff535cbf974f299d73	B	Stroke & Match Golf (VS) [a1][b2]	NES
+356fa145d802faa849c66b1c0e549de850cdffb1	U	Stroke & Match Golf (Ladies) (VS)	NES
+53ed0cca26f766bbeb6d10bf90dd2891bda93ebe	G	Stroke & Match Golf (VS) [!]	NES
+c988eb9e17969812cd4d09896fd28da9ae3a6a13	U	Stroke & Match Golf (VS) [a1]	NES
+6c756c8e4263a5b4dc8cc2502dc4e63fac6fab29	B	Stroke & Match Golf (VS) [a1][b1]	NES
+7bbd19e207a78c833f8ae5ff535cbf974f299d73	B	Stroke & Match Golf (VS) [a1][b2]	NES
 7bba18f6c4970a841fcca61cfa0c137fe4d79156	U	Strong Pill (Ch) (Wxn)	NES
 8af29c451a88c37520a3ba67289b0ea984f1799a	H	Stronghold (SMB1 Hack)	NES
 0b1ff1e0010dfebe2e8a072df96ae1ce7af0595e	H	Stronghold, The (SMB1 Hack)	NES
@@ -17582,7 +17582,7 @@ b9a9a64cf606bba1fb70b3da70926ae2f22781f6	B	Stunt Kids (Camerica) [o1]	NES
 75f1475b12ab45bd82aff0d46224dfec8b6ad663	H	Subcon 2000 (Final) (SMB2 Hack)	NES
 13e7f2ca2c7ee1aea28245af364ce4fa6ac8b592	H	Subcon 2000 (SMB2 Hack)	NES
 488d37154efc7611de0cded75aade267222777a6	U	Submarine War (Ch) (Wxn)	NES
-8d24486170a3ffc5f36d89bae423a1d9fa173b60	U	Subor Figure Ratiocination & IQ Puzzle (Ch)	NES
+8d24486170a3ffc5f36d89bae423a1d9fa173b60	U	Subor Figure Ratiocination & IQ Puzzle (Ch)	NES
 88318d936361115b784f072ec7f1bddb0e6728ba	U	Subor V1.0 (R) [a1]	NES
 786f2da157861fd6db2aaf84fe95cc83244594fa	U	Subor V1.0 (R)	NES
 406a458af2f51a1b44ea18e1999781ca22b5b3c7	B	Subor V3.0 (Ch) [b1]	NES
@@ -17649,8 +17649,8 @@ add98da0583a4a1cb6d5bfecf305fa64457d7b90	H	SUP-Noid (Arkanoid Hack)	NES
 60081d0d62971348268c68f3c352c1da7cfc0d88	B	Super 1997 4-in-1 [p1]	NES
 5e5ce5cbd73ea88ee012c88c0e7be30130f55ebd	G	Super 1998 3-in-1 (NT-008 PCB) [p1][!]	NES
 fb947bf2f88e9cb8d33c0a7de8c243969bb54fdb	G	Super 1998 3-in-1 (VT-850, NT-008 PCB) [p1][!]	NES
-b103bd0b66e8ea798e64295e799fefe6b69cfd2b	G	Super 2-in-1 (Soccer Game & Crazy Dance) (Unl) [!]	NES
-3d580c1ce546b60664f2c6367d804a673478bc8d	H	Super 2-in-1 (Soccer Game & Crazy Dance) (Unl) [f1]	NES
+b103bd0b66e8ea798e64295e799fefe6b69cfd2b	G	Super 2-in-1 (Soccer Game & Crazy Dance) (Unl) [!]	NES
+3d580c1ce546b60664f2c6367d804a673478bc8d	H	Super 2-in-1 (Soccer Game & Crazy Dance) (Unl) [f1]	NES
 a21a620a1eaed19ef52e8f184dec2872cee2005a	U	Super 2-in-1 (Unl)	NES
 997bbb9a3e52507fa488810ed90b613e5ba1f4cd	B	Super 22-in-1 [p1]	NES
 5830ff9449a0388450718d014a9034e32645bdec	G	Super 24-in-1 [U][p1][!].unf	NES
@@ -18009,7 +18009,7 @@ c48a6d63859327ffb4d7aac6ac4fb15f9d663c37	H	Super Luigi - The Red Coin Quest Demo
 ea69228d23f05be1205ed891e558485069060736	H	Super Mari 2 by Maikami (SMB1 Hack)	NES
 8301685fec5dc281b46b32acc1fadde588ca59bc	H	Super Mari by Maikami (SMB1 Hack) [a1]	NES
 749484a5d999730184edd0c5b1d234a841d08c63	H	Super Mari by Maikami (SMB1 Hack)	NES
-9c2562be31541ef7df69e4133daaa3e2531cdedf	U	Super Mario & Sonic 2 (Ch)	NES
+9c2562be31541ef7df69e4133daaa3e2531cdedf	U	Super Mario & Sonic 2 (Ch)	NES
 bf0ddfe1e564829c52d7aff0560721231994e786	U	Super Mario 14 (Unl)	NES
 9f9f52fd92b660721b0ccccab1d99fc22729b289	H	Super Mario 3 Challenge (SMB3 PAL Hack)	NES
 8a812f75451c88130424e39b4e38972dbbfa0b2a	H	Super Mario 4 (SMB1 Hack) [a1]	NES
@@ -18899,15 +18899,15 @@ fd7b1e21e33988714e0c6e5d881c40d11bc651cd	B	Swords and Serpents (U) [b1]	NES
 a737d3984b88328a5d5f9709547b931f99e3f32d	B	Swords and Serpents (U) [b2]	NES
 297d50d7296544ab74ccf019aca1869424b99932	B	Swords and Serpents (U) [o1]	NES
 77f4ea6ebcdd71a5dab45b014dd300458e625b19	B	Swords and Serpents (U) [o2]	NES
-592c8b6be5816ba771b4fc18ec6a72cfee06d2c7	G	T&C 2 - Thrilla's Surfari (U) [!]	NES
-55e8093bbbe53bd9d8d0d90952fcb6aeb9240b23	B	T&C 2 - Thrilla's Surfari (U) [b1]	NES
-846b6b442ec5532c53d198da7c7d5909c97aff3c	B	T&C 2 - Thrilla's Surfari (U) [b2]	NES
-6a101fb054fbe93b6c6ca33245e3f8b8710e45a8	B	T&C 2 - Thrilla's Surfari (U) [o1]	NES
-ec1ac46af157cbe49383402373ab04a483105980	B	T&C 2 - Thrilla's Surfari (U) [p1]	NES
-7114bc8b0aad3094e59ccedba2845c1c032b15cc	G	T&C Surf Design (U) [!]	NES
-a8d63aa540cf74d966b465036f9a423136c8536b	B	T&C Surf Design (U) [b1]	NES
-006c8859d1ab3429daa1228cd6161af3cdabb236	B	T&C Surf Design (U) [b2]	NES
-aff91bfb462c2aa10cc2d51ce93a04f050d7f84d	B	T&C Surf Design (U) [o1]	NES
+592c8b6be5816ba771b4fc18ec6a72cfee06d2c7	G	T&C 2 - Thrilla's Surfari (U) [!]	NES
+55e8093bbbe53bd9d8d0d90952fcb6aeb9240b23	B	T&C 2 - Thrilla's Surfari (U) [b1]	NES
+846b6b442ec5532c53d198da7c7d5909c97aff3c	B	T&C 2 - Thrilla's Surfari (U) [b2]	NES
+6a101fb054fbe93b6c6ca33245e3f8b8710e45a8	B	T&C 2 - Thrilla's Surfari (U) [o1]	NES
+ec1ac46af157cbe49383402373ab04a483105980	B	T&C 2 - Thrilla's Surfari (U) [p1]	NES
+7114bc8b0aad3094e59ccedba2845c1c032b15cc	G	T&C Surf Design (U) [!]	NES
+a8d63aa540cf74d966b465036f9a423136c8536b	B	T&C Surf Design (U) [b1]	NES
+006c8859d1ab3429daa1228cd6161af3cdabb236	B	T&C Surf Design (U) [b2]	NES
+aff91bfb462c2aa10cc2d51ce93a04f050d7f84d	B	T&C Surf Design (U) [o1]	NES
 fdbe721de58985fa9388e8dacaab2b9bbd2594bb	G	Taan Hak Fung Wan King Tank (Ch) [!]	NES
 07d463406d853ee92d196bedbf1c9d304fbfc442	T	Taan Hak Fung Wan King Tank (Ch) [T+Rus_Cool-Spot]	NES
 09f2fc1c42469212c6867ae1a8049716f59e8773	U	Table Tennis (Ch) (Wxn)	NES
@@ -19076,12 +19076,12 @@ cda500269bb162b0724f974b104cdc1573cd69dd	C	TaleSpin (U) [t4]	NES
 ba0f38461b625da1b4d2d87ffe2d425e4300c7bc	U	Tall Pixel Demo by Damian Yerrick (PD)	NES
 dab071f1829851c34483f02b1da737ee3ccd13b6	G	Tamura Koushou Mahjong Seminar (J) [!]	NES
 21047b05fe5387b1c08834439f8fb153735da6ff	B	Tamura Koushou Mahjong Seminar (J) [b1]	NES
-4a6a524759ca64e2983cb188ff439178075e304c	U	Tanespot by Jonathan & Hans Knektar (PD)	NES
+4a6a524759ca64e2983cb188ff439178075e304c	U	Tanespot by Jonathan & Hans Knektar (PD)	NES
 74bb1012db87e69d6deb37de19446c668886049b	U	Tang Bo Hu Dian Qiu Xiang (NJ069) (Ch)	NES
 61c396d07aae17b391121f07cf9ba92bec0ca736	U	Tang Mu Li Xian Ji (Ch)	NES
 eac84b8189e3ec871f6974376e158737c2a376c7	G	Tanigawa Kouji no Shougi Shinan II (J) [!]	NES
 9c3c6e0dd492ae7ea8f38224089a3f0b0b979880	G	Tanigawa Kouji no Shougi Shinan III (J) [!]	NES
-d061ab6624edb4fdaf4d2a1df75499d1238eccf5	H	Tank & Sub Mario (SMB1 Hack)	NES
+d061ab6624edb4fdaf4d2a1df75499d1238eccf5	H	Tank & Sub Mario (SMB1 Hack)	NES
 459a8d83e8d0d992a2685ce6da135a2e691ed1a6	H	Tank (Battle City Hack)	NES
 7f7888211e30b4dc296ee5addfbf8c62985bd9f9	U	Tank (Ch) (Wxn)	NES
 b5544d657fadef726ada69718407ab509dc69c47	U	Tank 1990 (Ch) [a1]	NES
@@ -19112,8 +19112,8 @@ e30f43730fd9b74ebe5dc5c88e5bc0f72dc19fef	H	Tank Duel (Chi Title) (Battle City Ha
 e5f6c4aebfa1123554d4e3ef984f0a7e0bfdaef8	H	Tank Duel 2 (Battle City Hack)	NES
 74ca37027c5e461fc88adc33fa428d832a5b225e	B	Tank Z by TOF (Battle City Hack) [o1]	NES
 007775f70b0726f7e20241484bf59e84cb35ce6f	H	Tank Z by TOF (Battle City Hack)	NES
-b5b01322bde1c061a76471fb544f90ecfbd0622b	T	Tanks & Milk (Nuts & Milk Hack) [T+Rus_Mitz]	NES
-832900808ad3add22e973fbb65408139abc0ed1a	H	Tanks & Milk (Nuts & Milk Hack)	NES
+b5b01322bde1c061a76471fb544f90ecfbd0622b	T	Tanks & Milk (Nuts & Milk Hack) [T+Rus_Mitz]	NES
+832900808ad3add22e973fbb65408139abc0ed1a	H	Tanks & Milk (Nuts & Milk Hack)	NES
 b07bd06624f56133c87610a8bb722be10e495147	G	Tantei Jinguuji Saburou - Toki no Sugiyuku Mama ni (J) [!]	NES
 2c0a885c049a4de54a31f51086cb20006e11beb8	U	Tantei Jinguuji Saburou - Yokohamakou Renzoku Satsujin Jiken (J) (VC)	NES
 be8ae507a738cc2059a598f2cfe68a0e848939c4	G	Tantei Jinguuji Saburou - Yokohamakou Renzoku Satsujin Jiken (J) [!]	NES
@@ -19446,7 +19446,7 @@ f0a930d6451dd861698c153e2e4af341b506942a	H	Tecmo Rose Bowl 2002 1-AA College Foo
 b7d7e496ca9dfa023d79dcc973208c1c63477125	G	Tecmo Super Bowl (U) [!]	NES
 09d7268535053f7ba16f94f4e4846a0d2705ee41	B	Tecmo Super Bowl (U) [b1]	NES
 4f197e5d60df3bb0df051e46614b3de55edd0d7d	B	Tecmo Super Bowl (U) [o1]	NES
-ac3da734fa5eda62df44ecfb8912c18cb0f6623f	H	Tecmo Super Bowl 1962 Edit by Denny, Jstout & Elway7 (Hack)	NES
+ac3da734fa5eda62df44ecfb8912c18cb0f6623f	H	Tecmo Super Bowl 1962 Edit by Denny, Jstout & Elway7 (Hack)	NES
 761290f53aa1bfee1f9ddabbbdc70482dd415d1c	H	Tecmo Super Bowl 1968 by Carther (Hack)	NES
 ea38b12e3cd3192d07637f32055ce1a3a82be32f	H	Tecmo Super Bowl 1968 Even Team - Online Tecmo Tourney Version (Hack)	NES
 6f4441535cc711207a204ee375bc7d0b535a9d19	H	Tecmo Super Bowl 1983-1984 - BO FB Offtackle Left (Hack)	NES
@@ -19502,7 +19502,7 @@ cab90185c6f732f922f915cada0e9010a1330f6a	H	Tecmo Super Bowl 2006 - AFC Champions
 ce0e7ecec10a711a0e3afc31155ef920adc28cb9	H	Tecmo Super Bowl 2006 by GRG (Hack)	NES
 b75b315ca3c96ec8a2632a0373928979c4aefeab	H	Tecmo Super Bowl 2006 v.2 by RBPD5015 (Hack)	NES
 59783d5c20f9f046738532d7323f5c2dadaae333	H	Tecmo Super Bowl 2006 v.final by mattjones18 (Hack)	NES
-9d2c88538919d6e1a2fc60215b721ff7d3e2b9b9	H	Tecmo Super Bowl 2006 v.update - Title Screen by mattjones18&andrewmarsh13 (Hack)	NES
+9d2c88538919d6e1a2fc60215b721ff7d3e2b9b9	H	Tecmo Super Bowl 2006 v.update - Title Screen by mattjones18&andrewmarsh13 (Hack)	NES
 40efbfe8bbb00f3db078fdcf522957653020fd4f	H	Tecmo Super Bowl 2006 v1 by drummer4god (Hack)	NES
 bc25eaf09228d5a1c6a0f692898509b1de119534	H	Tecmo Super Bowl 2006 v1 by mattjones18 (Hack)	NES
 95ddb60aaa75a8d2adb03c4f6d63dceca65dcadb	H	Tecmo Super Bowl 2006 v2 by drummer4god (Hack)	NES
@@ -19739,7 +19739,7 @@ bed34bf7c2bda653eda7a3eb1181c6a7c4cb0a65	H	Tecmo Super Bowl X Globe Bowl (Hack)
 10c4e09361a27a527dd4337ff62a49409670343c	H	Tecmo Super Bowl X IHSAA (Hack)	NES
 058e6dd332cc20282b87b001ee554f01666a939b	H	Tecmo Super Bowl X Mutant League (Hack)	NES
 a2ddbeb71c07961cf875f0f01a3eca1b1dc7dd8f	H	Tecmo Super Bowl X Olympics (Hack)	NES
-3f5d28fe0591911ff8b60b59a80502572407af62	H	Tecmo Super Bowl X World & USFL (Hack)	NES
+3f5d28fe0591911ff8b60b59a80502572407af62	H	Tecmo Super Bowl X World & USFL (Hack)	NES
 07e33fb37a8ef1ef32582fc3ade1a1d42750c891	H	Tecmo Super Bowl X World League (Hack)	NES
 1dccdc47be881eda06fc80bb6ee95b769177a814	H	Tecmo Super Bowl X XFL (Hack)	NES
 30b6033e6ef01cbd8099beff41a10dfeda91436e	H	Tecmo Super Bowl XFL - Updated by GRG (Hack)	NES
@@ -20036,7 +20036,7 @@ d9e05cd3cb72d02352ce907f65137c161f000d51	H	Tenchi wo Kurau II - Star and Rainbow
 606b6c26886e37f674ba0b076825a0c18e51b838	H	Tenchi wo Kurau II - Valiant General Edition by lmjny (Hack)	NES
 947659dcc3aa847b7abcd701e7328c13aff76941	H	Tenchi wo Kurau II - Weiruwei's Final Edition (Hack)	NES
 7ce8f14c477da953cb66f7f0bfb89772de574e8f	H	Tenchi wo Kurau II - Woman Edition (Hack)	NES
-53bbb3a3def86ddf00d763c1ed171282d10dd29b	H	Tenchi wo Kurau II - Wu Jin & Guo Tai (Hack)	NES
+53bbb3a3def86ddf00d763c1ed171282d10dd29b	H	Tenchi wo Kurau II - Wu Jin & Guo Tai (Hack)	NES
 81be25d041c91f81e1b6df190b6baf886ee9a75c	H	Tenchi wo Kurau II - Yellow Turban Story (Hack)	NES
 17c71e03f6423c5f706e616182b1eea779913fd7	H	Tenchi wo Kurau II - Yuan Luzhi Story (Hack)	NES
 fa8396969fd18af4606f9a6d36cadc45eb747987	H	Tenchi wo Kurau II - Yuan Shao Story (Hack)	NES
@@ -20252,16 +20252,16 @@ c697f7159f401fa736320a25a4f1b06233198f81	B	Three Stooges (U) [o1]	NES
 2d2dd56f453715fc2fd8d0abf95bc2459f1d6082	B	Three Stooges (U) [o2]	NES
 8c30cfc34cf89bae61591f599f6f24b3b255cb00	B	Three Stooges (U) [o3]	NES
 1a618d99702421566c04e14096bf23ab25207f83	B	Three Stooges (U) [o4]	NES
-5203dd2cbaafba9e5d4581a8252f2d47413902d8	G	Thunder & Lightning (U) [!]	NES
-537819f97ddad1210614b59bffc81a6ef045a9ed	B	Thunder & Lightning (U) [b1]	NES
-cec96de01564f5bd14ace8668cd616f5f54094c8	B	Thunder & Lightning (U) [b1][o1]	NES
-2eef9579430f9c00a59504715ebe3f4b3b4fbc4f	B	Thunder & Lightning (U) [b1][o2]	NES
-0a7c1edf9d2b26497de3aec1aa67a600795b72ca	B	Thunder & Lightning (U) [b2]	NES
-e6a90c84a3bd1e6c4e34d08df3ef4ff74c2206a3	B	Thunder & Lightning (U) [b3]	NES
-2ea8b553bda94064f8142e8e2ea1d258db857da7	B	Thunder & Lightning (U) [b4]	NES
-f04edfb835d9b14827f2e3359c81b7678b16b71b	B	Thunder & Lightning (U) [b5]	NES
-da657ecdd900b9b0d4ddc0473b9e9a92624d0659	B	Thunder & Lightning (U) [b6]	NES
-468c6e236ddcab75bdc31e18f1731ffa52a62ade	C	Thunder & Lightning (U) [t1]	NES
+5203dd2cbaafba9e5d4581a8252f2d47413902d8	G	Thunder & Lightning (U) [!]	NES
+537819f97ddad1210614b59bffc81a6ef045a9ed	B	Thunder & Lightning (U) [b1]	NES
+cec96de01564f5bd14ace8668cd616f5f54094c8	B	Thunder & Lightning (U) [b1][o1]	NES
+2eef9579430f9c00a59504715ebe3f4b3b4fbc4f	B	Thunder & Lightning (U) [b1][o2]	NES
+0a7c1edf9d2b26497de3aec1aa67a600795b72ca	B	Thunder & Lightning (U) [b2]	NES
+e6a90c84a3bd1e6c4e34d08df3ef4ff74c2206a3	B	Thunder & Lightning (U) [b3]	NES
+2ea8b553bda94064f8142e8e2ea1d258db857da7	B	Thunder & Lightning (U) [b4]	NES
+f04edfb835d9b14827f2e3359c81b7678b16b71b	B	Thunder & Lightning (U) [b5]	NES
+da657ecdd900b9b0d4ddc0473b9e9a92624d0659	B	Thunder & Lightning (U) [b6]	NES
+468c6e236ddcab75bdc31e18f1731ffa52a62ade	C	Thunder & Lightning (U) [t1]	NES
 ff9a9dadbc051dba184bb2b75898d0b1e2003fa9	H	Thunder Mario v0.1 (SMB1 Hack) [a1]	NES
 ca34b25a91844a3553460f5c8a2c9c965aa2aa5c	H	Thunder Mario v0.1 (SMB1 Hack)	NES
 e14b6ba27655313943a2bb440aa753bb6ca6fed5	U	Thunder Warrior (Unl)	NES
@@ -20288,7 +20288,7 @@ cb0899ae2d9a0ad60edd0ada2b0a62c79be46893	U	Thwaite V0.03 by Damian Yerrick (2011
 276a18af8b307acd1edf98594e29710eeccf1c8c	U	Tian Long Ba Bu (NJ035) (Ch)	NES
 cac9a7bb24890cc9cd7ab020581a5b609e1e1d0d	U	Tian Wang Xiang Mo Zhuan (Ch) (Decrypted)	NES
 ab39d3fe1be075db59fe77abfb225249cfefcf90	U	Tiao Wu Tan (Ch)	NES
-93e851e78f811175edb368d37dd7060c82fcfc3a	T	Tic & Tac 2 - Rangers du Risque (Chip 'n Dale 2 Hack) [T+Fre]	NES
+93e851e78f811175edb368d37dd7060c82fcfc3a	T	Tic & Tac 2 - Rangers du Risque (Chip 'n Dale 2 Hack) [T+Fre]	NES
 9bff3f91adf6fce47baae595be44fcd9c906884b	U	Tic-Tac by Sly Dog Studios (PD)	NES
 3bdb74f3a9f0620ca6581a7ad8a9864b810e3772	U	Tic-Tac XO by Sly Dog Studios (PD)	NES
 15ac45742f1830dd6ba727cf41a4a9d9676a6d2a	B	Tie Fighter (Older) (SMB1 Hack) [b1]	NES
@@ -20430,7 +20430,7 @@ b4bc7b0867d9ecc88fe89bb6b4c564c495455363	H	Toaster Bros (SMB1 Hack)	NES
 6e89817eb2531c4260120a609b89de354a5fd39d	H	Tobi (SMB1 Hack)	NES
 b01ede8636ad9642476c09541b85ffb3d6bbb11a	U	Tobidase Daisakusen (FDS Conversion)	NES
 c1307b51a96018211ef8105cbbbe90cd3e16a67b	H	Todos Contra TCHECO 2.0 by Macbee (Rockin' Kats Hack)	NES
-bf27c3c6ea6f06ff6d3071eb0e105608038e8052	U	ToeJam & Earl Title Screen (PD)	NES
+bf27c3c6ea6f06ff6d3071eb0e105608038e8052	U	ToeJam & Earl Title Screen (PD)	NES
 3d03d92a8f68a8d0619de48b710c9d514663b63e	H	Toilet Mario (SMB1 Hack) [a1]	NES
 8af0f78307042ecb8d938600b83daca6f76f004c	H	Toilet Mario (SMB1 Hack)	NES
 f11c1240a664c5424a8c7eba7eeb42343c792350	U	Toita Basketball (Unl)	NES
@@ -20464,30 +20464,30 @@ aef80dedb58085fc4b779e3747d69492f3b666bf	G	Tokoro San no Mamoru mo Semeru mo (J)
 b42120ffa11f8c809db4e6dd0ba11a8eebcd65bd	H	Tokoro San no Mamoru mo Semeru mo (Saitama Hack)	NES
 ecf1fd4135beebe35c7ca8036e1a085dacdc4f5d	U	Tokumaru Raycaster 00 (PD)	NES
 2fca78b0d4a436579b3ed6c72dfe3888f3154644	U	Tokumaru Raycaster 01 (PD)	NES
-d67f0beeb7603c224177264f13fc4b2d08ad679b	G	Tom & Jerry (E) [!]	NES
-7e1048cd8d868d1df56ed613f660b8513a6d71ea	T	Tom & Jerry (J) [T+Chi_MS emumax]	NES
-709016db8902eb4c6a99cd462fd1627babbbfbe4	U	Tom & Jerry (J)	NES
-d6ebfe209995e8db14e82df952e8c5b10b025460	G	Tom & Jerry (U) [!]	NES
-8620b79e4f0087a6a44ac3c31d2746292e573d49	B	Tom & Jerry (U) [b1]	NES
-201867ffc992c4038021d8510fe8beea4f3e305a	B	Tom & Jerry (U) [b2]	NES
-936d84aafd680e4b52cfd006fd0f3ec8abfa2c24	B	Tom & Jerry (U) [b3]	NES
-fe4ed3c8f29cbdb649a233b85e224f04f6a7f533	B	Tom & Jerry (U) [o1]	NES
-6f8965f2e332e96a43de03ccca6a12b982f4a95a	B	Tom & Jerry (U) [p1]	NES
-7e984e9696e8d089ad870c68944ff2b95f053732	T	Tom & Jerry (U) [p1][T+Rus_2R Team]	NES
-623f8b48b17e34653a0d9cd1db0b0facb8429b8f	B	Tom & Jerry (U) [p2]	NES
-8ecbe4a0a6b94542409c0990357de968e2e85f22	T	Tom & Jerry (U) [T+Ara_Hisoka]	NES
-22c95df30f90c68b0d64b412029f9e905195bca1	T	Tom & Jerry (U) [T+Pol]	NES
-28ceb78e1a2f2646bb47a8c5ed293605a7fa8a5f	T	Tom & Jerry (U) [T+Rus]	NES
-c3a972e3cd3f9832f7f46756d68744952e1585e9	C	Tom & Jerry (U) [t1]	NES
-168e14e08574662823d6e4604540225205e29301	U	Tom & Jerry 3 (Unl)	NES
+d67f0beeb7603c224177264f13fc4b2d08ad679b	G	Tom & Jerry (E) [!]	NES
+7e1048cd8d868d1df56ed613f660b8513a6d71ea	T	Tom & Jerry (J) [T+Chi_MS emumax]	NES
+709016db8902eb4c6a99cd462fd1627babbbfbe4	U	Tom & Jerry (J)	NES
+d6ebfe209995e8db14e82df952e8c5b10b025460	G	Tom & Jerry (U) [!]	NES
+8620b79e4f0087a6a44ac3c31d2746292e573d49	B	Tom & Jerry (U) [b1]	NES
+201867ffc992c4038021d8510fe8beea4f3e305a	B	Tom & Jerry (U) [b2]	NES
+936d84aafd680e4b52cfd006fd0f3ec8abfa2c24	B	Tom & Jerry (U) [b3]	NES
+fe4ed3c8f29cbdb649a233b85e224f04f6a7f533	B	Tom & Jerry (U) [o1]	NES
+6f8965f2e332e96a43de03ccca6a12b982f4a95a	B	Tom & Jerry (U) [p1]	NES
+7e984e9696e8d089ad870c68944ff2b95f053732	T	Tom & Jerry (U) [p1][T+Rus_2R Team]	NES
+623f8b48b17e34653a0d9cd1db0b0facb8429b8f	B	Tom & Jerry (U) [p2]	NES
+8ecbe4a0a6b94542409c0990357de968e2e85f22	T	Tom & Jerry (U) [T+Ara_Hisoka]	NES
+22c95df30f90c68b0d64b412029f9e905195bca1	T	Tom & Jerry (U) [T+Pol]	NES
+28ceb78e1a2f2646bb47a8c5ed293605a7fa8a5f	T	Tom & Jerry (U) [T+Rus]	NES
+c3a972e3cd3f9832f7f46756d68744952e1585e9	C	Tom & Jerry (U) [t1]	NES
+168e14e08574662823d6e4604540225205e29301	U	Tom & Jerry 3 (Unl)	NES
 67e2781b74c0771c377bfd11308662ab906e7a09	G	Tom Sawyer no Bouken (J) [!]	NES
 da0a506fda6aba44a56ac998b613176a7b8f8919	T	Tom Sawyer no Bouken (J) [T+Rus_Guyver]	NES
 a506f23a0f5905fe85051e14e9ad1e0e181163ed	C	Tom Sawyer no Bouken (J) [t1]	NES
 2ffc983e94e5ec9fc654052a442297c2b1ab24a1	H	Tom Servo (Megaman III Hack)	NES
-9c1de5cd49641d025d75c4024ee303ed0135673e	G	Tombs & Treasure (U) [!]	NES
-582a21a4e41a0e844d66cd3c7e75bc75939c0cb5	B	Tombs & Treasure (U) [o1]	NES
-2e819d9c061ab801c931ef547ce737de8f92403a	B	Tombs & Treasure (U) [o2]	NES
-6a1536f70666a52075e967ed24b1e48cbd7fa8a1	C	Tombs & Treasure (U) [t1]	NES
+9c1de5cd49641d025d75c4024ee303ed0135673e	G	Tombs & Treasure (U) [!]	NES
+582a21a4e41a0e844d66cd3c7e75bc75939c0cb5	B	Tombs & Treasure (U) [o1]	NES
+2e819d9c061ab801c931ef547ce737de8f92403a	B	Tombs & Treasure (U) [o2]	NES
+6a1536f70666a52075e967ed24b1e48cbd7fa8a1	C	Tombs & Treasure (U) [t1]	NES
 ea4f4ddf8d26245a0a16078f913d0074a080261c	U	Tommy T's Play Me Sound Editor (PD)	NES
 3b287cb938e58a77c6d5aefdfb47fe9027c17055	G	Toobin' (Tengen) [!]	NES
 df8f7e23d1cca410226951d89fd6d4cdbd8aaf4e	B	Toobin' (Tengen) [b1]	NES
@@ -20520,11 +20520,11 @@ ee7747f09f98e6fc1717652a7a485982f5b2d6d6	G	Top Gun - The Second Mission (U) [!]
 3dfdd953c496287d95c38a5e8653b6fdaadc0ede	B	Top Gun - The Second Mission (U) [o1]	NES
 9f92f4d56710b97b79525b7d055041a7ff302697	H	Top Gun Altered (Hack)	NES
 334e4ff5070846b5db6f1f0d1eba80cb1a1141c8	U	Top Gun III (Unl)	NES
-d3de04f554a5ae57750f12aedc810c0c3db3d2ea	G	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [!]	NES
-1dc84f0db89649761867fb52711d31566ff26883	B	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [b1]	NES
-e42950f3b54f3368e3fdc54e03bfe9e728334561	B	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [b2]	NES
-ef32f202aa300422587ce967621b3a7afeb9065a	B	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [b3]	NES
-50a9b1a803d4c5c55799657c340e942dc976e3f4	B	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [o1]	NES
+d3de04f554a5ae57750f12aedc810c0c3db3d2ea	G	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [!]	NES
+1dc84f0db89649761867fb52711d31566ff26883	B	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [b1]	NES
+e42950f3b54f3368e3fdc54e03bfe9e728334561	B	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [b2]	NES
+ef32f202aa300422587ce967621b3a7afeb9065a	B	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [b3]	NES
+50a9b1a803d4c5c55799657c340e942dc976e3f4	B	Top Players' Tennis - Featuring Chris Evert & Ivan Lendl (U) [o1]	NES
 d4d46dc4d99459c8dd57f30eeb16aa03358540f3	G	Top Rider (J) [!]	NES
 fd4d0f89989a257c35fc243eeb6f5c6d3f36b88a	B	Top Rider (J) [b1]	NES
 cf633f8b8571bead545ed8d72da9b22771c1b255	H	Top Rider (J) [hM04]	NES
@@ -20588,26 +20588,26 @@ d67238510c7f9b72eec13d5269a0158ffa975055	C	Toxic Crusaders (U) [t1]	NES
 aad697dda0e00fd508d0e9469660194701f25a2a	H	Toxic Crusaders Debug by dragon2snow (Hack)	NES
 7c748e5a83fb07905cadc427d1909a04af8c51ec	H	Toy Story (Unl) [hM219]	NES
 e3a08bd0e03b4b395410ec1ccdd9c0f49400a410	U	Toy Story (Unl)	NES
-f036a0ba914cac462525480fe583e2a7871d192c	B	Track & Field (PC10) [b1]	NES
-95f499762d567ca9c8373cff73253937529baeab	U	Track & Field (PC10)	NES
-df8425d96b3ac613eec604d66b32e91b001488d0	G	Track & Field (U) [!]	NES
-ac29221519765ec4a10e5f6ef5549dd1393436c7	B	Track & Field (U) [b1]	NES
-5a7c68d213dd96b2e4f4cedd3de4165c711ba945	B	Track & Field (U) [o1]	NES
-c2d8a7573451d64681d2baa10b83e7d1e3c1c04a	B	Track & Field (U) [p1]	NES
-abee2b7e0513ba2e55a522a0105e461f2f5cb267	T	Track & Field (U) [T+Bra100%_BRGames]	NES
-70b74fc1f7623f133a7f49f9e1b54418164f4056	G	Track & Field II (E) [!]	NES
-29bd3871447df2ad02a5ab1ec2c9256e85a5c359	G	Track & Field II (U) (PRG0) [!]	NES
-316a53f846cdbf55c021f8e9497f06e2b08245e4	B	Track & Field II (U) (PRG0) [b1]	NES
-97e6822b57a61ed4f1f763582a1fb2f556f44632	B	Track & Field II (U) (PRG0) [b2]	NES
-921d31753740408fe8b3cce41e36609ada225068	B	Track & Field II (U) (PRG0) [b3]	NES
-817ca6d0d790458dfa248763170dd05b0408ab25	B	Track & Field II (U) (PRG0) [b4]	NES
-16994d0c5085bc91e0768b39c462c8920fdfdb26	B	Track & Field II (U) (PRG0) [o1]	NES
-dda552f0a6b95dbcc891cff98220fad2fd08eaad	B	Track & Field II (U) (PRG0) [o2]	NES
-62ce1b905f5bcf37d65c6126f962a8088c1ce171	T	Track & Field II (U) (PRG0) [T+Bra1.0_ROMHackBR]	NES
-533cd4effd292961c38d5d3bec9bf4bab4acaa32	T	Track & Field II (U) (PRG0) [T+Swe1.0_TheTranslator]	NES
-a3ca238ef9744175b1bdc70bcdb70aafe97239bc	T	Track & Field II (U) (PRG0) [T+Swe1.0_TheTranslator][a1]	NES
-768e8707b2af9167cfd2851c968988185d463f98	G	Track & Field II (U) (REVA) [!]	NES
-830d9875c723a15fb322b4f12a750f618268e80b	G	Track & Field in Barcelona (E) [!]	NES
+f036a0ba914cac462525480fe583e2a7871d192c	B	Track & Field (PC10) [b1]	NES
+95f499762d567ca9c8373cff73253937529baeab	U	Track & Field (PC10)	NES
+df8425d96b3ac613eec604d66b32e91b001488d0	G	Track & Field (U) [!]	NES
+ac29221519765ec4a10e5f6ef5549dd1393436c7	B	Track & Field (U) [b1]	NES
+5a7c68d213dd96b2e4f4cedd3de4165c711ba945	B	Track & Field (U) [o1]	NES
+c2d8a7573451d64681d2baa10b83e7d1e3c1c04a	B	Track & Field (U) [p1]	NES
+abee2b7e0513ba2e55a522a0105e461f2f5cb267	T	Track & Field (U) [T+Bra100%_BRGames]	NES
+70b74fc1f7623f133a7f49f9e1b54418164f4056	G	Track & Field II (E) [!]	NES
+29bd3871447df2ad02a5ab1ec2c9256e85a5c359	G	Track & Field II (U) (PRG0) [!]	NES
+316a53f846cdbf55c021f8e9497f06e2b08245e4	B	Track & Field II (U) (PRG0) [b1]	NES
+97e6822b57a61ed4f1f763582a1fb2f556f44632	B	Track & Field II (U) (PRG0) [b2]	NES
+921d31753740408fe8b3cce41e36609ada225068	B	Track & Field II (U) (PRG0) [b3]	NES
+817ca6d0d790458dfa248763170dd05b0408ab25	B	Track & Field II (U) (PRG0) [b4]	NES
+16994d0c5085bc91e0768b39c462c8920fdfdb26	B	Track & Field II (U) (PRG0) [o1]	NES
+dda552f0a6b95dbcc891cff98220fad2fd08eaad	B	Track & Field II (U) (PRG0) [o2]	NES
+62ce1b905f5bcf37d65c6126f962a8088c1ce171	T	Track & Field II (U) (PRG0) [T+Bra1.0_ROMHackBR]	NES
+533cd4effd292961c38d5d3bec9bf4bab4acaa32	T	Track & Field II (U) (PRG0) [T+Swe1.0_TheTranslator]	NES
+a3ca238ef9744175b1bdc70bcdb70aafe97239bc	T	Track & Field II (U) (PRG0) [T+Swe1.0_TheTranslator][a1]	NES
+768e8707b2af9167cfd2851c968988185d463f98	G	Track & Field II (U) (REVA) [!]	NES
+830d9875c723a15fb322b4f12a750f618268e80b	G	Track & Field in Barcelona (E) [!]	NES
 d974155c893375bdc5701e18b2feac774c4a59e5	B	TradeMark Mario (SMB1 Hack) [o1]	NES
 1263a4459dfa4722581a46d94bf1429f1465f683	H	TradeMark Mario (SMB1 Hack)	NES
 c953cb58d25ed19b477779b81b1962bb25e06cdb	H	Tranny Tramps - The Family Jewels (Double Dragon III Hack)	NES
@@ -21002,7 +21002,7 @@ f6642a2ee4fd9cf1a8c4f991d9e427627fe5ea3b	U	Variable Width Font Demo v0.01 by Dam
 8548c230871abaf39c965bc3f87488ec1ca13fff	U	Variable Width Font Demo v0.02 by Damian Yerrick+Blargg (PD)	NES
 582450682d233eb3b1279b1e11a0e0137602be6b	U	Variable Width Font Demo v0.03 by Damian Yerrick+Blargg (PD)	NES
 afd24e18c113309cbc0917c73fdb2c7865511990	U	VBL Flag Clearing Timing Test by Shay Green (6 Nov 2005) (PD)	NES
-6e1faa816c80462f5ee293c1847ee829683ea8a9	U	VBL Flag Operation & PPU Timing Test by Shay Green (7 Nov 2005) (PD)	NES
+6e1faa816c80462f5ee293c1847ee829683ea8a9	U	VBL Flag Operation & PPU Timing Test by Shay Green (7 Nov 2005) (PD)	NES
 3aef088d11ce1b6b8b2db07aba9aa79b6d8526e3	U	VBL Timing Test by Shay Green (6 Nov 2005) (PD)	NES
 45585124fb0ba1b93995c4c15ec48382c90af165	U	Vectest3 (PD)	NES
 2d55988a0e29604c90c844df15da34764688fbf0	U	Vector Demo (PD)	NES
@@ -21094,7 +21094,7 @@ a99e0bc1b9087b3f2540c1b18425af6083e74f0e	T	Volleyball (UE) [T+FreBeta_ks151]	NES
 2b711242f71bdee2a9ec5045c4863b2b030bbbd8	T	Volleyball (UE) [T+Ita1.0_ZombiKiller]	NES
 028bfd4d3228343a992cecf5fdd9d4805d8a3cc2	G	Volshebnaya Palitra (R) [!]	NES
 58832f2ce7232a8e476b5376f533300eb6b702de	U	Vote for Oniken on Greenlight (PD)	NES
-c81a649f330e3de4784d94e5ea00b502a207716c	U	VRAM Access & Internal Read Buffer Operation Test by Shay Green (15 Sep 2005) (PD)	NES
+c81a649f330e3de4784d94e5ea00b502a207716c	U	VRAM Access & Internal Read Buffer Operation Test by Shay Green (15 Sep 2005) (PD)	NES
 475ec5c8f610793d2ec555021e18f9230b151d63	U	VRC6 Sound Demo by Siudym (PD) (PAL)	NES
 3e6154c79f27c5c9b2d4eba11c78570c9c5425cb	H	VS. Airman (SMB1 Hack)	NES
 f9db1a17425dcd34a7bc68c0f86d5c338e58e795	B	VS. Blink (VS SMB1 Hack) [o1]	NES
@@ -21190,9 +21190,9 @@ abae2b3ed342bc069abee73137744e5b36b4b0ab	B	Wall Street Kid (U) [b1]	NES
 7aca04613ec4e14df9c954f3e08605b5d981fadc	B	Wall Street Kid (U) [o2]	NES
 3b07de583fdf353d0e78f46b161e1e0c955b45d1	B	Wall Street Kid (U) [o3]	NES
 1f5b5b4552ad51bc07a8aa99345b25190527995e	B	Wall Street Kid (U) [o4]	NES
-7d60a48aa52afcdf64ea9b249ade7cc8e83301c6	U	Wally Bear & the No Gang (AVE) (Prototype)	NES
-cd1ee26c0cef8c48b72cc4000ac7a577b8c4c0b5	G	Wally Bear & the No Gang (AVE) [!]	NES
-6603d08ee41b39350184cdf03537eb36162e2f01	B	Wally Bear & the No Gang (AVE) [o1]	NES
+7d60a48aa52afcdf64ea9b249ade7cc8e83301c6	U	Wally Bear & the No Gang (AVE) (Prototype)	NES
+cd1ee26c0cef8c48b72cc4000ac7a577b8c4c0b5	G	Wally Bear & the No Gang (AVE) [!]	NES
+6603d08ee41b39350184cdf03537eb36162e2f01	B	Wally Bear & the No Gang (AVE) [o1]	NES
 dd8c8a387158230df68e20bd90b6c729589a5116	H	Waluigi's Adventure by Googie (SMB1 Hack) [a1]	NES
 0de42862be2fea4d569700db9a01ef7745e2d97a	H	Waluigi's Adventure by Googie (SMB1 Hack) [a2]	NES
 a9c35c50a1a447728621fffbad42f32a521c09ed	B	Waluigi's Adventure by Googie (SMB1 Hack) [b1]	NES
@@ -21267,7 +21267,7 @@ ad680a185bed1fdb8f6f885deaad6ed3ae565ea1	H	Waterboy, The (Harry's Legend Hack)	N
 dc88673fb3defcf60fcbbc5b2968dab20a188ad8	U	WAV2NES Sample (PD)	NES
 831595bf54bf5dc41031358b87c7a3f30b2da765	U	Wavetable5 Demo by Blargg (PD)	NES
 0b8582204c535c3b9c7d1b89342f22efb455a757	U	Wavetable6 4-Channel Music Demo by Blargg (PD)	NES
-f5391038938d1c8577e572f0480ebf600bfd6482	U	Wavy & Stretch Demo V0.3 by Chris Covell (PD)	NES
+f5391038938d1c8577e572f0480ebf600bfd6482	U	Wavy & Stretch Demo V0.3 by Chris Covell (PD)	NES
 c3c8bc28a11c11e45d48bdb8dd6b03d9e1974c47	U	Way Out (Ch) (Wxn)	NES
 2470ce28d144f6d1320a81e8f1faeabd07bed462	G	Wayne Gretzky Hockey (U) [!]	NES
 2be91df36a683e1e09f3f897ba5170fff22f2ac7	B	Wayne Gretzky Hockey (U) [b1]	NES
@@ -21385,14 +21385,14 @@ d3040b0e2e70f426236cf76e3dbc7bc23967eb28	T	Willow (U) [T+Fre100]	NES
 5e108abf60f2f8467c5a7f962cf11f0702c370a5	T	Willow (U) [T+Rus_arsen13,Tigran]	NES
 c6639a7b826fc3c85167334d7e3902db896a4779	T	Willow (U) [T-Fre010]	NES
 3352a0493d4d40de75b3036ee01133e2fbe8e602	C	Willow (U) [t1]	NES
-d94557741ae526a0cc7b4a3be5aa4a825baf9a85	G	Wily & Light no Rockboard - That's Paradise (J) [!]	NES
-be4507a270fb3406cd483f2fd4e34da74a22d7a7	B	Wily & Light no Rockboard - That's Paradise (J) [b1]	NES
-f44c84c330d5d84ec5410ad81e4300e4be9578a9	B	Wily & Light no Rockboard - That's Paradise (J) [b1][o1]	NES
-40bce9f07c099e021bc1a7c73e5cd81de026c630	T	Wily & Light no Rockboard - That's Paradise (J) [T+Eng1.1(Megaman)_Interordi]	NES
-0cedcf804a8fce45e56ec7f4d8be454838589cc2	T	Wily & Light no Rockboard - That's Paradise (J) [T+Eng1.1(Rockman)_Interordi]	NES
-8166ad98dc32344e803d662333bda1b2acc29035	T	Wily & Light no Rockboard - That's Paradise (J) [T-Eng(Megaman)_Interordi]	NES
-479364d2a6bb8db8c3343ce813157a8024a2ab92	T	Wily & Light no Rockboard - That's Paradise (J) [T-Eng(Rockman)_Interordi]	NES
-35993e347372d4496ccc387b5a29f71a1f0bdba2	T	Wily & Light no Rockboard - That's Paradise (J) [T-Eng0.10_Interordi]	NES
+d94557741ae526a0cc7b4a3be5aa4a825baf9a85	G	Wily & Light no Rockboard - That's Paradise (J) [!]	NES
+be4507a270fb3406cd483f2fd4e34da74a22d7a7	B	Wily & Light no Rockboard - That's Paradise (J) [b1]	NES
+f44c84c330d5d84ec5410ad81e4300e4be9578a9	B	Wily & Light no Rockboard - That's Paradise (J) [b1][o1]	NES
+40bce9f07c099e021bc1a7c73e5cd81de026c630	T	Wily & Light no Rockboard - That's Paradise (J) [T+Eng1.1(Megaman)_Interordi]	NES
+0cedcf804a8fce45e56ec7f4d8be454838589cc2	T	Wily & Light no Rockboard - That's Paradise (J) [T+Eng1.1(Rockman)_Interordi]	NES
+8166ad98dc32344e803d662333bda1b2acc29035	T	Wily & Light no Rockboard - That's Paradise (J) [T-Eng(Megaman)_Interordi]	NES
+479364d2a6bb8db8c3343ce813157a8024a2ab92	T	Wily & Light no Rockboard - That's Paradise (J) [T-Eng(Rockman)_Interordi]	NES
+35993e347372d4496ccc387b5a29f71a1f0bdba2	T	Wily & Light no Rockboard - That's Paradise (J) [T-Eng0.10_Interordi]	NES
 49773466c4296d77f0697c073ed66d4fe3375459	G	Win, Lose or Draw (U) [!]	NES
 8f37e6b4dbbfcbb1c9b4e1620f0dd459837e0e06	B	Win, Lose or Draw (U) [b1]	NES
 8993dafeff608f9c2f9a4508ac9e334795ae87be	B	Win, Lose or Draw (U) [o1]	NES
@@ -21432,17 +21432,17 @@ f324f1977d4b7840c37821990247993c26fa46fc	G	Wizardry - Proving Grounds of the Mad
 9a7adb06a54e7bccb74583a6217b47e5a9525520	B	Wizardry II - Llylgamyn no Densetsu (J) [b1]	NES
 56fbae974686e83054fafe06e9d8a2b6bbb82ce9	B	Wizardry II - Llylgamyn no Densetsu (J) [b2]	NES
 026ae09c426d6eb689270b384349f20890578a82	G	Wizardry III - Diamond no Kishi (J) [!]	NES
-61ff5043afb71553b21f04378b0e9f3179b5ef81	G	Wizards & Warriors (E) [!]	NES
-5c135a7971013cf6e3a2243bcdd6938cf5ba4b5b	G	Wizards & Warriors (U) (PRG0) [!]	NES
-5c8df2859ddc204537fd83cadcee540faacf175e	B	Wizards & Warriors (U) (PRG0) [o1]	NES
-59e36195a3fb2a3d5fd3db02cedb0e71b54bb3cd	T	Wizards & Warriors (U) (PRG0) [T+Rus_Guyver]	NES
-f1e061a739ed0a1963a357c8df3f19fffd9b77c3	G	Wizards & Warriors (U) (PRG1) [!]	NES
-c6f1bed4cf59c155cd8e03109cefc0f451426450	G	Wizards & Warriors III - Kuros - Visions of Power (E) [!]	NES
-9c04e7357e5b39cfd9d0a119c52102197b4a1be0	G	Wizards & Warriors III - Kuros - Visions of Power (U) [!]	NES
-f4c54e865c9b76e7b96045d285a0b8a81a1e8095	B	Wizards & Warriors III - Kuros - Visions of Power (U) [b1]	NES
-5a5063fa947b0755dfb5f8313e6b7cd0384bb424	B	Wizards & Warriors III - Kuros - Visions of Power (U) [b2]	NES
-7f2093ea1e427e54b42ef0e607f64c0cc4bce2d7	B	Wizards & Warriors III - Kuros - Visions of Power (U) [o1]	NES
-f12e91ee96a101aad014bda73933a053219a33c3	C	Wizards & Warriors III - Kuros - Visions of Power (U) [t1]	NES
+61ff5043afb71553b21f04378b0e9f3179b5ef81	G	Wizards & Warriors (E) [!]	NES
+5c135a7971013cf6e3a2243bcdd6938cf5ba4b5b	G	Wizards & Warriors (U) (PRG0) [!]	NES
+5c8df2859ddc204537fd83cadcee540faacf175e	B	Wizards & Warriors (U) (PRG0) [o1]	NES
+59e36195a3fb2a3d5fd3db02cedb0e71b54bb3cd	T	Wizards & Warriors (U) (PRG0) [T+Rus_Guyver]	NES
+f1e061a739ed0a1963a357c8df3f19fffd9b77c3	G	Wizards & Warriors (U) (PRG1) [!]	NES
+c6f1bed4cf59c155cd8e03109cefc0f451426450	G	Wizards & Warriors III - Kuros - Visions of Power (E) [!]	NES
+9c04e7357e5b39cfd9d0a119c52102197b4a1be0	G	Wizards & Warriors III - Kuros - Visions of Power (U) [!]	NES
+f4c54e865c9b76e7b96045d285a0b8a81a1e8095	B	Wizards & Warriors III - Kuros - Visions of Power (U) [b1]	NES
+5a5063fa947b0755dfb5f8313e6b7cd0384bb424	B	Wizards & Warriors III - Kuros - Visions of Power (U) [b2]	NES
+7f2093ea1e427e54b42ef0e607f64c0cc4bce2d7	B	Wizards & Warriors III - Kuros - Visions of Power (U) [o1]	NES
+f12e91ee96a101aad014bda73933a053219a33c3	C	Wizards & Warriors III - Kuros - Visions of Power (U) [t1]	NES
 175b452b31adac390d5a36c654aaf4de49ec19c9	B	Wizzy (Formation Z Hack) [o1]	NES
 eae3e42bc9b02382207f39edfd71b77b5228c4d4	B	Wizzy (Formation Z Hack) [o2]	NES
 2f416726d94f7541709b61a1f1e8a4ae8d2ef14d	B	Wizzy (Formation Z Hack) [o3]	NES
@@ -21993,7 +21993,7 @@ f52a4b77d37156db3d470b7a2acf1625d041520c	U	Zero Pong V3.0 by Zero-Soul (PD)	NES
 9119581a22ac8fe03a546f0088132eaa55692abd	U	Zhan Guo Qun Xiong Chuan (Ch)	NES
 349e2e47a59a14151c190fd687de973f82ea8c69	B	Zhan Guo Qun Xiong Zhuan (Ch) [b1]	NES
 9680484cd6a1aba6164bb07a7b556c1a90b1d9d7	U	Zhan Guo Qun Xiong Zhuan (Ch)	NES
-54b371871d45aad6219e6394ed379dd9db24b6b8	U	Zhan Guo Si Chuan Sheng (C&E) (Unl)	NES
+54b371871d45aad6219e6394ed379dd9db24b6b8	U	Zhan Guo Si Chuan Sheng (C&E) (Unl)	NES
 be6140cc9fb99c7ab5388dfe5c7c13fa4cfe2a3f	G	Zhen Ben Xi You Ji (Asder) [!]	NES
 902dd1345e1440b4297b1046ce0c2db26fbbca5e	C	Zhen Jia Hou Wang (ES-1061) (Ch) (Decrypted) [t1]	NES
 af9e06787f450260f9810c3d4a54674f24adea1b	U	Zhen Jia Hou Wang (ES-1061) (Ch) (Decrypted)	NES
diff --git a/Assets/gamedb/gamedb_n64.txt b/Assets/gamedb/gamedb_n64.txt
index 511260f3b2..ecc5fc9b51 100644
--- a/Assets/gamedb/gamedb_n64.txt
+++ b/Assets/gamedb/gamedb_n64.txt
@@ -555,8 +555,8 @@ A5359E35839B40C414EAE498CA633B28176629AA	G	Olympic Hockey 98 (Japan)	N64		Glide_
 7592F4C16B8E040539B5DCC201FAB2965A5E8C8D	G	Onegai Monsters (Japan)	N64
 133F17162B2734286F9E94F64ACB1538B11506B2	G	Operation WinBack (Europe) (En,Fr,De,Es,It)	N64
 B8F29E8EFCF51EE9A6A16E2A1E60442B4F304950	G	Pachinko 365 Nichi (Japan)	N64
-2111D39265A317414D359E35A7D971C4DFA5F9E1	G	Paper Mario (Europe) (En,Fr,De,Es)	N64		Glide_enable_hacks_for_game=15;Glide_fb_hires_buf_clear=false;Glide_fb_optimize_texrect=false;Glide_swapmode=2;Glide_fb_smart=true;Glide_fb_read_alpha=true;Glide64mk2_enable_hacks_for_game=20;Glide64mk2_hires_buf_clear=false;Glide64mk2_optimize_texrect=false;Glide64mk2_filtering=1;Glide64mk2_swapmode=2;Glide64mk2_fb_smart=true;Glide64mk2_fb_read_alpha=true;Jabo_Clear_Frame=1;GLideN64_CopyColorToRDRAM=2
-3837F44CDA784B466C9A2D99DF70D77C322B97A0	G	Paper Mario (USA)	N64		RiceFrameBufferOption=3;RiceRenderToTextureOption=3;RiceScreenUpdateSettingHack=4;Glide_enable_hacks_for_game=15;Glide_fb_hires_buf_clear=false;Glide_fb_optimize_texrect=false;Glide_swapmode=2;Glide_fb_smart=true;Glide_fb_read_alpha=true;Glide64mk2_enable_hacks_for_game=20;Glide64mk2_hires_buf_clear=false;Glide64mk2_optimize_texrect=false;Glide64mk2_filtering=1;Glide64mk2_swapmode=2;Glide64mk2_fb_smart=true;Glide64mk2_fb_read_alpha=true;Jabo_Clear_Frame=1;GLideN64_CopyColorToRDRAM=2
+2111D39265A317414D359E35A7D971C4DFA5F9E1	G	Paper Mario (Europe) (En,Fr,De,Es)	N64		Glide_enable_hacks_for_game=15;Glide_fb_hires_buf_clear=false;Glide_fb_optimize_texrect=false;Glide_swapmode=2;Glide_fb_smart=true;Glide_fb_read_alpha=true;Glide64mk2_enable_hacks_for_game=20;Glide64mk2_hires_buf_clear=false;Glide64mk2_optimize_texrect=false;Glide64mk2_filtering=1;Glide64mk2_swapmode=2;Glide64mk2_fb_smart=true;Glide64mk2_fb_read_alpha=true;Jabo_Clear_Frame=1;GLideN64_CopyColorToRDRAM=1
+3837F44CDA784B466C9A2D99DF70D77C322B97A0	G	Paper Mario (USA)	N64		RiceFrameBufferOption=3;RiceRenderToTextureOption=3;RiceScreenUpdateSettingHack=4;Glide_enable_hacks_for_game=15;Glide_fb_hires_buf_clear=false;Glide_fb_optimize_texrect=false;Glide_swapmode=2;Glide_fb_smart=true;Glide_fb_read_alpha=true;Glide64mk2_enable_hacks_for_game=20;Glide64mk2_hires_buf_clear=false;Glide64mk2_optimize_texrect=false;Glide64mk2_filtering=1;Glide64mk2_swapmode=2;Glide64mk2_fb_smart=true;Glide64mk2_fb_read_alpha=true;Jabo_Clear_Frame=1;GLideN64_CopyColorToRDRAM=1
 7DB4808042B9651B47592E814AC4C125B51D4D2F	G	Paperboy (Europe)	N64
 B043C47B9758FA6BB289CA7DBA2068BDA6CAFA3A	G	Paperboy (USA)	N64
 9887A0E4BFE3C5E85E31638853574069F6C41CD3	G	Parlor! Pro 64 - Pachinko Jikki Simulation Game (Japan)	N64		Glide_force_microcheck=true;Glide64mk2_force_microcheck=true;Glide64mk2_filtering=1
diff --git a/Assets/gamedb/gamedb_nes.txt b/Assets/gamedb/gamedb_nes.txt
index b837ef1be5..ec808e4165 100644
--- a/Assets/gamedb/gamedb_nes.txt
+++ b/Assets/gamedb/gamedb_nes.txt
@@ -305,7 +305,6 @@ sha1:17473C223453D2D80FCB9DCFA317947287DC5C52		Xing He Zhan Shi (China) (Unl)	NE
 sha1:B1C74236FD17FAB4AB9AA6AB28E38864C66D6255		Pocahontus (UNL)	NES		board=MAPPER182;PRG=256;CHR=256;WRAM=8;PAD_H=1
 sha1:5FA23F88432006DCF6874EA36E9E7DA8934427BE		Super Donkey Kong (Unl)	NES		board=MAPPER182;PRG=128;CHR=128;WRAM=8;PAD_H=1
 sha1:8A7DAB8B78DA1C5EA159BA9EEC00FF97742245F1	B	Super Donkey Kong (Unl) [b1]	NES		board=MAPPER182;PRG=128;CHR=128;WRAM=8;PAD_H=1
-sha1:8A7DAB8B78DA1C5EA159BA9EEC00FF97742245F1	O	Super Donkey Kong (Unl) [o1]	NES		board=MAPPER182;PRG=128;CHR=128;WRAM=8;PAD_H=1
 
 ;wrong vram info
 sha1:32D71DD6C5A8D78A918FE1B9D6D6C4A570D9652D		Oeka Kids Anpanman no Hiragana Daisuki (J)	NES		board=MAPPER096;VRAM=32
diff --git a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
index e80de5d5ae..f3aed78ae7 100644
--- a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
+++ b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
@@ -33,7 +33,9 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
-    <NoWarn>1591</NoWarn><!-- don't bug us with "Missing XML comment [...]" until we have and enforce .stylecop.json i.e. when we care -->
+    <LangVersion>8.0</LangVersion>
+    <NoWarn>1591</NoWarn>
+    <!-- don't bug us with "Missing XML comment [...]" until we have and enforce .stylecop.json i.e. when we care -->
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj.DotSettings b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj.DotSettings
+++ b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/BizHawk.Client.ApiHawk/Classes/BizHawkSystemIdToCoreSystemEnumConverter.cs b/BizHawk.Client.ApiHawk/Classes/BizHawkSystemIdToCoreSystemEnumConverter.cs
index dca4452785..16da2eddb0 100644
--- a/BizHawk.Client.ApiHawk/Classes/BizHawkSystemIdToCoreSystemEnumConverter.cs
+++ b/BizHawk.Client.ApiHawk/Classes/BizHawkSystemIdToCoreSystemEnumConverter.cs
@@ -117,6 +117,9 @@ namespace BizHawk.Client.ApiHawk
 				case "GB4x":
 					return CoreSystem.GB3x;
 
+				case "MAME":
+					return CoreSystem.MAME;
+
 				case "VB":
 				case "NGP":
 				case "DNGP":
diff --git a/BizHawk.Client.Common/7z/LibraryManager.cs b/BizHawk.Client.Common/7z/LibraryManager.cs
index 6f2f375862..1f93b0e8c1 100644
--- a/BizHawk.Client.Common/7z/LibraryManager.cs
+++ b/BizHawk.Client.Common/7z/LibraryManager.cs
@@ -134,54 +134,54 @@ namespace SevenZip
         /// <param name="format">Archive format</param>
         public static void LoadLibrary(object user, Enum format)
         {
-    lock (_syncRoot)
-                {
-            if (_inArchives == null
-#if COMPRESS
-                || _outArchives == null
-#endif
-                )
+            lock (_syncRoot)
             {
-                Init();
-            }
+                if (_inArchives == null
+#if COMPRESS
+                    || _outArchives == null
+#endif
+                    )
+                {
+                    Init();
+                }
 #if !WINCE && !MONO
-            if (_modulePtr == IntPtr.Zero)
-            {
-							//zero 29-oct-2012 - this check isnt useful since LoadLibrary can pretty much check for the same thing. and it wrecks our dll relocation scheme
-								//if (!File.Exists(_libraryFileName))
-								//{
-								//    throw new SevenZipLibraryException("DLL file does not exist.");
-								//}
-                if ((_modulePtr = libLoader.LoadPlatformSpecific(_libraryFileName)) == IntPtr.Zero)
+                if (_modulePtr == IntPtr.Zero)
                 {
-									//try a different directory
-									string alternateFilename = Path.Combine(Path.Combine(Path.GetDirectoryName(_libraryFileName),"dll"),"7z.dll");
-									if ((_modulePtr = libLoader.LoadPlatformSpecific(alternateFilename)) == IntPtr.Zero)
-                    throw new SevenZipLibraryException("failed to load library.");
-                }
-                if (libLoader.GetProcAddr(_modulePtr, "GetHandlerProperty") == IntPtr.Zero)
-                {
-                    libLoader.FreePlatformSpecific(_modulePtr);
-                    throw new SevenZipLibraryException("library is invalid.");
-                }
-            }
-#endif
-            if (format is InArchiveFormat)
-            {
-                InitUserInFormat(user, (InArchiveFormat) format);
-                return;
-            }
-#if COMPRESS
-            if (format is OutArchiveFormat)
-            {
-                InitUserOutFormat(user, (OutArchiveFormat) format);
-                return;
-            }
-#endif
-            throw new ArgumentException(
-                "Enum " + format + " is not a valid archive format attribute!");
-								}
+                    //zero 29-oct-2012 - this check isnt useful since LoadOrNull can pretty much check for the same thing. and it wrecks our dll relocation scheme
+                    //if (!File.Exists(_libraryFileName))
+                    //{
+                    //    throw new SevenZipLibraryException("DLL file does not exist.");
+                    //}
+                    var newPtr = libLoader.LoadOrNull(_libraryFileName);
+                    if (!newPtr.HasValue)
+                    {
+                        //try a different directory
+                        newPtr = libLoader.LoadOrNull(Path.Combine(Path.Combine(Path.GetDirectoryName(_libraryFileName), "dll"), "7z.dll"));
+                        if (!newPtr.HasValue) throw new SevenZipLibraryException("failed to load library.");
+                    }
+                    _modulePtr = newPtr.Value;
 
+                    if (libLoader.GetProcAddr(_modulePtr, "GetHandlerProperty") == IntPtr.Zero)
+                    {
+                        libLoader.FreeByPtr(_modulePtr);
+                        throw new SevenZipLibraryException("library is invalid.");
+                    }
+                }
+#endif
+                if (format is InArchiveFormat)
+                {
+                    InitUserInFormat(user, (InArchiveFormat) format);
+                    return;
+                }
+#if COMPRESS
+                if (format is OutArchiveFormat)
+                {
+                    InitUserOutFormat(user, (OutArchiveFormat) format);
+                    return;
+                }
+#endif
+                throw new ArgumentException("Enum " + format + " is not a valid archive format attribute!");
+            }
         }
 
         /*/// <summary>
@@ -435,7 +435,7 @@ namespace SevenZip
                     if (_totalUsers == 0)
                     {
 #if !WINCE && !MONO
-                        libLoader.FreePlatformSpecific(_modulePtr);
+                        libLoader.FreeByPtr(_modulePtr);
 
 #endif
                         _modulePtr = IntPtr.Zero;
diff --git a/BizHawk.Client.Common/Api/CoreSystem.cs b/BizHawk.Client.Common/Api/CoreSystem.cs
index ae86c41564..3fad8c8563 100644
--- a/BizHawk.Client.Common/Api/CoreSystem.cs
+++ b/BizHawk.Client.Common/Api/CoreSystem.cs
@@ -34,8 +34,9 @@
         ZXSpectrum,
         AmstradCPC,
 		GGL,
-		ChannelF,
 		GB3x,
-		GB4x
+		GB4x,
+		ChannelF,
+		MAME
 	}
 }
diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index ea09e5b1f0..66f156bd0e 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -13,6 +13,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
@@ -127,6 +128,7 @@
     <Compile Include="config\ConfigPersistAttribute.cs" />
     <Compile Include="config\ConfigService.cs" />
     <Compile Include="config\PathEntry.cs" />
+    <Compile Include="config\RestoreDefaultsAttribute.cs" />
     <Compile Include="config\ToolDialogSettings.cs" />
     <Compile Include="ControllerBinding.cs" />
     <Compile Include="CoreFileProvider.cs" />
diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj.DotSettings b/BizHawk.Client.Common/BizHawk.Client.Common.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj.DotSettings
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/BizHawk.Client.Common/OpenAdvanced.cs b/BizHawk.Client.Common/OpenAdvanced.cs
index 251d49d89e..88fbee6689 100644
--- a/BizHawk.Client.Common/OpenAdvanced.cs
+++ b/BizHawk.Client.Common/OpenAdvanced.cs
@@ -36,6 +36,7 @@ namespace BizHawk.Client.Common
 		public const string OpenRom = "OpenRom";
 		public const string Libretro = "Libretro";
 		public const string LibretroNoGame = "LibretroNoGame";
+		public const string MAME = "MAME";
 	}
 
 
@@ -55,12 +56,33 @@ namespace BizHawk.Client.Common
 			string type = text.Substring(0, idx);
 			string token = text.Substring(idx + 1);
 			IOpenAdvanced ioa;
-			if (type == OpenAdvancedTypes.OpenRom) ioa = new OpenAdvanced_OpenRom();
-			else if (type == OpenAdvancedTypes.Libretro) ioa = new OpenAdvanced_Libretro();
-			else if (type == OpenAdvancedTypes.LibretroNoGame) ioa = new OpenAdvanced_LibretroNoGame();
-			else ioa = null;
-			if (ioa == null)
-				throw new InvalidOperationException($"{nameof(IOpenAdvanced)} deserialization error");
+
+			if (type == OpenAdvancedTypes.OpenRom)
+			{
+				ioa = new OpenAdvanced_OpenRom();
+			}
+			else if (type == OpenAdvancedTypes.Libretro)
+			{
+				ioa = new OpenAdvanced_Libretro();
+			}
+			else if (type == OpenAdvancedTypes.LibretroNoGame)
+			{
+				ioa = new OpenAdvanced_LibretroNoGame();
+			}
+			else if (type == OpenAdvancedTypes.MAME)
+			{
+				ioa = new OpenAdvanced_MAME();
+			}
+			else
+			{
+				ioa = null;
+			}
+
+			if (ioa == null)
+			{
+				throw new InvalidOperationException($"{nameof(IOpenAdvanced)} deserialization error");
+			}
+
 			ioa.Deserialize(token);
 			return ioa;
 		}
@@ -161,4 +183,26 @@ namespace BizHawk.Client.Common
 			tw.Write(Path);
 		}
 	}
+
+	public class OpenAdvanced_MAME : IOpenAdvanced
+	{
+		public OpenAdvanced_MAME()
+		{ }
+
+		public string Path;
+
+		public string TypeName { get { return "MAME"; } }
+		public string DisplayName { get { return Path; } }
+		public string SimplePath { get { return Path; } }
+
+		public void Deserialize(string str)
+		{
+			Path = str;
+		}
+
+		public void Serialize(TextWriter tw)
+		{
+			tw.Write(Path);
+		}
+	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.Common/RecentFiles.cs b/BizHawk.Client.Common/RecentFiles.cs
index b3fa4b91c6..19ca7df854 100644
--- a/BizHawk.Client.Common/RecentFiles.cs
+++ b/BizHawk.Client.Common/RecentFiles.cs
@@ -89,17 +89,7 @@ namespace BizHawk.Client.Common
 		{
 			if (!Frozen)
 			{
-				var removed = false;
-				foreach (var recent in recentlist.ToList())
-				{
-					if (string.Compare(newFile, recent, StringComparison.CurrentCultureIgnoreCase) == 0)
-					{
-						recentlist.Remove(newFile); // intentionally keeps iterating after this to remove duplicate instances, though those should never exist in the first place
-						removed = true;
-					}
-				}
-
-				return removed;
+				return recentlist.RemoveAll(recent => string.Compare(newFile, recent, StringComparison.CurrentCultureIgnoreCase) == 0) != 0; // none removed => return false
 			}
 
 			return false;
diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index a8e820898f..58e417333a 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -24,6 +24,7 @@ using BizHawk.Emulation.Cores.Sega.Saturn;
 using BizHawk.Emulation.Cores.Sony.PSP;
 using BizHawk.Emulation.Cores.Sony.PSX;
 using BizHawk.Emulation.Cores.Computers.SinclairSpectrum;
+using BizHawk.Emulation.Cores.Arcades.MAME;
 using BizHawk.Emulation.DiscSystem;
 
 using GPGX64 = BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
@@ -171,7 +172,7 @@ namespace BizHawk.Client.Common
 			return false;
 		}
 
-		public bool AsLibretro { get; set; }
+		public AdvancedRomLoaderType AdvancedLoader { get; set; }
 
 		private bool HandleArchiveBinding(HawkFile file)
 		{
@@ -268,8 +269,13 @@ namespace BizHawk.Client.Common
 				// only try mounting a file if a filename was given
 				if (!string.IsNullOrEmpty(path))
 				{
-					// lets not use this unless we need to
-					// file.NonArchiveExtensions = romExtensions;
+					// MAME uses these extensions for arcade ROMs, but also accepts all sorts of variations of archives, folders, and files. if we let archive loader handle this, it won't know where to stop, since it'd require MAME's ROM database (which contains ROM names and blob hashes) to look things up, and even then it might be confused by archive/folder structure
+					// so assume the user provides the proper ROM directly, and handle possible errors later
+					if (AdvancedLoader == AdvancedRomLoaderType.MAMELaunchGame)
+					{
+						file.NonArchiveExtensions = new[] { ".zip", ".7z" };
+					}
+
 					file.Open(path);
 
 					// if the provided file doesnt even exist, give up!
@@ -289,7 +295,7 @@ namespace BizHawk.Client.Common
 				{
 					string ext = null;
 
-					if (AsLibretro)
+					if (AdvancedLoader == AdvancedRomLoaderType.LibretroLaunchGame)
 					{
 						string codePathPart = Path.GetFileNameWithoutExtension(nextComm.LaunchLibretroCore);
 
@@ -1152,6 +1158,9 @@ namespace BizHawk.Client.Common
 								nextEmulator = new Octoshock(nextComm, null, null, rom.FileData, GetCoreSettings<Octoshock>(), GetCoreSyncSettings<Octoshock>());
 								nextEmulator.CoreComm.RomStatusDetails = "PSX etc.";
 								break;
+							case "Arcade":
+								nextEmulator = new MAME(nextComm, file.Directory, file.CanonicalName);
+								break;
 							case "GEN":
 								if (Global.Config.CoreForcingViaGameDB && game.ForcedCore?.ToLower() == "pico")
 								{
diff --git a/BizHawk.Client.Common/SaveSlotManager.cs b/BizHawk.Client.Common/SaveSlotManager.cs
index 8584312e7e..7ec9588a22 100644
--- a/BizHawk.Client.Common/SaveSlotManager.cs
+++ b/BizHawk.Client.Common/SaveSlotManager.cs
@@ -97,12 +97,6 @@ namespace BizHawk.Client.Common
 			return _redo[slot];
 		}
 
-		public void Clear()
-		{
-			ClearRedoList();
-			Update();
-		}
-
 		public void SwapBackupSavestate(string path)
 		{
 			// Takes the .state and .bak files and swaps them
diff --git a/BizHawk.Client.Common/SystemInfo.cs b/BizHawk.Client.Common/SystemInfo.cs
index 29be9a4bc5..880074f08f 100644
--- a/BizHawk.Client.Common/SystemInfo.cs
+++ b/BizHawk.Client.Common/SystemInfo.cs
@@ -223,6 +223,11 @@ namespace BizHawk.Client.Common
 		/// </summary>
 		public static SystemInfo ChannelF { get; } = new SystemInfo("Channel F", CoreSystem.ChannelF, 2);
 
+		/// <summary>
+		/// Gets the <see cref="SystemInfo"/> instance for MAME
+		/// </summary>
+		public static SystemInfo MAME { get; } = new SystemInfo("MAME", CoreSystem.MAME, 4);
+
 		#endregion Get SystemInfo
 
 		/// <summary>
diff --git a/BizHawk.Client.Common/config/Binding.cs b/BizHawk.Client.Common/config/Binding.cs
index c2ec1c1738..b2d9ad6d6a 100644
--- a/BizHawk.Client.Common/config/Binding.cs
+++ b/BizHawk.Client.Common/config/Binding.cs
@@ -96,13 +96,8 @@ namespace BizHawk.Client.Common
 				}
 			}
 
-			List<Binding> entriesToRemove = (from entry in Bindings let binding = DefaultValues.FirstOrDefault(b => b.DisplayName == entry.DisplayName) where binding == null select entry).ToList();
-
 			// Remove entries that no longer exist in defaults
-			foreach (Binding entry in entriesToRemove)
-			{
-				Bindings.Remove(entry);
-			}
+			Bindings.RemoveAll(entry => DefaultValues.All(b => b.DisplayName != entry.DisplayName));
 		}
 
 		private static List<Binding> _defaultValues;
diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs
index 2603fd3329..b89ce28eb8 100644
--- a/BizHawk.Client.Common/config/Config.cs
+++ b/BizHawk.Client.Common/config/Config.cs
@@ -104,6 +104,8 @@ namespace BizHawk.Client.Common
 		public int MainHeight = -1;
 		public bool RunInBackground = true;
 		public bool AcceptBackgroundInput = false;
+		public bool AcceptBackgroundInputControllerOnly = false;
+		public bool HandleAlternateKeyboardLayouts = false;
 		public bool SingleInstanceMode = false;
 		public bool AllowUD_LR = false;
 		public bool ForbidUD_LR = false;
diff --git a/BizHawk.Client.Common/config/PathEntry.cs b/BizHawk.Client.Common/config/PathEntry.cs
index 8f8e6776a5..2c91df1807 100644
--- a/BizHawk.Client.Common/config/PathEntry.cs
+++ b/BizHawk.Client.Common/config/PathEntry.cs
@@ -119,7 +119,7 @@ namespace BizHawk.Client.Common
 			}
 
 			// Add missing displaynames
-			var missingDisplayPaths = Paths.Where(p => p.SystemDisplayName == null).ToList();
+			var missingDisplayPaths = Paths.Where(p => p.SystemDisplayName == null);
 			foreach (PathEntry path in missingDisplayPaths)
 			{
 				path.SystemDisplayName = DefaultValues.First(p => p.System == path.System).SystemDisplayName;
diff --git a/BizHawk.Client.Common/config/RestoreDefaultsAttribute.cs b/BizHawk.Client.Common/config/RestoreDefaultsAttribute.cs
new file mode 100644
index 0000000000..eb8584cd6e
--- /dev/null
+++ b/BizHawk.Client.Common/config/RestoreDefaultsAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace BizHawk.Client.Common
+{
+	/// <summary>
+	/// Defines a method to be called when a tool dialog's Restore Defaults method is called
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Method)]
+	public class RestoreDefaultsAttribute : Attribute
+	{
+	}
+}
diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs
index 1ec246820e..da03cbd7eb 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs
@@ -50,78 +50,66 @@ namespace BizHawk.Client.Common
 
 		public void CallSaveStateEvent(string name)
 		{
-			var lfs = _luaFunctions.Where(l => l.Event == "OnSavestateSave").ToList();
-			if (lfs.Any())
+			var lfs = _luaFunctions.Where(l => l.Event == "OnSavestateSave");
+			try
 			{
-				try
+				foreach (var lf in lfs)
 				{
-					foreach (var lf in lfs)
-					{
-						lf.Call(name);
-					}
-				}
-				catch (Exception e)
-				{
-					Log($"error running function attached by lua function event.onsavestate\nError message: {e.Message}");
+					lf.Call(name);
 				}
 			}
+			catch (Exception e)
+			{
+				Log($"error running function attached by lua function event.onsavestate\nError message: {e.Message}");
+			}
 		}
 
 		public void CallLoadStateEvent(string name)
 		{
-			var lfs = _luaFunctions.Where(l => l.Event == "OnSavestateLoad").ToList();
-			if (lfs.Any())
+			var lfs = _luaFunctions.Where(l => l.Event == "OnSavestateLoad");
+			try
 			{
-				try
+				foreach (var lf in lfs)
 				{
-					foreach (var lf in lfs)
-					{
-						lf.Call(name);
-					}
-				}
-				catch (Exception e)
-				{
-					Log($"error running function attached by lua function event.onloadstate\nError message: {e.Message}");
+					lf.Call(name);
 				}
 			}
+			catch (Exception e)
+			{
+				Log($"error running function attached by lua function event.onloadstate\nError message: {e.Message}");
+			}
 		}
 
 		public void CallFrameBeforeEvent()
 		{
-			var lfs = _luaFunctions.Where(l => l.Event == "OnFrameStart").ToList();
-			if (lfs.Any())
+			var lfs = _luaFunctions.Where(l => l.Event == "OnFrameStart");
+			try
 			{
-				try
+				foreach (var lf in lfs)
 				{
-					foreach (var lf in lfs)
-					{
-						lf.Call();
-					}
-				}
-				catch (Exception e)
-				{
-					Log($"error running function attached by lua function event.onframestart\nError message: {e.Message}");
+					lf.Call();
 				}
 			}
+			catch (Exception e)
+			{
+				Log($"error running function attached by lua function event.onframestart\nError message: {e.Message}");
+			}
 		}
 
 		public void CallFrameAfterEvent()
 		{
-			var lfs = _luaFunctions.Where(l => l.Event == "OnFrameEnd").ToList();
-			if (lfs.Any())
+			var lfs = _luaFunctions.Where(l => l.Event == "OnFrameEnd");
+			try
 			{
-				try
+				foreach (var lf in lfs)
 				{
-					foreach (var lf in lfs)
-					{
-						lf.Call();
-					}
-				}
-				catch (Exception e)
-				{
-					Log($"error running function attached by lua function event.onframeend\nError message: {e.Message}");
+					lf.Call();
 				}
 			}
+			catch (Exception e)
+			{
+				Log($"error running function attached by lua function event.onframeend\nError message: {e.Message}");
+			}
 		}
 
 		private bool N64CoreTypeDynarec()
diff --git a/BizHawk.Client.Common/lua/LuaFile.cs b/BizHawk.Client.Common/lua/LuaFile.cs
index 63ae59c75e..dddb59a85d 100644
--- a/BizHawk.Client.Common/lua/LuaFile.cs
+++ b/BizHawk.Client.Common/lua/LuaFile.cs
@@ -48,6 +48,11 @@
 
 		public void Stop()
 		{
+			if (Thread == null)
+			{
+				return;
+			}
+
 			State = RunState.Disabled;
 			//if(NLua.Lua.WhichLua == "NLua")
 				Thread.GetTable("keepalives")[Thread] = null;
diff --git a/BizHawk.Client.Common/lua/LuaFileList.cs b/BizHawk.Client.Common/lua/LuaFileList.cs
index 678a4c7809..a8148df357 100644
--- a/BizHawk.Client.Common/lua/LuaFileList.cs
+++ b/BizHawk.Client.Common/lua/LuaFileList.cs
@@ -140,11 +140,19 @@ namespace BizHawk.Client.Common
 				var sb = new StringBuilder();
 				foreach (var file in this)
 				{
-					sb
-						.Append(file.Enabled ? "1" : "0")
-						.Append(' ')
-						.Append(PathManager.MakeRelativeTo(PathManager.MakeAbsolutePath(file.Path, ""), Path.GetDirectoryName(path)))
-						.AppendLine();
+					if (file.IsSeparator)
+					{
+						sb.AppendLine("---");
+					}
+					else
+					{
+						sb
+							.Append(file.Enabled ? "1" : "0")
+							.Append(' ')
+							.Append(PathManager.MakeRelativeTo(PathManager.MakeAbsolutePath(file.Path, "")
+								, Path.GetDirectoryName(path)))
+							.AppendLine();
+					}
 				}
 
 				sw.Write(sb.ToString());
diff --git a/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs b/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs
index 5c49ef6f5d..fbcd18319f 100644
--- a/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs
+++ b/BizHawk.Client.Common/movie/bk2/Bk2ControllerAdapter.cs
@@ -160,7 +160,7 @@ namespace BizHawk.Client.Common
 			{
 				var def = Global.Emulator.ControllerDefinition;
 				var trimmed = mnemonic.Replace("|", "");
-				var buttons = Definition.ControlsOrdered.SelectMany(c => c).ToList();
+				var buttons = Definition.ControlsOrdered.SelectMany(c => c);
 				var iterator = 0;
 
 				foreach (var key in buttons)
diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
index a1450bf56a..6fe710524f 100644
--- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
+++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
@@ -338,7 +338,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
 			if (Global.Emulator is SMS && (Global.Emulator as SMS).IsSG1000)
 			{
 				movie.HeaderEntries.Add("IsSGMode", "1");
-            }
+			}
 
 			if (Global.Emulator is SMS && (Global.Emulator as SMS).IsGameGear)
 			{
diff --git a/BizHawk.Client.Common/movie/import/IMovieImport.cs b/BizHawk.Client.Common/movie/import/IMovieImport.cs
index 91191b7342..c35caddca8 100644
--- a/BizHawk.Client.Common/movie/import/IMovieImport.cs
+++ b/BizHawk.Client.Common/movie/import/IMovieImport.cs
@@ -68,14 +68,8 @@ namespace BizHawk.Client.Common
 
 	public class ImportResult
 	{
-		public ImportResult()
-		{
-			Warnings = new List<string>();
-			Errors = new List<string>();
-		}
-
-		public IList<string> Warnings { get; private set; }
-		public IList<string> Errors { get; }
+		public IList<string> Warnings { get; } = new List<string>();
+		public IList<string> Errors { get; } = new List<string>();
 
 		public Bk2Movie Movie { get; set; }
 	}
@@ -88,6 +82,6 @@ namespace BizHawk.Client.Common
 			Extension = extension;
 		}
 
-		public string Extension { get; private set; }
+		public string Extension { get; }
 	}
 }
diff --git a/BizHawk.Client.Common/movie/import/MovieImport.cs b/BizHawk.Client.Common/movie/import/MovieImport.cs
index 6f16c63120..89152ab11d 100644
--- a/BizHawk.Client.Common/movie/import/MovieImport.cs
+++ b/BizHawk.Client.Common/movie/import/MovieImport.cs
@@ -42,23 +42,16 @@ namespace BizHawk.Client.Common
 		public static void ProcessMovieImport(string fn, Action<string> conversionErrorCallback, Action<string> messageCallback)
 		{
 			var d = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null);
-			string errorMsg;
-			string warningMsg;
-			var m = ImportFile(fn, out errorMsg, out warningMsg);
+			var m = ImportFile(fn, out var errorMsg, out var warningMsg);
 
 			if (!string.IsNullOrWhiteSpace(errorMsg))
 			{
 				conversionErrorCallback(errorMsg);
 			}
 
-			if (!string.IsNullOrWhiteSpace(warningMsg))
-			{
-				messageCallback(warningMsg);
-			}
-			else
-			{
-				messageCallback($"{Path.GetFileName(fn)} imported as {m.Filename}");
-			}
+			messageCallback(!string.IsNullOrWhiteSpace(warningMsg)
+				? warningMsg
+				: $"{Path.GetFileName(fn)} imported as {m.Filename}");
 
 			if (!Directory.Exists(d))
 			{
@@ -67,7 +60,7 @@ namespace BizHawk.Client.Common
 		}
 
 		// Attempt to import another type of movie file into a movie object.
-		public static Bk2Movie ImportFile(string path, out string errorMsg, out string warningMsg)
+		public static IMovie ImportFile(string path, out string errorMsg, out string warningMsg)
 		{
 			errorMsg = "";
 			warningMsg = "";
@@ -118,25 +111,15 @@ namespace BizHawk.Client.Common
 
 		private static IEnumerable<Type> ImportersForExtension(string ext)
 		{
-			var info = typeof(MovieImport).Module;
-			var importers = from t in info.GetTypes()
-			                where typeof(IMovieImport).IsAssignableFrom(t)
-			                   && TypeImportsExtension(t, ext)
-			                select t;
-
-			return importers;
+			return typeof(MovieImport).Module
+				.GetTypes()
+				.Where(t => typeof(IMovieImport).IsAssignableFrom(t));
 		}
 
 		private static bool TypeImportsExtension(Type t, string ext)
 		{
 			var attrs = (ImportExtensionAttribute[])t.GetCustomAttributes(typeof(ImportExtensionAttribute), inherit: false);
-
-			if (attrs.Any(a => a.Extension.ToUpper() == ext.ToUpper()))
-			{
-				return true;
-			}
-
-			return false;
+			return attrs.Any(a => a.Extension.ToUpper() == ext.ToUpper());
 		}
 
 		private static BkmMovie LegacyImportFile(string ext, string path, out string errorMsg, out string warningMsg)
@@ -252,9 +235,12 @@ namespace BizHawk.Client.Common
 
 		private static IController EmptyLmsvFrame(string line)
 		{
-			var emptyController = new SimpleController { Definition = new ControllerDefinition { Name = "SNES Controller" } };
-			emptyController["Reset"] = false;
-			emptyController["Power"] = false;
+			var emptyController = new SimpleController
+			{
+				Definition = new ControllerDefinition { Name = "SNES Controller" }
+				, ["Reset"] = false
+				, ["Power"] = false
+			};
 
 			string[] buttons = { "B", "Y", "Select", "Start", "Up", "Down", "Left", "Right", "A", "X", "L", "R" };
 			string[] sections = line.Split('|');
@@ -263,9 +249,9 @@ namespace BizHawk.Client.Common
 				int player = section - 1; // We start with 1
 				string prefix = $"P{player} "; // "P1"
 
-				for (int button = 0; button < buttons.Length; button++)
+				foreach (var b in buttons)
 				{
-					emptyController[prefix + buttons[button]] = false;
+					emptyController[prefix + b] = false;
 				}
 			}
 
diff --git a/BizHawk.Client.Common/tools/CheatList.cs b/BizHawk.Client.Common/tools/CheatList.cs
index 1ec255a96e..01702817df 100644
--- a/BizHawk.Client.Common/tools/CheatList.cs
+++ b/BizHawk.Client.Common/tools/CheatList.cs
@@ -222,7 +222,7 @@ namespace BizHawk.Client.Common
 
 		public void RemoveRange(IEnumerable<Cheat> cheats)
 		{
-			foreach (var cheat in cheats.ToList())
+			foreach (var cheat in cheats.ToList()) // enumerate passed IEnumerable because it may depend on the value of _cheatList
 			{
 				_cheatList.Remove(cheat);
 			}
@@ -232,12 +232,7 @@ namespace BizHawk.Client.Common
 
 		public void RemoveRange(IEnumerable<Watch> watches)
 		{
-			var removeList = _cheatList.Where(cheat => watches.Any(w => w == cheat)).ToList();
-			foreach (var cheat in removeList)
-			{
-				_cheatList.Remove(cheat);
-			}
-
+			_cheatList.RemoveAll(cheat => watches.Any(w => w == cheat));
 			Changes = true;
 		}
 
@@ -389,7 +384,9 @@ namespace BizHawk.Client.Common
 						}
 						else
 						{
-							// Set to hex for saving 
+							// Set to hex for saving
+							var temp_cheat_type = cheat.Type;
+
 							cheat.SetType(DisplayType.Hex);
 
 							sb
@@ -404,6 +401,9 @@ namespace BizHawk.Client.Common
 								.Append((cheat.BigEndian ?? false) ? '1' : '0').Append('\t')
 								.Append(cheat.ComparisonType).Append('\t')
 								.AppendLine();
+
+							cheat.SetType(temp_cheat_type);
+
 						}
 					}
 
diff --git a/BizHawk.Client.Common/tools/RamSearchEngine.cs b/BizHawk.Client.Common/tools/RamSearchEngine.cs
index 945312ff44..c65d589143 100644
--- a/BizHawk.Client.Common/tools/RamSearchEngine.cs
+++ b/BizHawk.Client.Common/tools/RamSearchEngine.cs
@@ -341,8 +341,7 @@ namespace BizHawk.Client.Common
 			}
 
 			var addresses = watches.Select(w => w.Address);
-			var removeList = _watchList.Where(w => addresses.Contains(w.Address)).ToList();
-			_watchList = _watchList.Except(removeList).ToList();
+			_watchList.RemoveAll(w => addresses.Contains(w.Address));
 		}
 
 		public void RemoveRange(IEnumerable<int> indices)
diff --git a/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs b/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
index 833e3595e8..96999aa9b1 100644
--- a/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
+++ b/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
@@ -388,15 +388,8 @@ namespace BizHawk.Client.Common
 		/// <returns><see cref="Watch"/> at the specified index</returns>
 		public Watch this[int index]
 		{
-			get
-			{
-				return _watchList[index];
-			}
-
-			set
-			{
-				_watchList[index] = value;
-			}
+			get => _watchList[index];
+			set => _watchList[index] = value;
 		}
 
 		#endregion IList<Watch>
@@ -607,14 +600,7 @@ namespace BizHawk.Client.Common
 				CurrentFileName = path;
 			}
 
-			if (!append)
-			{
-				Changes = false;
-			}
-			else
-			{
-				Changes = true;
-			}
+			Changes = append;
 
 			return true;
 		}
diff --git a/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj b/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj
index e65442660a..6d14eca92e 100644
--- a/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj
+++ b/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj
@@ -39,6 +39,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CSharp-SQLite">
diff --git a/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj.DotSettings b/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj.DotSettings
+++ b/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs b/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs
index de710c70d2..b64be85b47 100644
--- a/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs
+++ b/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs
@@ -188,11 +188,11 @@ namespace BizHawk.Client.DBMan
 				// process dump info flags and other info contained in []
 				if (nameString.Contains("[") && nameString.Contains("]"))
 				{
-					List<string> e = nameString.ToString().Split('[', ']').ToList();
-					// remove first entry (this is the bit before the [] entries start
-					e.RemoveAt(0);
-					// remove empty entries
-					e = e.Where(s => !string.IsNullOrWhiteSpace(s)).Distinct().ToList();
+					var e = nameString.Split('[', ']')
+						.Skip(1) // remove first entry (this is the bit before the [] entries start)
+						.Where(s => !string.IsNullOrWhiteSpace(s)) // remove empty entries
+						.Distinct()
+						.ToList();
 
 					if (e.Count > 0)
 					{
diff --git a/BizHawk.Client.DBMan/DATTools/TOSECParser.cs b/BizHawk.Client.DBMan/DATTools/TOSECParser.cs
index 7ab55b2036..25f2834476 100644
--- a/BizHawk.Client.DBMan/DATTools/TOSECParser.cs
+++ b/BizHawk.Client.DBMan/DATTools/TOSECParser.cs
@@ -206,11 +206,11 @@ namespace BizHawk.Client.DBMan
 				// process dump info flags and other info contained in []
 				if (nameString.Contains("[") && nameString.Contains("]"))
 				{
-					List<string> e = nameString.ToString().Split('[', ']').ToList();
-					// remove first entry (this is the bit before the [] entries start
-					e.RemoveAt(0);
-					// remove empty entries
-					e = e.Where(s => !string.IsNullOrWhiteSpace(s)).Distinct().ToList();
+					var e = nameString.Split('[', ']')
+						.Skip(1) // remove first entry (this is the bit before the [] entries start)
+						.Where(s => !string.IsNullOrWhiteSpace(s)) // remove empty entries
+						.Distinct()
+						.ToList();
 
 					if (e.Count > 0)
 					{
diff --git a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
index 19809199c9..e45f56b5ce 100644
--- a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
+++ b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
@@ -32,6 +32,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <NoWin32Manifest>true</NoWin32Manifest>
diff --git a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj.DotSettings b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj.DotSettings
+++ b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/Api/ApiManager.cs b/BizHawk.Client.EmuHawk/Api/ApiManager.cs
index 9dd5b71087..fdb3f836f7 100644
--- a/BizHawk.Client.EmuHawk/Api/ApiManager.cs
+++ b/BizHawk.Client.EmuHawk/Api/ApiManager.cs
@@ -23,15 +23,12 @@ namespace BizHawk.Client.EmuHawk
 				.Where(t => typeof(IExternalApi).IsAssignableFrom(t))
 				.Where(t => t.IsSealed)
 				.Where(t => ServiceInjector.IsAvailable(serviceProvider, t))
-				.ToList();
-
-			apis.AddRange(
-				Assembly
-				.GetAssembly(typeof(ApiContainer))
-				.GetTypes()
-				.Where(t => typeof(IExternalApi).IsAssignableFrom(t))
-				.Where(t => t.IsSealed)
-				.Where(t => ServiceInjector.IsAvailable(serviceProvider, t)));
+				.Concat(Assembly
+					.GetAssembly(typeof(ApiContainer))
+					.GetTypes()
+					.Where(t => typeof(IExternalApi).IsAssignableFrom(t))
+					.Where(t => t.IsSealed)
+					.Where(t => ServiceInjector.IsAvailable(serviceProvider, t)));
 
 			foreach (var api in apis)
 			{
diff --git a/BizHawk.Client.EmuHawk/BizBox.cs b/BizHawk.Client.EmuHawk/BizBox.cs
index a233234d1d..9bff885393 100644
--- a/BizHawk.Client.EmuHawk/BizBox.cs
+++ b/BizHawk.Client.EmuHawk/BizBox.cs
@@ -48,8 +48,7 @@ namespace BizHawk.Client.EmuHawk
 				.Select(t => t.GetCustomAttributes(false).OfType<CoreAttribute>().FirstOrDefault())
 				.Where(a => a != null)
 				.Where(a => a.Released)
-				.OrderByDescending(a => a.CoreName.ToLower())
-				.ToList();
+				.OrderByDescending(a => a.CoreName.ToLower());
 
 			foreach (var core in cores)
 			{
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index d5e7b52341..a0bb67fd0b 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -38,6 +38,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <NoWin32Manifest>true</NoWin32Manifest>
@@ -84,7 +85,7 @@
       <HintPath>..\output\dll\nlua\NLua.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\References\OpenTK.dll</HintPath>
     </Reference>
@@ -566,6 +567,8 @@
     <Compile Include="CoreFeatureAnalysis.Designer.cs">
       <DependentUpon>CoreFeatureAnalysis.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControls\ControlRenderer\GdiPlusRenderer.cs" />
+    <Compile Include="CustomControls\ControlRenderer\IControlRenderer.cs" />
     <Compile Include="CustomControls\ExceptionBox.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -575,7 +578,7 @@
     <Compile Include="CustomControls\FolderBrowserDialogEx.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="CustomControls\GDIRenderer.cs" />
+    <Compile Include="CustomControls\ControlRenderer\GDIRenderer.cs" />
     <Compile Include="CustomControls\HexTextBox.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -585,21 +588,17 @@
     <Compile Include="CustomControls\InputConfigBase.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="CustomControls\InputRoll.cs">
+    <Compile Include="CustomControls\InputRoll\Cell.cs" />
+    <Compile Include="CustomControls\InputRoll\ColumnType.cs" />
+    <Compile Include="CustomControls\InputRoll\InputRoll.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="CustomControls\InputRoll.Drawing.cs">
-      <DependentUpon>InputRoll.cs</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControls\InputRoll.Drawing.GDI.cs">
-      <DependentUpon>InputRoll.cs</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControls\InputRoll.Drawing.GDIP.cs">
+    <Compile Include="CustomControls\InputRoll\InputRoll.Drawing.cs">
       <DependentUpon>InputRoll.cs</DependentUpon>
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="CustomControls\InputRoll\RollColumn.cs" />
+    <Compile Include="CustomControls\InputRoll\RollColumns.cs" />
     <Compile Include="CustomControls\MenuButton.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -612,30 +611,6 @@
     <Compile Include="CustomControls\MsgBox.designer.cs">
       <DependentUpon>MsgBox.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControls\PlatformAgnosticVirtualListView.API.cs">
-      <DependentUpon>PlatformAgnosticVirtualListView.cs</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControls\PlatformAgnosticVirtualListView.Classes.cs">
-      <DependentUpon>PlatformAgnosticVirtualListView.cs</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControls\PlatformAgnosticVirtualListView.Drawing.cs">
-      <DependentUpon>PlatformAgnosticVirtualListView.cs</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControls\PlatformAgnosticVirtualListView.EventHandlers.cs">
-      <DependentUpon>PlatformAgnosticVirtualListView.cs</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControls\PlatformAgnosticVirtualListView.Helpers.cs">
-      <DependentUpon>PlatformAgnosticVirtualListView.cs</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControls\PlatformAgnosticVirtualListView.Properties.cs">
-      <DependentUpon>PlatformAgnosticVirtualListView.cs</DependentUpon>
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="CustomControls\PrereqsAlert.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -660,9 +635,6 @@
     <Compile Include="CustomControls\SmartTextBoxControl.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="CustomControls\TasListView.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="CustomControls\TextDebugView.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -672,7 +644,6 @@
     <Compile Include="CustomControls\ViewportPanel.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="CustomControls\VirtualListView.cs" />
     <Compile Include="CustomControls\Win32.cs" />
     <Compile Include="DisplayManager\DisplayManager.cs" />
     <Compile Include="DisplayManager\DisplaySurface.cs" />
@@ -685,9 +656,11 @@
     <Compile Include="DisplayManager\RenderTargetFrugalizer.cs" />
     <Compile Include="DisplayManager\SwappableDisplaySurfaceSet.cs" />
     <Compile Include="DisplayManager\TextureFrugalizer.cs" />
+    <Compile Include="EmuHawkUtil.cs" />
     <Compile Include="Extensions\ControlExtensions.cs" />
     <Compile Include="Extensions\CoreExtensions.cs" />
     <Compile Include="Extensions\ToolExtensions.cs" />
+    <Compile Include="FileFilterEntry.cs" />
     <Compile Include="FileLoader.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -704,6 +677,7 @@
     <Compile Include="Input\GamePad.cs" />
     <Compile Include="Input\GamePad360.cs" />
     <Compile Include="Input\Input.cs" />
+    <Compile Include="Input\KeyboardMapping.cs" />
     <Compile Include="Input\OTK_Gamepad.cs" />
     <Compile Include="Input\OTK_Keyboard.cs" />
     <Compile Include="IControlMainform.cs" />
@@ -779,9 +753,6 @@
     <Compile Include="OpenAdvancedChooser.Designer.cs">
       <DependentUpon>OpenAdvancedChooser.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControls\PlatformAgnosticVirtualListView.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="PlatformChooser.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -814,12 +785,6 @@
     <Compile Include="Sound\Utilities\SoundOutputProvider.cs" />
     <Compile Include="Throttle.cs" />
     <Compile Include="ToolAttribute.cs" />
-    <Compile Include="tools\AutoHawk.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="tools\AutoHawk.Designer.cs">
-      <DependentUpon>AutoHawk.cs</DependentUpon>
-    </Compile>
     <Compile Include="tools\BasicBot\BasicBot.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1553,9 +1518,6 @@
     <EmbeddedResource Include="CustomControls\QuickProgressPopup.resx">
       <DependentUpon>QuickProgressPopup.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControls\TasListView.resx">
-      <DependentUpon>TasListView.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -1584,9 +1546,6 @@
     <EmbeddedResource Include="RomStatusPicker.resx">
       <DependentUpon>RomStatusPicker.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="tools\AutoHawk.resx">
-      <DependentUpon>AutoHawk.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="tools\BasicBot\BasicBot.resx">
       <DependentUpon>BasicBot.cs</DependentUpon>
     </EmbeddedResource>
@@ -1899,6 +1858,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="app.manifest" />
     <None Include="images\FindHS.png" />
   </ItemGroup>
   <ItemGroup>
@@ -1926,6 +1886,8 @@
     <None Include="config\ControllerImages\GENController.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="images\StopButton.png" />
+    <None Include="images\mame.png" />
     <None Include="Resources\MoveTop.png" />
     <None Include="Resources\MoveBottom.png" />
     <None Include="Resources\MoveTop.bmp" />
@@ -2255,6 +2217,7 @@
     <None Include="images\ESE.png" />
     <None Include="images\ControllerImages\NGPController.png" />
     <Content Include="config\ControllerImages\ZXSpectrumKeyboards.png" />
+    <None Include="images\ControllerImages\ArcadeController.jpg" />
     <Content Include="images\logo.ico" />
     <None Include="images\Paste.png" />
     <None Include="images\reboot.png" />
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj.DotSettings b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj.DotSettings
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GDIRenderer.cs b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GDIRenderer.cs
new file mode 100644
index 0000000000..12e76de025
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GDIRenderer.cs
@@ -0,0 +1,505 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace BizHawk.Client.EmuHawk.CustomControls
+{
+	/// <summary>
+	/// Wrapper for GDI rendering functions
+	/// This class is not thread-safe as GDI functions should be called from the UI thread
+	/// </summary>
+	public sealed class GdiRenderer : IControlRenderer
+	{
+		// Cache of all the Fonts used, rather than create them again and again
+		private readonly Dictionary<Font, FontCacheEntry> _fontsCache = new Dictionary<Font, FontCacheEntry>();
+
+		private class FontCacheEntry
+		{
+			public IntPtr HFont;
+			public IntPtr RotatedHFont;
+		}
+
+		// Cache of all the brushes used, rather than create them again and again
+		private readonly Dictionary<Color, IntPtr> _brushCache = new Dictionary<Color, IntPtr>();
+
+		private Graphics _g;
+		private IntPtr _hdc;
+		private IntPtr _currentBrush = IntPtr.Zero;
+
+		#region Construct and Destroy
+
+		public void Dispose()
+		{
+			foreach (var brush in _brushCache)
+			{
+				if (brush.Value != IntPtr.Zero)
+				{
+					DeleteObject(brush.Value);
+				}
+			}
+
+			foreach (var fc in _fontsCache)
+			{
+				DeleteObject(fc.Value.HFont);
+				DeleteObject(fc.Value.RotatedHFont);
+			}
+
+			System.Diagnostics.Debug.Assert(_hdc == IntPtr.Zero, "Disposed a GDIRenderer while it held an HDC");
+			System.Diagnostics.Debug.Assert(_g == null, "Disposed a GDIRenderer while it held a Graphics");
+		}
+
+		#endregion
+
+		#region Api
+
+		public void DrawBitmap(Bitmap bitmap, Point point)
+		{
+			IntPtr hBmp = bitmap.GetHbitmap();
+			var bitHdc = CreateCompatibleDC(CurrentHdc);
+			IntPtr old = SelectObject(bitHdc, hBmp);
+			AlphaBlend(CurrentHdc, point.X, point.Y, bitmap.Width, bitmap.Height, bitHdc, 0, 0, bitmap.Width, bitmap.Height, new BLENDFUNCTION(AC_SRC_OVER, 0, 0xff, AC_SRC_ALPHA));
+			SelectObject(bitHdc, old);
+			DeleteDC(bitHdc);
+			DeleteObject(hBmp);
+		}
+
+		public IDisposable LockGraphics(Graphics g, int width, int height)
+		{
+			_g = g;
+			_hdc = g.GetHdc();
+			SetBkMode(_hdc, BkModes.TRANSPARENT);
+			var l = new GdiGraphicsLock(this);
+			StartOffScreenBitmap(width, height);
+			return l;
+		}
+		
+		public Size MeasureString(string str, Font font)
+		{
+			SetFont(font);
+
+			var size = new Size();
+			GetTextExtentPoint32(CurrentHdc, str, str.Length, ref size);
+			return size;
+		}
+
+		public void DrawString(string str, Point point)
+		{
+			TextOut(CurrentHdc, point.X, point.Y, str, str.Length);
+		}
+
+		public static IntPtr CreateNormalHFont(Font font, int width)
+		{
+			var logFont = new LOGFONT();
+			font.ToLogFont(logFont);
+			logFont.lfWidth = width;
+			logFont.lfOutPrecision = (byte)FontPrecision.OUT_TT_ONLY_PRECIS;
+			var ret = CreateFontIndirect(logFont);
+			return ret;
+		}
+
+		//this returns an IntPtr font because .net's Font class will erase the relevant properties when using its Font.FromLogFont()
+		//note that whether this is rotated clockwise or CCW might affect how you have to position the text (right-aligned sometimes?, up or down by the height of the font?)
+		public static IntPtr CreateRotatedHFont(Font font, bool cw)
+		{
+			LOGFONT logF = new LOGFONT();
+			font.ToLogFont(logF);
+			logF.lfEscapement = cw ? 2700 : 900;
+			logF.lfOrientation = logF.lfEscapement;
+			logF.lfOutPrecision = (byte)FontPrecision.OUT_TT_ONLY_PRECIS;
+
+			var ret = CreateFontIndirect(logF);
+			return ret;
+		}
+
+		// TODO: this should go away and be abstracted internally
+		public static void DestroyHFont(IntPtr hFont)
+		{
+			DeleteObject(hFont);
+		}
+
+		public void PrepDrawString(Font font, Color color, bool rotate = false)
+		{
+			var fontEntry = GetCachedHFont(font);
+			SetGraphicsMode(CurrentHdc, 2); // shouldn't be necessary.. cant hurt
+			SelectObject(CurrentHdc, rotate ? fontEntry.RotatedHFont : fontEntry.HFont);
+			SetTextColor(color);
+		}
+
+		// Set the text color of the device  context
+		private void SetTextColor(Color color)
+		{
+			int rgb = (color.B & 0xFF) << 16 | (color.G & 0xFF) << 8 | color.R;
+			SetTextColor(CurrentHdc, rgb);
+		}
+
+		public void DrawRectangle(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect)
+		{
+			Rectangle(CurrentHdc, nLeftRect, nTopRect, nRightRect, nBottomRect);
+		}
+
+		public void SetBrush(Color color)
+		{
+			if (_brushCache.ContainsKey(color))
+			{
+				_currentBrush = _brushCache[color];
+			}
+			else
+			{
+				int rgb = (color.B & 0xFF) << 16 | (color.G & 0xFF) << 8 | color.R;
+				var newBrush = CreateSolidBrush(rgb);
+				_brushCache.Add(color, newBrush);
+				_currentBrush = newBrush;
+			}
+		}
+
+		public void FillRectangle(int x, int y, int w, int h)
+		{
+			var r = new GDIRect(new Rectangle(x, y, w, h));
+			FillRect(CurrentHdc, ref r, _currentBrush);
+		}
+
+		public void SetSolidPen(Color color)
+		{
+			int rgb = (color.B & 0xFF) << 16 | (color.G & 0xFF) << 8 | color.R;
+			SelectObject(CurrentHdc, GetStockObject((int)PaintObjects.DC_PEN));
+			SetDCPenColor(CurrentHdc, rgb);
+		}
+
+		public void Line(int x1, int y1, int x2, int y2)
+		{
+			MoveToEx(CurrentHdc, x1, y1, IntPtr.Zero);
+			LineTo(CurrentHdc, x2, y2);
+		}
+
+		private IntPtr CurrentHdc => _bitHdc != IntPtr.Zero ? _bitHdc : _hdc;
+
+		private IntPtr _bitMap = IntPtr.Zero;
+		private IntPtr _bitHdc = IntPtr.Zero;
+		private int _bitW;
+		private int _bitH;
+
+		private void StartOffScreenBitmap(int width, int height)
+		{
+			_bitW = width;
+			_bitH = height;
+
+			_bitHdc = CreateCompatibleDC(_hdc);
+			_bitMap = CreateCompatibleBitmap(_hdc, width, height);
+			SelectObject(_bitHdc, _bitMap);
+			SetBkMode(_bitHdc, BkModes.TRANSPARENT);
+		}
+
+		private void EndOffScreenBitmap()
+		{
+			_bitW = 0;
+			_bitH = 0;
+			
+			DeleteObject(_bitMap);
+			DeleteObject(_bitHdc);
+
+			_bitHdc = IntPtr.Zero;
+			_bitMap = IntPtr.Zero;
+		}
+
+		private  void CopyToScreen()
+		{
+			BitBlt(_hdc, 0, 0, _bitW, _bitH, _bitHdc, 0, 0, 0x00CC0020);
+		}
+
+		#endregion
+
+		#region Helpers
+
+		// Set a resource (e.g. a font) for the current device context.
+		private void SetFont(Font font)
+		{
+			var blah = GetCachedHFont(font);
+			SelectObject(CurrentHdc, blah.HFont);
+		}
+
+		private FontCacheEntry GetCachedHFont(Font font)
+		{
+			FontCacheEntry fontEntry;
+			var result = _fontsCache.TryGetValue(font, out fontEntry);
+			if (!result)
+			{
+				// Hack! The 6 is hardcoded to make tastudio look like taseditor, because taseditor is so perfect and wonderful
+				fontEntry = new FontCacheEntry
+				{
+					HFont = CreateNormalHFont(font, 6),
+					RotatedHFont = CreateRotatedHFont(font, true)
+				};
+				_fontsCache.Add(font, fontEntry);
+			}
+
+			return fontEntry;
+		}
+
+		#endregion
+
+		#region Imports
+
+		// ReSharper disable IdentifierTypo
+		[DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+		private static extern IntPtr CreateFontIndirect(
+			[In, MarshalAs(UnmanagedType.LPStruct)]LOGFONT lplf
+			);
+
+		[DllImport("gdi32.dll")]
+		private static extern int Rectangle(IntPtr hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+
+		[DllImport("user32.dll")]
+		private static extern int FillRect(IntPtr hdc, [In] ref GDIRect lprc, IntPtr hbr);
+
+		[DllImport("gdi32.dll")]
+		private static extern int SetBkMode(IntPtr hdc, BkModes mode);
+
+		[DllImport("gdi32.dll")]
+
+		private static extern IntPtr SelectObject(IntPtr hdc, IntPtr hgdiObj);
+
+		[DllImport("gdi32.dll")]
+		private static extern int SetTextColor(IntPtr hdc, int color);
+
+		[DllImport("gdi32.dll", EntryPoint = "GetTextExtentPoint32W")]
+		private static extern int GetTextExtentPoint32(IntPtr hdc, [MarshalAs(UnmanagedType.LPWStr)] string str, int len, ref Size size);
+
+		[DllImport("gdi32.dll", EntryPoint = "TextOutW")]
+		private static extern bool TextOut(IntPtr hdc, int x, int y, [MarshalAs(UnmanagedType.LPWStr)] string str, int len);
+
+		[DllImport("gdi32.dll")]
+		public static extern int SetGraphicsMode(IntPtr hdc, int iMode);
+
+		[DllImport("gdi32.dll")]
+		private static extern bool DeleteObject(IntPtr hObject);
+
+		[DllImport("gdi32.dll")]
+		private static extern IntPtr CreateSolidBrush(int color);
+
+		[DllImport("gdi32.dll")]
+		private static extern IntPtr MoveToEx(IntPtr hdc, int x, int y, IntPtr point);
+
+		[DllImport("gdi32.dll")]
+		private static extern IntPtr LineTo(IntPtr hdc, int nXEnd, int nYEnd);
+
+		[DllImport("gdi32.dll")]
+		private static extern IntPtr GetStockObject(int fnObject);
+
+		[DllImport("gdi32.dll")]
+		private static extern IntPtr SetDCPenColor(IntPtr hdc, int crColor);
+
+		[DllImport("gdi32.dll")]
+		private static extern IntPtr CreateCompatibleDC(IntPtr hdc);
+
+		[DllImport("gdi32.dll", EntryPoint = "DeleteDC")]
+		public static extern bool DeleteDC([In] IntPtr hdc);
+
+		[DllImport("gdi32.dll")]
+		private static extern IntPtr CreateCompatibleBitmap(IntPtr hdc, int width, int height);
+
+		[DllImport("gdi32.dll", EntryPoint = "BitBlt", SetLastError = true)]
+		[return: MarshalAs(UnmanagedType.Bool)]
+		static extern bool BitBlt([In] IntPtr hdc, int nXDest, int nYDest, int nWidth, int nHeight, [In] IntPtr hdcSrc, int nXSrc, int nYSrc, int dwRop);
+
+		[DllImport("gdi32.dll", EntryPoint = "GdiAlphaBlend")]
+		static extern bool AlphaBlend(IntPtr hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, IntPtr hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction);
+
+		// ReSharper disable InconsistentNaming
+		// ReSharper disable UnusedMember.Global
+		// ReSharper disable UnusedMember.Local
+		// ReSharper disable NotAccessedField.Local
+		// ReSharper disable ArrangeTypeMemberModifiers
+		public enum FontPrecision : byte
+		{
+			
+			OUT_DEFAULT_PRECIS = 0,
+			OUT_STRING_PRECIS = 1,
+			OUT_CHARACTER_PRECIS = 2,
+			OUT_STROKE_PRECIS = 3,
+			OUT_TT_PRECIS = 4,
+			OUT_DEVICE_PRECIS = 5,
+			OUT_RASTER_PRECIS = 6,
+			OUT_TT_ONLY_PRECIS = 7,
+			OUT_OUTLINE_PRECIS = 8,
+			OUT_SCREEN_OUTLINE_PRECIS = 9,
+			OUT_PS_ONLY_PRECIS = 10,
+		}
+
+		// It is important for this to be the right declaration
+		// See more here http://www.tech-archive.net/Archive/DotNet/microsoft.public.dotnet.framework.drawing/2004-04/0319.html
+		// If it's wrong (I had a wrong one from pinvoke.net) then ToLogFont will fail mysteriously
+		[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+		class LOGFONT
+		{
+			public int lfHeight = 0;
+			public int lfWidth = 0;
+			public int lfEscapement = 0;
+			public int lfOrientation = 0;
+			public int lfWeight = 0;
+			public byte lfItalic = 0;
+			public byte lfUnderline = 0;
+			public byte lfStrikeOut = 0;
+			public byte lfCharSet = 0;
+			public byte lfOutPrecision = 0;
+			public byte lfClipPrecision = 0;
+			public byte lfQuality = 0;
+			public byte lfPitchAndFamily = 0;
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
+			public string lfFaceName = null;
+		} 
+
+		/// <summary>
+		///   The graphics mode that can be set by SetGraphicsMode.
+		/// </summary>
+		public enum GraphicsMode : int
+		{
+			/// <summary>
+			///   Sets the graphics mode that is compatible with 16-bit Windows. This is the default mode. If
+			///   this value is specified, the application can only modify the world-to-device transform by
+			///   calling functions that set window and viewport extents and origins, but not by using
+			///   SetWorldTransform or ModifyWorldTransform; calls to those functions will fail.
+			///   Examples of functions that set window and viewport extents and origins are SetViewportExtEx
+			///   and SetWindowExtEx.
+			/// </summary>
+			GM_COMPATIBLE = 1,
+			/// <summary>
+			///   Sets the advanced graphics mode that allows world transformations. This value must be
+			///   specified if the application will set or modify the world transformation for the specified
+			///   device context. In this mode all graphics, including text output, fully conform to the
+			///   world-to-device transformation specified in the device context.
+			/// </summary>
+			GM_ADVANCED = 2,
+		}
+
+		/// <summary>
+		///   The XFORM structure specifies a world-space to page-space transformation.
+		/// </summary>
+		[StructLayout(LayoutKind.Sequential)]
+		public struct XFORM
+		{
+			public float eM11;
+			public float eM12;
+			public float eM21;
+			public float eM22;
+			public float eDx;
+			public float eDy;
+
+			public XFORM(float eM11, float eM12, float eM21, float eM22, float eDx, float eDy)
+			{
+				this.eM11 = eM11;
+				this.eM12 = eM12;
+				this.eM21 = eM21;
+				this.eM22 = eM22;
+				this.eDx = eDx;
+				this.eDy = eDy;
+			}
+
+			/// <summary>
+			///   Allows implicit conversion to a managed transformation matrix.
+			/// </summary>
+			public static implicit operator System.Drawing.Drawing2D.Matrix(XFORM xf)
+			{
+				return new System.Drawing.Drawing2D.Matrix(xf.eM11, xf.eM12, xf.eM21, xf.eM22, xf.eDx, xf.eDy);
+			}
+
+			/// <summary>
+			///   Allows implicit conversion from a managed transformation matrix.
+			/// </summary>
+			public static implicit operator XFORM(System.Drawing.Drawing2D.Matrix m)
+			{
+				float[] elems = m.Elements;
+				return new XFORM(elems[0], elems[1], elems[2], elems[3], elems[4], elems[5]);
+			}
+		}
+		
+		[StructLayout(LayoutKind.Sequential)]
+		public struct BLENDFUNCTION
+		{
+			byte BlendOp;
+			byte BlendFlags;
+			byte SourceConstantAlpha;
+			byte AlphaFormat;
+
+			public BLENDFUNCTION(byte op, byte flags, byte alpha, byte format)
+			{
+				BlendOp = op;
+				BlendFlags = flags;
+				SourceConstantAlpha = alpha;
+				AlphaFormat = format;
+			}
+		}
+
+		const byte AC_SRC_OVER = 0x00;
+		const byte AC_SRC_ALPHA = 0x01;
+
+		#endregion
+
+		#region Classes, Structs, and Enums
+
+		private class GdiGraphicsLock : IDisposable
+		{
+			private readonly GdiRenderer _gdi;
+
+			public GdiGraphicsLock(GdiRenderer gdi)
+			{
+				_gdi = gdi;
+			}
+
+			public void Dispose()
+			{
+				_gdi.CopyToScreen();
+				_gdi.EndOffScreenBitmap();
+				_gdi._g.ReleaseHdc(_gdi._hdc);
+				_gdi._hdc = IntPtr.Zero;
+				_gdi._g = null;
+			}
+		}
+
+		private struct GDIRect
+		{
+			private int left;
+			private int top;
+			private int right;
+			private int bottom;
+
+			public GDIRect(Rectangle r)
+			{
+				left = r.Left;
+				top = r.Top;
+				bottom = r.Bottom;
+				right = r.Right;
+			}
+		}
+
+		private enum PaintObjects
+		{
+			WHITE_BRUSH = 0,
+			LTGRAY_BRUSH = 1,
+			GRAY_BRUSH = 2,
+			DKGRAY_BRUSH = 3,
+			BLACK_BRUSH = 4,
+			NULL_BRUSH = 5,
+			WHITE_PEN = 6,
+			BLACK_PEN = 7,
+			NULL_PEN = 8,
+			OEM_FIXED_FONT = 10,
+			ANSI_FIXED_FONT = 11,
+			ANSI_VAR_FONT = 12,
+			SYSTEM_FONT = 13,
+			DEVICE_DEFAULT_FONT = 14,
+			DEFAULT_PALETTE = 15,
+			SYSTEM_FIXED_FONT = 16,
+			DC_BRUSH = 18,
+			DC_PEN = 19,
+		}
+
+		private enum BkModes : int
+		{
+			TRANSPARENT = 1,
+			OPAQUE = 2
+		}
+
+		#endregion
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs
new file mode 100644
index 0000000000..103f3fd916
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Drawing;
+
+namespace BizHawk.Client.EmuHawk.CustomControls
+{
+	public class GdiPlusRenderer : IControlRenderer
+	{
+		private Graphics _graphics;
+
+		private readonly Pen _currentPen = new Pen(Color.Black);
+		private readonly SolidBrush _currentBrush = new SolidBrush(Color.Black);
+		private readonly SolidBrush _currentStringBrush = new SolidBrush(Color.Black);
+		private readonly Font _defaultFont = new Font("Arial", 8, FontStyle.Bold);
+		private Font _currentFont;
+		private bool _rotateString;
+
+		public GdiPlusRenderer()
+		{
+			_currentFont = _defaultFont;
+		}
+
+		private class GdiPlusGraphicsLock : IDisposable
+		{
+			public void Dispose()
+			{
+				// Nothing to do
+				// Other drawing methods need a way to dispose on demand, hence the need for 
+				// this dummy class
+			}
+		}
+
+		public void Dispose()
+		{
+			_currentPen.Dispose();
+			_currentBrush.Dispose();
+			_currentStringBrush.Dispose();
+			_defaultFont.Dispose();
+		}
+
+		public void DrawBitmap(Bitmap bitmap, Point point)
+		{
+			_graphics.DrawImage(bitmap, point);
+		}
+
+		public void DrawRectangle(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect)
+		{
+			_graphics.DrawRectangle(
+				_currentPen,
+				new Rectangle(nLeftRect, nTopRect, nRightRect - nLeftRect, nBottomRect - nTopRect));
+		}
+
+		public void DrawString(string str, Point point)
+		{
+			if (_rotateString)
+			{
+				_graphics.TranslateTransform(point.X, point.Y);
+				_graphics.RotateTransform(90);
+				_graphics.DrawString(str, _currentFont, _currentStringBrush, Point.Empty);
+				_graphics.ResetTransform();
+			}
+			else
+			{
+				_graphics.DrawString(str, _currentFont, _currentStringBrush, point);
+			}
+		}
+
+		public void FillRectangle(int x, int y, int w, int h)
+		{
+			_graphics.FillRectangle(
+				_currentBrush,
+				new Rectangle(x, y, w, h));
+		}
+
+		public void Line(int x1, int y1, int x2, int y2)
+		{
+			_graphics.DrawLine(_currentPen, x1, y1, x2, y2);
+		}
+
+		public IDisposable LockGraphics(Graphics g, int width, int height)
+		{
+			_graphics = g;
+			return new GdiPlusGraphicsLock();
+		}
+
+		public Size MeasureString(string str, Font font)
+		{
+			var size = _graphics.MeasureString(str, font);
+			return new Size((int)(size.Width + 0.5), (int)(size.Height + 0.5));
+		}
+
+		public void PrepDrawString(Font font, Color color, bool rotate = false)
+		{
+			_currentFont = font;
+			_currentStringBrush.Color = color;
+			_rotateString = rotate;
+		}
+
+		public void SetBrush(Color color)
+		{
+			_currentBrush.Color = color;
+		}
+
+		public void SetSolidPen(Color color)
+		{
+			_currentPen.Color = color;
+		}
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/IControlRenderer.cs b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/IControlRenderer.cs
new file mode 100644
index 0000000000..9a5475cd9e
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/IControlRenderer.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Drawing;
+
+namespace BizHawk.Client.EmuHawk.CustomControls
+{
+	public interface IControlRenderer : IDisposable
+	{
+		/// <summary>
+		/// Required to use before calling drawing methods
+		/// </summary>
+		IDisposable LockGraphics(Graphics g, int width, int height);
+
+		/// <summary>
+		/// Measure the width and height of string <paramref name="str"/> when drawn
+		/// using the given font <paramref  name="font"/>
+		/// </summary>
+		Size MeasureString(string str, Font font);
+
+		void SetBrush(Color color);
+		void SetSolidPen(Color color);
+
+		void PrepDrawString(Font font, Color color, bool rotate = false);
+
+		/// <summary>
+		/// Draw the given string using the given  font and foreground color at given location
+		/// </summary>
+		void DrawString(string str, Point point);
+
+		void DrawRectangle(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+		void FillRectangle(int x, int y, int w, int h);
+
+		/// <summary>
+		/// Draw a bitmap object at the given position
+		/// </summary>
+		void DrawBitmap(Bitmap bitmap, Point point);
+		void Line(int x1, int y1, int x2, int y2);
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/GDIRenderer.cs b/BizHawk.Client.EmuHawk/CustomControls/GDIRenderer.cs
deleted file mode 100644
index 92ef9d86c0..0000000000
--- a/BizHawk.Client.EmuHawk/CustomControls/GDIRenderer.cs
+++ /dev/null
@@ -1,769 +0,0 @@
-using System;
-using System.Text;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Runtime.InteropServices;
-
-namespace BizHawk.Client.EmuHawk.CustomControls
-{
-	/// <summary>
-	/// Wrapper for GDI rendering functions
-	/// This class is not thread-safe as GDI functions should be called from the UI thread
-	/// </summary>
-	public sealed class GDIRenderer : IDisposable
-	{
-		/// <summary>
-		/// used for <see cref="MeasureString(string, System.Drawing.Font, float, out int, out int)"/> calculation.
-		/// </summary>
-		private static readonly int[] CharFit = new int[1];
-
-		/// <summary>
-		/// used for <see cref="MeasureString(string, System.Drawing.Font,float, out int, out int)"/> calculation
-		/// </summary>
-		private static readonly int[] CharFitWidth = new int[1000];
-
-		/// <summary>
-		/// Cache of all the HFONTs used, rather than create them again and again
-		/// </summary>
-		private readonly Dictionary<Font, FontCacheEntry> FontsCache = new Dictionary<Font, FontCacheEntry>();
-
-		class FontCacheEntry
-		{
-			public IntPtr HFont;
-		}
-
-		/// <summary>
-		/// Cache of all the brushes used, rather than create them again and again
-		/// </summary>
-		private readonly Dictionary<Color, IntPtr> BrushCache = new Dictionary<Color, IntPtr>();
-
-		private Graphics _g;
-		private IntPtr _hdc;
-		private IntPtr _currentBrush = IntPtr.Zero;
-
-		#region Construct and Destroy
-
-		public GDIRenderer()
-		{
-			//zero 04-16-2016 : this can't be legal, theres no HDC yet
-			//SetBkMode(_hdc, BkModes.OPAQUE);
-		}
-
-		public void Dispose()
-		{
-			foreach (var brush in BrushCache)
-			{
-				if (brush.Value != IntPtr.Zero)
-				{
-					DeleteObject(brush.Value);
-				}
-			}
-
-			foreach (var fc in FontsCache)
-				DeleteObject(fc.Value.HFont);
-
-			EndOffScreenBitmap();
-
-			System.Diagnostics.Debug.Assert(_hdc == IntPtr.Zero, "Disposed a GDIRenderer while it held an HDC");
-			System.Diagnostics.Debug.Assert(_g == null, "Disposed a GDIRenderer while it held a Graphics");
-		}
-
-		#endregion
-
-		#region Api
-
-		/// <summary>
-		/// Draw a bitmap object at the given position
-		/// </summary>
-		public void DrawBitmap(Bitmap bitmap, Point point, bool blend = false)
-		{
-			IntPtr hbmp = bitmap.GetHbitmap();
-			var bitHDC = CreateCompatibleDC(CurrentHDC);
-			IntPtr old = SelectObject(bitHDC, hbmp);
-			if (blend)
-			{
-				AlphaBlend(CurrentHDC, point.X, point.Y, bitmap.Width, bitmap.Height, bitHDC, 0, 0, bitmap.Width, bitmap.Height, new BLENDFUNCTION(AC_SRC_OVER, 0, 0xff, AC_SRC_ALPHA));
-			}
-			else
-			{
-				BitBlt(CurrentHDC, point.X, point.Y, bitmap.Width, bitmap.Height, bitHDC, 0, 0, 0xCC0020);
-			}
-			SelectObject(bitHDC, old);
-			DeleteDC(bitHDC);
-			DeleteObject(hbmp);
-		}
-
-		/// <summary>
-		/// Required to use before calling drawing methods
-		/// </summary>
-		public GdiGraphicsLock LockGraphics(Graphics g)
-		{
-			_g = g;
-			_hdc = g.GetHdc();
-			SetBkMode(_hdc, BkModes.TRANSPARENT);
-			return new GdiGraphicsLock(this);
-		}
-
-		/// <summary>
-		/// Measure the width and height of string <paramref name="str"/> when drawn on device context HDC
-		/// using the given font <paramref  name="font"/>
-		/// </summary>
-		public Size MeasureString(string str, Font font)
-		{
-			SetFont(font);
-
-			var size = new Size();
-			GetTextExtentPoint32(CurrentHDC, str, str.Length, ref size);
-			return size;
-		}
-
-		/// <summary>      
-		/// Measure the width and height of string <paramref name="str"/> when drawn on device context HDC
-		/// using the given font <paramref  name="font"/>
-		/// Restrict the width of the string and get the number of characters able to fit in the restriction and
-		/// the width those characters take
-		/// </summary>
-		/// <param name="maxWidth">the max width to render the string  in</param>
-		/// <param name="charFit">the number of characters that will fit under  <see cref="maxWidth"/> restriction</param>      
-		public Size MeasureString(string str, Font font, float maxWidth, out int charFit, out int charFitWidth)
-		{
-			SetFont(font);
-
-			var size = new Size();
-			GetTextExtentExPoint(CurrentHDC, str, str.Length, (int)Math.Round(maxWidth), CharFit, CharFitWidth, ref size);
-			charFit = CharFit[0];
-			charFitWidth = charFit > 0 ? CharFitWidth[charFit - 1] : 0;
-			return size;
-		}
-
-		public void DrawString(string str, Point point)
-		{
-			TextOut(CurrentHDC, point.X, point.Y, str, str.Length);
-		}
-
-		public static IntPtr CreateNormalHFont(Font font, int width)
-		{
-			LOGFONT logf = new LOGFONT();
-			font.ToLogFont(logf);
-			logf.lfWidth = width;
-			logf.lfOutPrecision = (byte)FontPrecision.OUT_TT_ONLY_PRECIS;
-			var ret = CreateFontIndirect(logf);
-			return ret;
-		}
-
-		//this returns an IntPtr HFONT because .net's Font class will erase the relevant properties when using its Font.FromLogFont()
-		//note that whether this is rotated clockwise or CCW might affect how you have to position the text (right-aligned sometimes?, up or down by the height of the font?)
-		public static IntPtr CreateRotatedHFont(Font font, bool CW)
-		{
-			LOGFONT logf = new LOGFONT();
-			font.ToLogFont(logf);
-			logf.lfEscapement = CW ? 2700 : 900;
-			logf.lfOrientation = logf.lfEscapement;
-			logf.lfOutPrecision = (byte)FontPrecision.OUT_TT_ONLY_PRECIS;
-
-			//this doesnt work! .net erases the relevant propreties.. it seems?
-			//return Font.FromLogFont(logf);
-
-			var ret = CreateFontIndirect(logf);
-			return ret;
-		}
-
-		public static void DestroyHFont(IntPtr hfont)
-		{
-			DeleteObject(hfont);
-		}
-
-		public void PrepDrawString(IntPtr hfont, Color color)
-		{
-			SetGraphicsMode(CurrentHDC, 2); //shouldnt be necessary.. cant hurt
-			SelectObject(CurrentHDC, hfont);
-			SetTextColor(color);
-		}
-
-		public void PrepDrawString(Font font, Color color)
-		{
-			SetFont(font);
-			SetTextColor(color);
-		}
-
-
-		/// <summary>
-		/// Draw the given string using the given  font and foreground color at given location
-		/// See [http://msdn.microsoft.com/en-us/library/windows/desktop/dd162498(v=vs.85).aspx][15]
-		/// </summary>
-		public void DrawString(string str, Font font, Color color, Rectangle rect, TextFormatFlags flags)
-		{
-			SetFont(font);
-			SetTextColor(color);
-
-			var rect2 = new Rect(rect);
-			DrawText(CurrentHDC, str, str.Length, ref  rect2, (uint)flags);
-		}
-
-
-		/// <summary>
-		/// Set the text color of the device  context
-		/// </summary>
-		public void SetTextColor(Color color)
-		{
-			int rgb = (color.B & 0xFF) << 16 | (color.G & 0xFF) << 8 | color.R;
-			SetTextColor(CurrentHDC, rgb);
-		}
-
-		public void SetBackgroundColor(Color color)
-		{
-			int rgb = (color.B & 0xFF) << 16 | (color.G & 0xFF) << 8 | color.R;
-			SetBkColor(CurrentHDC, rgb);
-		}
-
-		public void DrawRectangle(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect)
-		{
-			Rectangle(CurrentHDC, nLeftRect, nTopRect, nRightRect, nBottomRect);
-		}
-
-		public void SetBrush(Color color)
-		{
-			if (BrushCache.ContainsKey(color))
-			{
-				_currentBrush = BrushCache[color];
-			}
-			else
-			{
-				int rgb = (color.B & 0xFF) << 16 | (color.G & 0xFF) << 8 | color.R;
-				var newBrush = CreateSolidBrush(rgb);
-				BrushCache.Add(color, newBrush);
-				_currentBrush = newBrush;
-			}
-		}
-
-		public void FillRectangle(int x, int y, int w, int h)
-		{
-			var r = new GDIRect(new Rectangle(x, y, w, h));
-			FillRect(CurrentHDC, ref r, _currentBrush);
-		}
-
-		public void SetPenPosition(int x, int y)
-		{
-			MoveToEx(CurrentHDC, x, y, IntPtr.Zero);
-		}
-
-		public void SetSolidPen(Color color)
-		{
-			int rgb = (color.B & 0xFF) << 16 | (color.G & 0xFF) << 8 | color.R;
-			SelectObject(CurrentHDC, GetStockObject((int)PaintObjects.DC_PEN));
-			SetDCPenColor(CurrentHDC, rgb);
-		}
-
-		public void Line(int x1, int y1, int x2, int y2)
-		{
-			MoveToEx(CurrentHDC, x1, y1, IntPtr.Zero);
-			LineTo(CurrentHDC, x2, y2);
-		}
-
-		private IntPtr CurrentHDC
-		{
-			get { return _bitHDC != IntPtr.Zero ? _bitHDC : _hdc; }
-		}
-
-		private IntPtr _bitMap = IntPtr.Zero;
-		private IntPtr _bitHDC = IntPtr.Zero;
-		private int _bitW;
-		private int _bitH;
-
-		public void StartOffScreenBitmap(int width, int height)
-		{
-			_bitW = width;
-			_bitH = height;
-
-			_bitHDC = CreateCompatibleDC(_hdc);
-			_bitMap = CreateCompatibleBitmap(_hdc, width, height);
-			SelectObject(_bitHDC, _bitMap);
-			SetBkMode(_bitHDC, BkModes.TRANSPARENT);
-		}
-
-		public void EndOffScreenBitmap()
-		{
-			_bitW = 0;
-			_bitH = 0;
-			
-			DeleteObject(_bitMap);
-			DeleteObject(_bitHDC);
-
-			_bitHDC = IntPtr.Zero;
-			_bitMap = IntPtr.Zero;
-		}
-
-		public void CopyToScreen()
-		{
-			BitBlt(_hdc, 0, 0, _bitW, _bitH, _bitHDC, 0, 0, 0x00CC0020);
-		}
-
-		#endregion
-
-		#region Helpers
-
-		/// <summary>
-		/// Set a resource (e.g. a font) for the  specified device context.      
-		/// </summary>
-		private void SetFont(Font font)
-		{
-			SelectObject(CurrentHDC, GetCachedHFont(font));
-		}
-
-		private IntPtr GetCachedHFont(Font font)
-		{
-			//the original code struck me as bad. attempting to ID fonts by picking a subset of their fields is not gonna work.
-			//don't call this.Font in InputRoll.cs, it is probably slow.
-			//consider Fonts to be a jealously guarded resource (they need to be disposed, after all) and manage them carefully.
-			//this cache maintains the HFONTs only.
-			FontCacheEntry ce;
-			if (!FontsCache.TryGetValue(font, out ce))
-			{
-				FontsCache[font] = ce = new FontCacheEntry();
-				ce.HFont = font.ToHfont();
-			}
-			return ce.HFont;
-		}
-
-		#endregion
-
-		#region Imports
-
-		[DllImport("user32.dll")]
-		private static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
-
-		[DllImport("user32.dll")]
-		private static extern IntPtr GetDC(IntPtr hWnd);
-
-		[DllImport("user32.dll")]
-		private static extern IntPtr BeginPaint(IntPtr hWnd, ref IntPtr lpPaint);
-
-		[DllImport("user32.dll")]
-		private static extern IntPtr EndPaint(IntPtr hWnd, IntPtr lpPaint);
-
-		[DllImport("gdi32.dll", CharSet = CharSet.Auto)]
-		private static extern IntPtr CreateFontIndirect(
-			[In, MarshalAs(UnmanagedType.LPStruct)]LOGFONT lplf
-			);
-
-		[DllImport("gdi32.dll")]
-		private static extern int Rectangle(IntPtr hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
-
-		[DllImport("user32.dll")]
-		private static extern int FillRect(IntPtr hdc, [In] ref GDIRect lprc, IntPtr hbr);
-
-		[DllImport("gdi32.dll")]
-		private static extern int SetBkMode(IntPtr hdc, BkModes mode);
-
-		[DllImport("gdi32.dll")]
-		private static extern IntPtr SelectObject(IntPtr hdc, IntPtr hgdiObj);
-
-		[DllImport("gdi32.dll")]
-		private static extern int SetTextColor(IntPtr hdc, int color);
-
-		[DllImport("gdi32.dll")]
-		private static extern int SetBkColor(IntPtr hdc, int color);
-
-		[DllImport("gdi32.dll", EntryPoint = "GetTextExtentPoint32W")]
-		private static extern int GetTextExtentPoint32(IntPtr hdc, [MarshalAs(UnmanagedType.LPWStr)] string str, int len, ref Size size);
-
-		[DllImport("gdi32.dll", EntryPoint = "GetTextExtentExPointW")]
-		private static extern bool GetTextExtentExPoint(IntPtr hDc, [MarshalAs(UnmanagedType.LPWStr)]string str, int nLength, int nMaxExtent, int[] lpnFit, int[] alpDx, ref Size size);
-
-		[DllImport("gdi32.dll", EntryPoint = "TextOutW")]
-		private static extern bool TextOut(IntPtr hdc, int x, int y, [MarshalAs(UnmanagedType.LPWStr)] string str, int len);
-
-		[DllImport("gdi32.dll")]
-		public static extern int SetGraphicsMode(IntPtr hdc, int iMode);
-
-		[DllImport("user32.dll", EntryPoint = "DrawTextW")]
-		private static extern int DrawText(IntPtr hdc, [MarshalAs(UnmanagedType.LPWStr)] string str, int len, ref Rect rect, uint uFormat);
-
-		[DllImport("gdi32.dll", EntryPoint = "ExtTextOutW")]
-		private static extern bool ExtTextOut(IntPtr hdc, int X, int Y, uint fuOptions, uint cbCount, [In] IntPtr lpDx);
-
-		[DllImport("gdi32.dll")]
-		static extern bool SetWorldTransform(IntPtr hdc, [In] ref XFORM lpXform);
-
-		[DllImport("gdi32.dll")]
-		private static extern int SelectClipRgn(IntPtr hdc, IntPtr hrgn);
-
-		[DllImport("gdi32.dll")]
-		private static extern bool DeleteObject(IntPtr hObject);
-
-		[DllImport("gdi32.dll")]
-		private static extern IntPtr CreateSolidBrush(int color);
-
-		[DllImport("gdi32.dll")]
-		private static extern IntPtr CreatePen(int fnPenStyle, int nWidth, int color);
-
-		[DllImport("gdi32.dll")]
-		private static extern IntPtr MoveToEx(IntPtr hdc, int x, int y, IntPtr point);
-
-		[DllImport("gdi32.dll")]
-		private static extern IntPtr LineTo(IntPtr hdc, int nXEnd, int nYEnd);
-
-		[DllImport("gdi32.dll")]
-		private static extern IntPtr GetStockObject(int fnObject);
-
-		[DllImport("gdi32.dll")]
-		private static extern IntPtr SetDCPenColor(IntPtr hdc, int crColor);
-
-		[DllImport("gdi32.dll")]
-		private static extern IntPtr CreateCompatibleDC(IntPtr hdc);
-
-		[DllImport("gdi32.dll", EntryPoint = "DeleteDC")]
-		public static extern bool DeleteDC([In] IntPtr hdc);
-
-		[DllImport("gdi32.dll")]
-		private static extern IntPtr CreateCompatibleBitmap(IntPtr hdc, int width, int height);
-
-		[DllImport("gdi32.dll", EntryPoint = "BitBlt", SetLastError = true)]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		static extern bool BitBlt([In] IntPtr hdc, int nXDest, int nYDest, int nWidth, int nHeight, [In] IntPtr hdcSrc, int nXSrc, int nYSrc, int dwRop);
-
-		[DllImport("gdi32.dll", EntryPoint = "GdiAlphaBlend")]
-		static extern bool AlphaBlend(IntPtr hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, IntPtr hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, BLENDFUNCTION blendFunction);
-
-		public enum FontWeight : int
-		{
-			FW_DONTCARE = 0,
-			FW_THIN = 100,
-			FW_EXTRALIGHT = 200,
-			FW_LIGHT = 300,
-			FW_NORMAL = 400,
-			FW_MEDIUM = 500,
-			FW_SEMIBOLD = 600,
-			FW_BOLD = 700,
-			FW_EXTRABOLD = 800,
-			FW_HEAVY = 900,
-		}
-		public enum FontCharSet : byte
-		{
-			ANSI_CHARSET = 0,
-			DEFAULT_CHARSET = 1,
-			SYMBOL_CHARSET = 2,
-			SHIFTJIS_CHARSET = 128,
-			HANGEUL_CHARSET = 129,
-			HANGUL_CHARSET = 129,
-			GB2312_CHARSET = 134,
-			CHINESEBIG5_CHARSET = 136,
-			OEM_CHARSET = 255,
-			JOHAB_CHARSET = 130,
-			HEBREW_CHARSET = 177,
-			ARABIC_CHARSET = 178,
-			GREEK_CHARSET = 161,
-			TURKISH_CHARSET = 162,
-			VIETNAMESE_CHARSET = 163,
-			THAI_CHARSET = 222,
-			EASTEUROPE_CHARSET = 238,
-			RUSSIAN_CHARSET = 204,
-			MAC_CHARSET = 77,
-			BALTIC_CHARSET = 186,
-		}
-		public enum FontPrecision : byte
-		{
-			OUT_DEFAULT_PRECIS = 0,
-			OUT_STRING_PRECIS = 1,
-			OUT_CHARACTER_PRECIS = 2,
-			OUT_STROKE_PRECIS = 3,
-			OUT_TT_PRECIS = 4,
-			OUT_DEVICE_PRECIS = 5,
-			OUT_RASTER_PRECIS = 6,
-			OUT_TT_ONLY_PRECIS = 7,
-			OUT_OUTLINE_PRECIS = 8,
-			OUT_SCREEN_OUTLINE_PRECIS = 9,
-			OUT_PS_ONLY_PRECIS = 10,
-		}
-		public enum FontClipPrecision : byte
-		{
-			CLIP_DEFAULT_PRECIS = 0,
-			CLIP_CHARACTER_PRECIS = 1,
-			CLIP_STROKE_PRECIS = 2,
-			CLIP_MASK = 0xf,
-			CLIP_LH_ANGLES = (1 << 4),
-			CLIP_TT_ALWAYS = (2 << 4),
-			CLIP_DFA_DISABLE = (4 << 4),
-			CLIP_EMBEDDED = (8 << 4),
-		}
-		public enum FontQuality : byte
-		{
-			DEFAULT_QUALITY = 0,
-			DRAFT_QUALITY = 1,
-			PROOF_QUALITY = 2,
-			NONANTIALIASED_QUALITY = 3,
-			ANTIALIASED_QUALITY = 4,
-			CLEARTYPE_QUALITY = 5,
-			CLEARTYPE_NATURAL_QUALITY = 6,
-		}
-		[Flags]
-		public enum FontPitchAndFamily : byte
-		{
-			DEFAULT_PITCH = 0,
-			FIXED_PITCH = 1,
-			VARIABLE_PITCH = 2,
-			FF_DONTCARE = (0 << 4),
-			FF_ROMAN = (1 << 4),
-			FF_SWISS = (2 << 4),
-			FF_MODERN = (3 << 4),
-			FF_SCRIPT = (4 << 4),
-			FF_DECORATIVE = (5 << 4),
-		}
-
-		//it is important for this to be the right declaration
-		//see more here http://www.tech-archive.net/Archive/DotNet/microsoft.public.dotnet.framework.drawing/2004-04/0319.html
-		//if it's wrong (I had a wrong one from pinvoke.net) then ToLogFont will fail mysteriously
-		[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-		class LOGFONT
-		{
-			public int lfHeight = 0;
-			public int lfWidth = 0;
-			public int lfEscapement = 0;
-			public int lfOrientation = 0;
-			public int lfWeight = 0;
-			public byte lfItalic = 0;
-			public byte lfUnderline = 0;
-			public byte lfStrikeOut = 0;
-			public byte lfCharSet = 0;
-			public byte lfOutPrecision = 0;
-			public byte lfClipPrecision = 0;
-			public byte lfQuality = 0;
-			public byte lfPitchAndFamily = 0;
-			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-			public string lfFaceName = null;
-		} 
-
-		/// <summary>
-		///   The graphics mode that can be set by SetGraphicsMode.
-		/// </summary>
-		public enum GraphicsMode : int
-		{
-			/// <summary>
-			///   Sets the graphics mode that is compatible with 16-bit Windows. This is the default mode. If
-			///   this value is specified, the application can only modify the world-to-device transform by
-			///   calling functions that set window and viewport extents and origins, but not by using
-			///   SetWorldTransform or ModifyWorldTransform; calls to those functions will fail.
-			///   Examples of functions that set window and viewport extents and origins are SetViewportExtEx
-			///   and SetWindowExtEx.
-			/// </summary>
-			GM_COMPATIBLE = 1,
-			/// <summary>
-			///   Sets the advanced graphics mode that allows world transformations. This value must be
-			///   specified if the application will set or modify the world transformation for the specified
-			///   device context. In this mode all graphics, including text output, fully conform to the
-			///   world-to-device transformation specified in the device context.
-			/// </summary>
-			GM_ADVANCED = 2,
-		}
-
-		/// <summary>
-		///   The XFORM structure specifies a world-space to page-space transformation.
-		/// </summary>
-		[StructLayout(LayoutKind.Sequential)]
-		public struct XFORM
-		{
-			public float eM11;
-			public float eM12;
-			public float eM21;
-			public float eM22;
-			public float eDx;
-			public float eDy;
-
-			public XFORM(float eM11, float eM12, float eM21, float eM22, float eDx, float eDy)
-			{
-				this.eM11 = eM11;
-				this.eM12 = eM12;
-				this.eM21 = eM21;
-				this.eM22 = eM22;
-				this.eDx = eDx;
-				this.eDy = eDy;
-			}
-
-			/// <summary>
-			///   Allows implicit converstion to a managed transformation matrix.
-			/// </summary>
-			public static implicit operator System.Drawing.Drawing2D.Matrix(XFORM xf)
-			{
-				return new System.Drawing.Drawing2D.Matrix(xf.eM11, xf.eM12, xf.eM21, xf.eM22, xf.eDx, xf.eDy);
-			}
-
-			/// <summary>
-			///   Allows implicit converstion from a managed transformation matrix.
-			/// </summary>
-			public static implicit operator XFORM(System.Drawing.Drawing2D.Matrix m)
-			{
-				float[] elems = m.Elements;
-				return new XFORM(elems[0], elems[1], elems[2], elems[3], elems[4], elems[5]);
-			}
-		}
-		
-		[StructLayout(LayoutKind.Sequential)]
-		public struct BLENDFUNCTION
-		{
-			byte BlendOp;
-			byte BlendFlags;
-			byte SourceConstantAlpha;
-			byte AlphaFormat;
-
-			public BLENDFUNCTION(byte op, byte flags, byte alpha, byte format)
-			{
-				BlendOp = op;
-				BlendFlags = flags;
-				SourceConstantAlpha = alpha;
-				AlphaFormat = format;
-			}
-		}
-
-		const byte AC_SRC_OVER = 0x00;
-		const byte AC_SRC_ALPHA = 0x01;
-
-		[DllImport("gdi32.dll")]
-		static extern int SetBitmapBits(IntPtr hbmp, uint cBytes, byte[] lpBits);
-
-		#endregion
-
-		#region Classes, Structs, and Enums
-
-		public class GdiGraphicsLock : IDisposable
-		{
-			private readonly GDIRenderer Gdi;
-
-			public GdiGraphicsLock(GDIRenderer gdi)
-			{
-				this.Gdi = gdi;
-			}
-
-			public void Dispose()
-			{
-				Gdi._g.ReleaseHdc(Gdi._hdc);
-				Gdi._hdc = IntPtr.Zero;
-				Gdi._g = null;
-			}
-		}
-
-		private struct Rect
-		{
-			private int _left;
-			private int _top;
-			private int _right;
-			private int _bottom;
-
-			public Rect(Rectangle r)
-			{
-				_left = r.Left;
-				_top = r.Top;
-				_bottom = r.Bottom;
-				_right = r.Right;
-			}
-		}
-
-		private struct GDIRect
-		{
-			private int left;
-			private int top;
-			private int right;
-			private int bottom;
-
-			public GDIRect(Rectangle r)
-			{
-				left = r.Left;
-				top = r.Top;
-				bottom = r.Bottom;
-				right = r.Right;
-			}
-		}
-
-		private struct GDIPoint
-		{
-			private int x;
-			private int y;
-
-			private GDIPoint(int x, int y)
-			{
-				this.x = x;
-				this.y = y;
-			}
-		}
-
-		[Flags]
-		public enum ETOOptions : uint
-		{
-			CLIPPED = 0x4,
-			GLYPH_INDEX = 0x10,
-			IGNORELANGUAGE = 0x1000,
-			NUMERICSLATIN = 0x800,
-			NUMERICSLOCAL = 0x400,
-			OPAQUE = 0x2,
-			PDY = 0x2000,
-			RTLREADING = 0x800,
-		}
-
-		/// <summary>
-		/// See [http://msdn.microsoft.com/en-us/library/windows/desktop/dd162498(v=vs.85).aspx][15]
-		///  </summary>
-		[Flags]
-		public enum TextFormatFlags : uint
-		{
-			Default = 0x00000000,
-			Center = 0x00000001,
-			Right = 0x00000002,
-			VCenter = 0x00000004,
-			Bottom = 0x00000008,
-			WordBreak = 0x00000010,
-			SingleLine = 0x00000020,
-			ExpandTabs = 0x00000040,
-			TabStop = 0x00000080,
-			NoClip = 0x00000100,
-			ExternalLeading = 0x00000200,
-			CalcRect = 0x00000400,
-			NoPrefix = 0x00000800,
-			Internal = 0x00001000,
-			EditControl = 0x00002000,
-			PathEllipsis = 0x00004000,
-			EndEllipsis = 0x00008000,
-			ModifyString = 0x00010000,
-			RtlReading = 0x00020000,
-			WordEllipsis = 0x00040000,
-			NoFullWidthCharBreak = 0x00080000,
-			HidePrefix = 0x00100000,
-			ProfixOnly = 0x00200000,
-		}
-
-		[Flags]
-		public enum PenStyles
-		{
-			PS_SOLID = 0x00000000
-			// TODO
-		}
-
-		public enum PaintObjects
-		{
-			WHITE_BRUSH = 0,
-			LTGRAY_BRUSH = 1,
-			GRAY_BRUSH = 2,
-			DKGRAY_BRUSH = 3,
-			BLACK_BRUSH = 4,
-			NULL_BRUSH = 5,
-			WHITE_PEN = 6,
-			BLACK_PEN = 7,
-			NULL_PEN = 8,
-			OEM_FIXED_FONT = 10,
-			ANSI_FIXED_FONT = 11,
-			ANSI_VAR_FONT = 12,
-			SYSTEM_FONT = 13,
-			DEVICE_DEFAULT_FONT = 14,
-			DEFAULT_PALETTE = 15,
-			SYSTEM_FIXED_FONT = 16,
-			DC_BRUSH = 18,
-			DC_PEN = 19,
-		}
-
-		public enum BkModes : int
-		{
-			TRANSPARENT = 1,
-			OPAQUE = 2
-		}
-
-		#endregion
-	}
-}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/HexView.cs b/BizHawk.Client.EmuHawk/CustomControls/HexView.cs
index 30faae953b..446c41950f 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/HexView.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/HexView.cs
@@ -12,7 +12,7 @@ namespace BizHawk.Client.EmuHawk
 {
 	public class HexView : Control
 	{
-		private readonly GDIRenderer Gdi;
+		//private readonly IControlRenderer _renderer;
 		private readonly Font NormalFont;
 		private Size _charSize;
 
@@ -27,18 +27,18 @@ namespace BizHawk.Client.EmuHawk
 			SetStyle(ControlStyles.SupportsTransparentBackColor, true);
 			SetStyle(ControlStyles.Opaque, true);
 
-			Gdi = new GDIRenderer();
+			//_renderer = new GdiRenderer();
 
-			using (var g = CreateGraphics())
-			using (var LCK = Gdi.LockGraphics(g))
-			{
-				_charSize = Gdi.MeasureString("A", NormalFont); // TODO make this a property so changing it updates other values.
-			}
+			//using (var g = CreateGraphics())
+			//using (var LCK = _renderer.LockGraphics(g))
+			//{
+			//	_charSize = _renderer.MeasureString("A", NormalFont); // TODO make this a property so changing it updates other values.
+			//}
 		}
 
 		protected override void Dispose(bool disposing)
 		{
-			Gdi.Dispose();
+			//_renderer.Dispose();
 
 			NormalFont.Dispose();
 
@@ -49,21 +49,21 @@ namespace BizHawk.Client.EmuHawk
 
 		protected override void OnPaint(PaintEventArgs e)
 		{
-			using (var LCK = Gdi.LockGraphics(e.Graphics))
-			{
-				Gdi.StartOffScreenBitmap(Width, Height);
+			//using (var lck = _renderer.LockGraphics(e.Graphics))
+			//{
+			//	_renderer.StartOffScreenBitmap(Width, Height);
 
-				// White Background
-				Gdi.SetBrush(Color.White);
-				Gdi.SetSolidPen(Color.White);
-				Gdi.FillRectangle(0, 0, Width, Height);
+			//	// White Background
+			//	_renderer.SetBrush(Color.White);
+			//	_renderer.SetSolidPen(Color.White);
+			//	_renderer.FillRectangle(0, 0, Width, Height);
 
 
-				Gdi.DrawString("Hello World", new Point(10, 10));
+			//	_renderer.DrawString("Hello World", new Point(10, 10));
 
-				Gdi.CopyToScreen();
-				Gdi.EndOffScreenBitmap();
-			}
+			//	_renderer.CopyToScreen();
+			//	_renderer.EndOffScreenBitmap();
+			//}
 		}
 
 		#endregion
diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs
new file mode 100644
index 0000000000..4ccc3e8e9e
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs
@@ -0,0 +1,96 @@
+using System.Collections.Generic;
+
+namespace BizHawk.Client.EmuHawk
+{
+	/// <summary>
+	/// Represents a single cell of the <seealso cref="InputRoll"/>
+	/// </summary>
+	public class Cell
+	{
+		public RollColumn Column { get; internal set; }
+		public int? RowIndex { get; internal set; }
+		public string CurrentText { get; internal set; }
+
+		public Cell() { }
+
+		public Cell(Cell cell)
+		{
+			Column = cell.Column;
+			RowIndex = cell.RowIndex;
+		}
+
+		public bool IsDataCell => Column != null && RowIndex.HasValue;
+
+		public override bool Equals(object obj)
+		{
+			var cell = obj as Cell;
+			if (cell != null)
+			{
+				return Column == cell.Column && RowIndex == cell.RowIndex;
+			}
+
+			return false;
+		}
+
+		public override int GetHashCode()
+		{
+			return Column.GetHashCode() + RowIndex.GetHashCode();
+		}
+
+		public static bool operator ==(Cell a, Cell b)
+		{
+			if (ReferenceEquals(a, null))
+			{
+				return ReferenceEquals(b, null);
+			}
+
+			return a.Equals(b);
+		}
+
+		public static bool operator !=(Cell a, Cell b)
+		{
+			return !(a == b);
+		}
+	}
+
+	internal class SortCell : IComparer<Cell>
+	{
+		int IComparer<Cell>.Compare(Cell c1, Cell c2)
+		{
+			if (c1 == null && c2 == null)
+			{
+				return 0;
+			}
+
+			if (c2 == null)
+			{
+				return 1;
+			}
+
+			if (c1 == null)
+			{
+				return -1;
+			}
+
+			if (c1.RowIndex.HasValue)
+			{
+				if (c2.RowIndex.HasValue)
+				{
+					int row = c1.RowIndex.Value.CompareTo(c2.RowIndex.Value);
+					return row == 0
+						? c1.Column.Name.CompareTo(c2.Column.Name)
+						: row;
+				}
+					
+				return 1;
+			}
+
+			if (c2.RowIndex.HasValue)
+			{
+				return -1;
+			}
+
+			return c1.Column.Name.CompareTo(c2.Column.Name);
+		}
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/ColumnType.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/ColumnType.cs
new file mode 100644
index 0000000000..b0fb0ce845
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/ColumnType.cs
@@ -0,0 +1,10 @@
+namespace BizHawk.Client.EmuHawk
+{
+	/// <summary>
+	/// Specifies the type of column of a <see cref="RollColumn"/>
+	/// </summary>
+	public enum ColumnType
+	{
+		Boolean, Float, Text, Image
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs
new file mode 100644
index 0000000000..db18513b43
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs
@@ -0,0 +1,697 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
+using BizHawk.Client.EmuHawk.WinFormExtensions;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public partial class InputRoll
+	{
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			using (_renderer.LockGraphics(e.Graphics, Width, Height))
+			{
+				// White Background
+				_renderer.SetBrush(Color.White);
+				_renderer.SetSolidPen(Color.White);
+				_renderer.FillRectangle(0, 0, Width, Height);
+
+				// Lag frame calculations
+				SetLagFramesArray();
+
+				var visibleColumns = _columns.VisibleColumns.ToList();
+
+				CalculateHorizontalColumnPositions(visibleColumns);
+
+				if (visibleColumns.Any())
+				{
+					DrawColumnBg(visibleColumns);
+					DrawColumnText(visibleColumns);
+				}
+
+				// Background
+				DrawBg(visibleColumns);
+
+				// Foreground
+				DrawData(visibleColumns);
+
+				DrawColumnDrag(visibleColumns);
+				DrawCellDrag(visibleColumns);
+			}
+		}
+
+		private void DrawString(string text, int? width, Point point)
+		{
+			if (string.IsNullOrWhiteSpace(text))
+			{
+				return;
+			}
+
+			if (width.HasValue)
+			{
+				var max = (width.Value - CellWidthPadding) / _charSize.Width;
+				if (text.Length >= max)
+				{
+					text = text.Substring(0, max);
+				}
+			}
+
+			_renderer.DrawString(text, point);
+		}
+
+		protected override void OnPaintBackground(PaintEventArgs e)
+		{
+			// Do nothing, and this should never be called
+		}
+
+		private void CalculateHorizontalColumnPositions(List<RollColumn> visibleColumns)
+		{
+			if (!HorizontalOrientation)
+			{
+				_horizontalColumnHeights = null;
+				_horizontalColumnTops = null;
+				return;
+			}
+
+			_horizontalColumnHeights = new int[visibleColumns.Count];
+			_horizontalColumnTops = new int[visibleColumns.Count];
+
+			int top = 0;
+			int startRow = FirstVisibleRow;
+			for (int j = 0; j < visibleColumns.Count; j++)
+			{
+				RollColumn col = visibleColumns[j];
+				int height = CellHeight;
+				if (col.Rotatable && col.RotatedHeight != null)
+				{
+					height = Math.Max(height, col.RotatedHeight.Value);
+				}
+				else if (col.Rotatable)
+				{
+					string text;
+					int strOffsetX = 0;
+					int strOffsetY = 0;
+					QueryItemText(startRow, col, out text, ref strOffsetX, ref strOffsetY);
+					int textWidth = _renderer.MeasureString(text, _font).Width;
+					height = Math.Max(height, textWidth + (CellWidthPadding * 2));
+				}
+				_horizontalColumnHeights[j] = height;
+				_horizontalColumnTops[j] = top;
+				top += height;
+			}
+		}
+
+		private void DrawColumnDrag(List<RollColumn> visibleColumns)
+		{
+			if (_columnDown?.Width != null && _columnDownMoved && _currentX.HasValue && _currentY.HasValue && IsHoveringOnColumnCell)
+			{
+				int columnWidth = _columnDown.Width.Value;
+				int columnHeight = CellHeight;
+				if (HorizontalOrientation)
+				{
+					int columnIndex = visibleColumns.IndexOf(_columnDown);
+					columnWidth = ColumnWidth;
+					columnHeight = GetHColHeight(columnIndex);
+				}
+				int x1 = _currentX.Value - (columnWidth / 2);
+				int y1 = _currentY.Value - (columnHeight / 2);
+				int x2 = x1 + columnWidth;
+				int y2 = y1 + columnHeight;
+				int textOffsetY = CellHeightPadding;
+				if (HorizontalOrientation)
+				{
+					int textHeight = _renderer.MeasureString(_columnDown.Text, _font).Height;
+					textOffsetY = (columnHeight - textHeight) / 2;
+				}
+
+				_renderer.SetSolidPen(_backColor);
+				_renderer.DrawRectangle(x1, y1, x2, y2);
+				_renderer.PrepDrawString(_font, _foreColor);
+				_renderer.DrawString(_columnDown.Text, new Point(x1 + CellWidthPadding, y1 + textOffsetY));
+			}
+		}
+
+		private void DrawCellDrag(List<RollColumn> visibleColumns)
+		{
+			if (_draggingCell != null && _draggingCell.RowIndex.HasValue && _draggingCell.Column.Width.HasValue
+				&& _currentX.HasValue && _currentY.HasValue)
+			{
+				var text = "";
+				int offsetX = 0;
+				int offsetY = 0;
+				QueryItemText?.Invoke(_draggingCell.RowIndex.Value, _draggingCell.Column, out text, ref offsetX, ref offsetY);
+
+				Color bgColor = _backColor;
+				QueryItemBkColor?.Invoke(_draggingCell.RowIndex.Value, _draggingCell.Column, ref bgColor);
+
+				int columnHeight = CellHeight;
+				if (HorizontalOrientation)
+				{
+					int columnIndex = visibleColumns.IndexOf(_draggingCell.Column);
+					columnHeight = GetHColHeight(columnIndex);
+				}
+				int x1 = _currentX.Value - (_draggingCell.Column.Width.Value / 2);
+				int y1 = _currentY.Value - (columnHeight / 2);
+				int x2 = x1 + _draggingCell.Column.Width.Value;
+				int y2 = y1 + columnHeight;
+
+				_renderer.SetBrush(bgColor);
+				_renderer.FillRectangle(x1, y1, x2 - x1, y2 - y1);
+				_renderer.PrepDrawString(_font, _foreColor);
+				_renderer.DrawString(text, new Point(x1 + CellWidthPadding + offsetX, y1 + CellHeightPadding + offsetY));
+			}
+		}
+
+		private void DrawColumnText(List<RollColumn> visibleColumns)
+		{
+			if (HorizontalOrientation)
+			{
+				int y = -_vBar.Value;
+
+				_renderer.PrepDrawString(_font, _foreColor);
+
+				for(int j = 0; j < visibleColumns.Count; j++)
+				{
+					var column = visibleColumns[j];
+					var columnHeight = GetHColHeight(j);
+					var textHeight = _renderer.MeasureString(column.Text, _font).Height;
+					var point = new Point(CellWidthPadding, y + ((columnHeight - textHeight) / 2));
+
+					if (IsHoveringOnColumnCell && column == CurrentCell.Column)
+					{
+						_renderer.PrepDrawString(_font, SystemColors.HighlightText);
+						DrawString(column.Text, column.Width, point);
+						_renderer.PrepDrawString(_font, _foreColor);
+					}
+					else
+					{
+						DrawString(column.Text, column.Width, point);
+					}
+
+					y += columnHeight;
+				}
+			}
+			else
+			{
+				_renderer.PrepDrawString(_font, _foreColor);
+
+				foreach (var column in visibleColumns)
+				{
+					var point = new Point(column.Left.Value + 2 * CellWidthPadding - _hBar.Value, CellHeightPadding); // TODO: fix this CellPadding issue (2 * CellPadding vs just CellPadding)
+
+					if (IsHoveringOnColumnCell && column == CurrentCell.Column)
+					{
+						_renderer.PrepDrawString(_font, SystemColors.HighlightText);
+						DrawString(column.Text, column.Width, point);
+						_renderer.PrepDrawString(_font, _foreColor);
+					}
+					else
+					{
+						DrawString(column.Text, column.Width, point);
+					}
+				}
+			}
+		}
+
+		private void DrawData(List<RollColumn> visibleColumns)
+		{
+			// Prevent exceptions with small TAStudio windows
+			if (visibleColumns.Count == 0)
+			{
+				return;
+			}
+
+			if (QueryItemText != null)
+			{
+				if (HorizontalOrientation)
+				{
+					int startRow = FirstVisibleRow;
+					int range = Math.Min(LastVisibleRow, RowCount - 1) - startRow + 1;
+
+					_renderer.PrepDrawString(_font, _foreColor);
+					int lastVisible = LastVisibleColumnIndex;
+					for (int j = FirstVisibleColumn; j <= lastVisible; j++)
+					{
+						RollColumn col = visibleColumns[j];
+						int colHeight = GetHColHeight(j);
+
+						for (int i = 0, f = 0; f < range; i++, f++)
+						{
+							f += _lagFrames[i];
+
+							int baseX = RowsToPixels(i) + (col.Rotatable ? CellWidth : 0);
+							int baseY = GetHColTop(j) - _vBar.Value;
+
+							if (!col.Rotatable)
+							{
+								Bitmap image = null;
+								int bitmapOffsetX = 0;
+								int bitmapOffsetY = 0;
+
+								QueryItemIcon?.Invoke(f + startRow, col, ref image, ref bitmapOffsetX, ref bitmapOffsetY);
+
+								if (image != null)
+								{
+									int x = baseX + CellWidthPadding + bitmapOffsetX;
+									int y = baseY + CellHeightPadding + bitmapOffsetY;
+									_renderer.DrawBitmap(image, new Point(x, y));
+								}
+							}
+
+							string text;
+							int strOffsetX = 0;
+							int strOffsetY = 0;
+							QueryItemText(f + startRow, col, out text, ref strOffsetX, ref strOffsetY);
+
+							int textWidth = _renderer.MeasureString(text, _font).Width;
+							if (col.Rotatable)
+							{
+								// Center Text
+								int textX = Math.Max(((colHeight - textWidth) / 2), CellWidthPadding) + strOffsetX;
+								int textY = CellWidthPadding + strOffsetY;
+								var point = new Point(baseX - textY, baseY + textX);
+
+								_renderer.PrepDrawString(_font, _foreColor, rotate: true);
+								DrawString(text, null, point);
+								_renderer.PrepDrawString(_font, _foreColor, rotate: false);
+							}
+							else
+							{
+								// Center Text
+								int textX = Math.Max(((CellWidth - textWidth) / 2), CellWidthPadding) + strOffsetX;
+								int textY = CellHeightPadding + strOffsetY;
+								var point = new Point(baseX + textX, baseY + textY);
+
+								DrawString(text, ColumnWidth, point);
+							}
+						}
+					}
+				}
+				else
+				{
+					int startRow = FirstVisibleRow;
+					int range = Math.Min(LastVisibleRow, RowCount - 1) - startRow + 1;
+
+					_renderer.PrepDrawString(_font, _foreColor);
+					int xPadding = CellWidthPadding + 1 - _hBar.Value;
+					for (int i = 0, f = 0; f < range; i++, f++) // Vertical
+					{
+						f += _lagFrames[i];
+						int lastVisible = LastVisibleColumnIndex;
+						for (int j = FirstVisibleColumn; j <= lastVisible; j++) // Horizontal
+						{
+							RollColumn col = visibleColumns[j];
+
+							string text;
+							int strOffsetX = 0;
+							int strOffsetY = 0;
+							Point point = new Point(col.Left.Value + xPadding, RowsToPixels(i) + CellHeightPadding);
+
+							Bitmap image = null;
+							int bitmapOffsetX = 0;
+							int bitmapOffsetY = 0;
+
+							QueryItemIcon?.Invoke(f + startRow, visibleColumns[j], ref image, ref bitmapOffsetX, ref bitmapOffsetY);
+
+							if (image != null)
+							{
+								_renderer.DrawBitmap(image, new Point(point.X + bitmapOffsetX, point.Y + bitmapOffsetY + CellHeightPadding));
+							}
+
+							QueryItemText(f + startRow, visibleColumns[j], out text, ref strOffsetX, ref strOffsetY);
+
+							bool rePrep = false;
+							if (_selectedItems.Contains(new Cell { Column = visibleColumns[j], RowIndex = f + startRow }))
+							{
+								_renderer.PrepDrawString(_font, SystemColors.HighlightText);
+								rePrep = true;
+							}
+
+							DrawString(text, col.Width, new Point(point.X + strOffsetX, point.Y + strOffsetY));
+
+							if (rePrep)
+							{
+								_renderer.PrepDrawString(_font, _foreColor);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		private void DrawColumnBg(List<RollColumn> visibleColumns)
+		{
+			_renderer.SetBrush(SystemColors.ControlLight);
+			_renderer.SetSolidPen(Color.Black);
+
+			if (HorizontalOrientation)
+			{
+				_renderer.FillRectangle(0, 0, ColumnWidth + 1, DrawHeight + 1);
+
+				int y = -_vBar.Value;
+				for (int j = 0; j < visibleColumns.Count; j++)
+				{
+					_renderer.Line(1, y, ColumnWidth, y);
+					y += GetHColHeight(j);
+				}
+
+				if (visibleColumns.Any())
+				{
+					_renderer.Line(1, y, ColumnWidth, y);
+				}
+
+				_renderer.Line(0, 0, 0, y + 1);
+				_renderer.Line(ColumnWidth, 0, ColumnWidth, y + 1);
+			}
+			else
+			{
+				int bottomEdge = RowsToPixels(0);
+
+				// Gray column box and black line underneath
+				_renderer.FillRectangle(0, 0, Width + 1, bottomEdge + 1);
+				_renderer.Line(0, 0, TotalColWidth.Value + 1, 0);
+				_renderer.Line(0, bottomEdge, TotalColWidth.Value + 1, bottomEdge);
+
+				// Vertical black separators
+				foreach (var column in visibleColumns)
+				{
+					int pos = column.Left.Value - _hBar.Value;
+					_renderer.Line(pos, 0, pos, bottomEdge);
+				}
+
+				// Draw right most line
+				if (visibleColumns.Any())
+				{
+					int right = TotalColWidth.Value - _hBar.Value;
+					_renderer.Line(right, 0, right, bottomEdge);
+				}
+			}
+
+			// Emphasis
+			foreach (var column in visibleColumns.Where(c => c.Emphasis))
+			{
+				_renderer.SetBrush(SystemColors.ActiveBorder);
+				if (HorizontalOrientation)
+				{
+					int columnIndex = visibleColumns.IndexOf(column);
+					_renderer.FillRectangle(1, GetHColTop(columnIndex) + 1, ColumnWidth - 1, GetHColHeight(columnIndex) - 1);
+				}
+				else
+				{
+					_renderer.FillRectangle(column.Left.Value + 1 - _hBar.Value, 1, column.Width.Value - 1, ColumnHeight - 1);
+				}
+			}
+
+			// If the user is hovering over a column
+			if (IsHoveringOnColumnCell)
+			{
+				if (HorizontalOrientation)
+				{
+					for (int i = 0; i < visibleColumns.Count; i++)
+					{
+						if (visibleColumns[i] != CurrentCell.Column)
+						{
+							continue;
+						}
+
+						int top = GetHColTop(i) - _vBar.Value;
+						int height = GetHColHeight(i);
+
+						_renderer.SetBrush(CurrentCell.Column.Emphasis
+							? SystemColors.Highlight.Add(0x00222222)
+							: SystemColors.Highlight);
+
+						_renderer.FillRectangle(1, top + 1, ColumnWidth - 1, height - 1);
+					}
+				}
+				else
+				{
+					// TODO multiple selected columns
+					foreach (var column in visibleColumns)
+					{
+						if (column == CurrentCell.Column)
+						{
+							// Left of column is to the right of the viewable area or right of column is to the left of the viewable area
+							if (column.Left.Value - _hBar.Value > Width || column.Right.Value - _hBar.Value < 0)
+							{
+								continue;
+							}
+
+							int left = column.Left.Value - _hBar.Value;
+							int width = column.Right.Value - _hBar.Value - left;
+
+							_renderer.SetBrush(CurrentCell.Column.Emphasis
+								? SystemColors.Highlight.Add(0x00550000)
+								: SystemColors.Highlight);
+
+							_renderer.FillRectangle(left + 1, 1, width - 1, ColumnHeight - 1);
+						}
+					}
+				}
+			}
+		}
+
+		// TODO refactor this and DoBackGroundCallback functions.
+		/// <summary>
+		/// Draw Gridlines and background colors using QueryItemBkColor.
+		/// </summary>
+		private void DrawBg(List<RollColumn> visibleColumns)
+		{
+			if (UseCustomBackground && QueryItemBkColor != null)
+			{
+				DoBackGroundCallback(visibleColumns);
+			}
+
+			if (GridLines)
+			{
+				_renderer.SetSolidPen(SystemColors.ControlLight);
+				if (HorizontalOrientation)
+				{
+					// Columns
+					for (int i = 1; i < VisibleRows + 1; i++)
+					{
+						int x = RowsToPixels(i);
+						_renderer.Line(x, 1, x, DrawHeight);
+					}
+
+					// Rows
+					for (int i = 0; i < visibleColumns.Count + 1; i++)
+					{
+						int y = GetHColTop(i) - _vBar.Value;
+						_renderer.Line(RowsToPixels(0) + 1, y, DrawWidth, y);
+					}
+				}
+				else
+				{
+					// Columns
+					int y = ColumnHeight + 1;
+					foreach (var column in visibleColumns)
+					{
+						int x = (column.Left ?? 0) - _hBar.Value;
+						_renderer.Line(x, y, x, Height - 1);
+					}
+
+					if (visibleColumns.Any())
+					{
+						int x = (TotalColWidth ?? 0) - _hBar.Value;
+						_renderer.Line(x, y, x, Height - 1);
+					}
+
+					// Rows
+					for (int i = 1; i < VisibleRows + 1; i++)
+					{
+						_renderer.Line(0, RowsToPixels(i), Width + 1, RowsToPixels(i));
+					}
+				}
+			}
+
+			if (_selectedItems.Any())
+			{
+				DoSelectionBG(visibleColumns);
+			}
+		}
+
+		private void DoSelectionBG(List<RollColumn> visibleColumns)
+		{
+			Color rowColor = Color.White;
+			int lastVisibleRow = LastVisibleRow;
+			int lastRow = -1;
+			foreach (Cell cell in _selectedItems)
+			{
+				if (cell.RowIndex > lastVisibleRow || cell.RowIndex < FirstVisibleRow || !VisibleColumns.Contains(cell.Column))
+				{
+					continue;
+				}
+
+				Cell relativeCell = new Cell
+				{
+					RowIndex = cell.RowIndex - FirstVisibleRow,
+					Column = cell.Column,
+				};
+				relativeCell.RowIndex -= CountLagFramesAbsolute(relativeCell.RowIndex.Value);
+
+				if (QueryRowBkColor != null && lastRow != cell.RowIndex.Value)
+				{
+					QueryRowBkColor(cell.RowIndex.Value, ref rowColor);
+					lastRow = cell.RowIndex.Value;
+				}
+
+				Color cellColor = rowColor;
+				QueryItemBkColor?.Invoke(cell.RowIndex.Value, cell.Column, ref cellColor);
+
+				// Alpha layering for cell before selection
+				float alpha = (float)cellColor.A / 255;
+				if (cellColor.A != 255 && cellColor.A != 0)
+				{
+					cellColor = Color.FromArgb(rowColor.R - (int)((rowColor.R - cellColor.R) * alpha),
+						rowColor.G - (int)((rowColor.G - cellColor.G) * alpha),
+						rowColor.B - (int)((rowColor.B - cellColor.B) * alpha));
+				}
+
+				// Alpha layering for selection
+				alpha = 0.33f;
+				cellColor = Color.FromArgb(cellColor.R - (int)((cellColor.R - SystemColors.Highlight.R) * alpha),
+					cellColor.G - (int)((cellColor.G - SystemColors.Highlight.G) * alpha),
+					cellColor.B - (int)((cellColor.B - SystemColors.Highlight.B) * alpha));
+				DrawCellBG(cellColor, relativeCell, visibleColumns);
+			}
+		}
+
+		/// <summary>
+		/// Given a cell with RowIndex in between 0 and VisibleRows, it draws the background color specified. Do not call with absolute row indices.
+		/// </summary>
+		private void DrawCellBG(Color color, Cell cell, List<RollColumn> visibleColumns)
+		{
+			int x, y, w, h;
+
+			if (HorizontalOrientation)
+			{
+				x = RowsToPixels(cell.RowIndex.Value) + 1;
+				if (x < ColumnWidth)
+				{
+					return;
+				}
+
+				int columnIndex = visibleColumns.IndexOf(cell.Column);
+				w = CellWidth - 1;
+				y = GetHColTop(columnIndex) - _vBar.Value + 1; // We can't draw without row and column, so assume they exist and fail catastrophically if they don't
+				h = GetHColHeight(columnIndex) - 1;
+			}
+			else
+			{
+				y = RowsToPixels(cell.RowIndex.Value) + 1; // We can't draw without row and column, so assume they exist and fail catastrophically if they don't
+				if (y < ColumnHeight)
+				{
+					return;
+				}
+
+				x = cell.Column.Left.Value - _hBar.Value + 1;
+				w = cell.Column.Width.Value - 1;
+				h = CellHeight - 1;
+			}
+
+			// Don't draw if off screen.
+			if (x > DrawWidth || y > DrawHeight)
+			{
+				return;
+			}
+
+			_renderer.SetBrush(color);
+			_renderer.FillRectangle(x, y, w, h);
+		}
+
+		/// <summary>
+		/// Calls QueryItemBkColor callback for all visible cells and fills in the background of those cells.
+		/// </summary>
+		private void DoBackGroundCallback(List<RollColumn> visibleColumns)
+		{
+			int startIndex = FirstVisibleRow;
+			int range = Math.Min(LastVisibleRow, RowCount - 1) - startIndex + 1;
+			int lastVisibleColumn = LastVisibleColumnIndex;
+			int firstVisibleColumn = FirstVisibleColumn;
+
+			// Prevent exceptions with small TAStudio windows
+			if (firstVisibleColumn < 0)
+			{
+				return;
+			}
+
+			if (HorizontalOrientation)
+			{
+				for (int i = 0, f = 0; f < range; i++, f++)
+				{
+					f += _lagFrames[i];
+					
+					Color rowColor = Color.White;
+					QueryRowBkColor?.Invoke(f + startIndex, ref rowColor);
+
+					for (int j = firstVisibleColumn; j <= lastVisibleColumn; j++)
+					{
+						Color itemColor = Color.White;
+						QueryItemBkColor?.Invoke(f + startIndex, visibleColumns[j], ref itemColor);
+						if (itemColor == Color.White)
+						{
+							itemColor = rowColor;
+						}
+						else if (itemColor.A != 255 && itemColor.A != 0)
+						{
+							float alpha = (float)itemColor.A / 255;
+							itemColor = Color.FromArgb(rowColor.R - (int)((rowColor.R - itemColor.R) * alpha),
+								rowColor.G - (int)((rowColor.G - itemColor.G) * alpha),
+								rowColor.B - (int)((rowColor.B - itemColor.B) * alpha));
+						}
+
+						if (itemColor != Color.White) // An easy optimization, don't draw unless the user specified something other than the default
+						{
+							var cell = new Cell
+							{
+								Column = visibleColumns[j],
+								RowIndex = i
+							};
+							DrawCellBG(itemColor, cell, visibleColumns);
+						}
+					}
+				}
+			}
+			else
+			{
+				for (int i = 0, f = 0; f < range; i++, f++) // Vertical
+				{
+					f += _lagFrames[i];
+					
+					Color rowColor = Color.White;
+					QueryRowBkColor?.Invoke(f + startIndex, ref rowColor);
+
+					for (int j = FirstVisibleColumn; j <= lastVisibleColumn; j++) // Horizontal
+					{
+						Color itemColor = Color.White;
+						QueryItemBkColor?.Invoke(f + startIndex, visibleColumns[j], ref itemColor);
+						if (itemColor == Color.White)
+						{
+							itemColor = rowColor;
+						}
+						else if (itemColor.A != 255 && itemColor.A != 0)
+						{
+							float alpha = (float)itemColor.A / 255;
+							itemColor = Color.FromArgb(rowColor.R - (int)((rowColor.R - itemColor.R) * alpha),
+								rowColor.G - (int)((rowColor.G - itemColor.G) * alpha),
+								rowColor.B - (int)((rowColor.B - itemColor.B) * alpha));
+						}
+
+						if (itemColor != Color.White) // An easy optimization, don't draw unless the user specified something other than the default
+						{
+							var cell = new Cell
+							{
+								Column = visibleColumns[j],
+								RowIndex = i
+							};
+							DrawCellBG(itemColor, cell, visibleColumns);
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
similarity index 76%
rename from BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
rename to BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
index 98455379bd..701811e58b 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
@@ -1,2301 +1,2096 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
+
+using BizHawk.Client.Common;
+using BizHawk.Client.EmuHawk.CustomControls;
+using BizHawk.Common;
+
+namespace BizHawk.Client.EmuHawk
+{
+	// Row width depends on font size and padding
+	// Column width is specified in column headers
+	// Row width is specified for horizontal orientation
+	public partial class InputRoll : Control
+	{
+		private readonly IControlRenderer _renderer;
+		private readonly SortedSet<Cell> _selectedItems = new SortedSet<Cell>(new SortCell());
+
+		// scrollbar location(s) are calculated later (e.g. on resize)
+		private readonly VScrollBar _vBar = new VScrollBar { Visible = false };
+		private readonly HScrollBar _hBar = new HScrollBar { Visible = false };
+
+		private readonly Timer _hoverTimer = new Timer();
+		private readonly byte[] _lagFrames = new byte[256]; // Large enough value that it shouldn't ever need resizing. // apparently not large enough for 4K
+
+		private readonly Color _foreColor;
+		private readonly Color _backColor;
+
+		private RollColumns _columns = new RollColumns();
+		private bool _horizontalOrientation;
+		private bool _programmaticallyUpdatingScrollBarValues;
+		private int _maxCharactersInHorizontal = 1;
+
+		private int _rowCount;
+		private Size _charSize;
 
-using BizHawk.Client.Common;
-using BizHawk.Client.EmuHawk.CustomControls;
-
-namespace BizHawk.Client.EmuHawk
-{
-	// Row width depends on font size and padding
-	// Column width is specified in column headers
-	// Row width is specified for horizontal orientation
-	public partial class InputRoll : Control
-	{
-		private RollRenderer Renderer = RollRenderer.GDIPlus;
-
-		private Font _commonFont;
-
-		private readonly SortedSet<Cell> _selectedItems = new SortedSet<Cell>(new SortCell());
-
-		private readonly VScrollBar _vBar;
-		private readonly HScrollBar _hBar;
-
-		private readonly Timer _hoverTimer = new Timer();
-		private readonly byte[] _lagFrames = new byte[256]; // Large enough value that it shouldn't ever need resizing. // apparently not large enough for 4K
-
-		private readonly Color _foreColor;
-		private readonly Color _backColor;
-
-		private RollColumns _columns = new RollColumns();
-		private bool _horizontalOrientation;
-		private bool _programmaticallyUpdatingScrollBarValues;
-		private int _maxCharactersInHorizontal = 1;
-
-		private int _rowCount;
-
-		private RollColumn _columnDown;
-
-		private int? _currentX;
-		private int? _currentY;
-
-		// Hiding lag frames (Mainly intended for < 60fps play.)
-		public int LagFramesToHide { get; set; }
-		public bool HideWasLagFrames { get; set; }
-
-		public bool AllowRightClickSelecton { get; set; }
-		public bool LetKeysModifySelection { get; set; }
-		public bool SuspendHotkeys { get; set; }
-
-		public InputRoll()
-		{
-			// set renderer once at InputRoll instantiation
-			Renderer = (RollRenderer)TAStudio.InputRollRenderer;
-
-			UseCustomBackground = true;
-			GridLines = true;
-			CellWidthPadding = 3;
-			CellHeightPadding = 0;
-			CurrentCell = null;
-			ScrollMethod = "near";
-
-			switch (Renderer)
+		// Updated on paint
+		private int[] _horizontalColumnHeights;
+		private int[] _horizontalColumnTops;
+
+		private RollColumn _columnDown;
+		private RollColumn _columnResizing;
+
+		private int? _currentX;
+		private int? _currentY;
+
+		// Hiding lag frames (Mainly intended for < 60fps play.)
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int LagFramesToHide { get; set; }
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool HideWasLagFrames { get; set; }
+
+		[Category("Behavior")]
+		public bool AllowRightClickSelection { get; set; }
+
+		[Category("Behavior")]
+		public bool LetKeysModifySelection { get; set; }
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool SuspendHotkeys { get; set; }
+
+		private readonly Font _font = new Font("Arial", 8, FontStyle.Bold);
+
+		public InputRoll()
+		{
+			UseCustomBackground = true;
+			GridLines = true;
+			CellWidthPadding = 3;
+			CellHeightPadding = 0;
+			CurrentCell = null;
+			ScrollMethod = "near";
+
+			SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+			SetStyle(ControlStyles.UserPaint, true);
+			SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+			SetStyle(ControlStyles.Opaque, true);
+			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+
+			if (OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows)
+			{
+				_renderer = new GdiRenderer();
+			}
+			else
+			{
+				_renderer = new GdiPlusRenderer();
+			}
+
+			using (var g = CreateGraphics())
+			using (_renderer.LockGraphics(g, Width, Height))
 			{
-				case RollRenderer.GDI:
-					_commonFont = new Font("Arial", 8, FontStyle.Bold);
-					_normalFont = GDIRenderer.CreateNormalHFont(_commonFont, 6);
-
-					// PrepDrawString doesn't actually set the font, so this is rather useless.
-					// I'm leaving this stuff as-is so it will be a bit easier to fix up with another rendering method.
-					_rotatedFont = GDIRenderer.CreateRotatedHFont(_commonFont, true);
-
-					SetStyle(ControlStyles.AllPaintingInWmPaint, true);
-					SetStyle(ControlStyles.UserPaint, true);
-					SetStyle(ControlStyles.SupportsTransparentBackColor, true);
-					SetStyle(ControlStyles.Opaque, true);
-
-					_gdi = new GDIRenderer();
-					GDIConstruction();
-					break;
-				case RollRenderer.GDIPlus:
-//					_commonFont = new Font("Courier New", 8, FontStyle.Bold);
-					_commonFont = new Font("Arial", 8, FontStyle.Bold);
-					GDIPConstruction();
-					break;
-			}
-
-			UpdateCellSize();
-			ColumnWidth = CellWidth;
-			ColumnHeight = CellHeight + 2;
-
-			_vBar = new VScrollBar
-			{
-				// Location gets calculated later (e.g. on resize)
-				Visible = false,
-				SmallChange = CellHeight,
-				LargeChange = CellHeight * 20
-			};
-
-			_hBar = new HScrollBar
-			{
-				// Location gets calculated later (e.g. on resize)
-				Visible = false,
-				SmallChange = CellWidth,
-				LargeChange = 20
-			};
-
-			Controls.Add(_vBar);
-			Controls.Add(_hBar);
-
-			_vBar.ValueChanged += VerticalBar_ValueChanged;
-			_hBar.ValueChanged += HorizontalBar_ValueChanged;
-
-			HorizontalOrientation = false;
-			RecalculateScrollBars();
-			_columns.ChangedCallback = ColumnChangedCallback;
-
-			_hoverTimer.Interval = 750;
-			_hoverTimer.Tick += HoverTimerEventProcessor;
-			_hoverTimer.Stop();
-
-			_foreColor = ForeColor;
-			_backColor = BackColor;
-		}
-
-		private void HoverTimerEventProcessor(object sender, EventArgs e)
-		{
-			_hoverTimer.Stop();
-
-			CellHovered?.Invoke(this, new CellEventArgs(LastCell, CurrentCell));
-		}
-
-		protected override void Dispose(bool disposing)
-		{
-			if (Renderer == RollRenderer.GDI) GDIDispose();
-			base.Dispose(disposing);
-		}
-
-		#region Properties
-
-		/// <summary>
-		/// Gets or sets the amount of left and right padding on the text inside a cell
-		/// </summary>
-		[DefaultValue(3)]
-		[Category("Behavior")]
-		public int CellWidthPadding { get; set; }
-
-		/// <summary>
-		/// Gets or sets the amount of top and bottom padding on the text inside a cell
-		/// </summary>
-		[DefaultValue(1)]
-		[Category("Behavior")]
-		public int CellHeightPadding { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether grid lines are displayed around cells
-		/// </summary>
-		[Category("Appearance")]
-		[DefaultValue(true)]
-		public bool GridLines { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether the control is horizontal or vertical
-		/// </summary>
-		[Category("Behavior")]
-		public bool HorizontalOrientation
-		{
-			get
-			{
-				return _horizontalOrientation;
-			}
-			set
-			{
-				if (_horizontalOrientation != value)
-				{
-					int temp = ScrollSpeed;
-					_horizontalOrientation = value;
-					OrientationChanged();
-					_hBar.SmallChange = CellWidth;
-					_vBar.SmallChange = CellHeight;
-					ScrollSpeed = temp;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the scrolling speed
-		/// </summary>
-		[Category("Behavior")]
-		public int ScrollSpeed
-		{
-			get
-			{
-				if (HorizontalOrientation)
-				{
-					return _hBar.SmallChange / CellWidth;
-				}
-				if (CellHeight == 0) CellHeight++;
-				return _vBar.SmallChange / CellHeight;
-			}
-
-			set
-			{
-				if (HorizontalOrientation)
-				{
-					_hBar.SmallChange = value * CellWidth;
-				}
-				else
-				{
-					_vBar.SmallChange = value * CellHeight;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the sets the virtual number of rows to be displayed. Does not include the column header row.
-		/// </summary>
-		[Category("Behavior")]
-		public int RowCount
-		{
-			get
-			{
-				return _rowCount;
-			}
-
-			set
-			{
-				_rowCount = value;
-				RecalculateScrollBars();
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets a value indicating whether columns can be resized
-		/// </summary>
-		[Category("Behavior")]
-		public bool AllowColumnResize { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether columns can be reordered
-		/// </summary>
-		[Category("Behavior")]
-		public bool AllowColumnReorder { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether the entire row will always be selected 
-		/// </summary>
-		[Category("Appearance")]
-		[DefaultValue(false)]
-		public bool FullRowSelect { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether multiple items can to be selected
-		/// </summary>
-		[Category("Behavior")]
-		[DefaultValue(true)]
-		public bool MultiSelect { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether the control is in input painting mode
-		/// </summary>
-		[Category("Behavior")]
-		[DefaultValue(false)]
-		public bool InputPaintingMode { get; set; }
-
-		/// <summary>
-		/// All visible columns
-		/// </summary>
-		[Category("Behavior")]
-		public IEnumerable<RollColumn> VisibleColumns => _columns.VisibleColumns;
-
-		/// <summary>
-		/// Gets or sets how the InputRoll scrolls when calling ScrollToIndex.
-		/// </summary>
-		[DefaultValue("near")]
-		[Category("Behavior")]
-		public string ScrollMethod { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating how the Intever for the hover event
-		/// </summary>
-		[Category("Behavior")]
-		public bool AlwaysScroll { get; set; }
-
-		/// <summary>
-		/// Gets or sets the lowest seek interval to activate the progress bar
-		/// </summary>
-		[Category("Behavior")]
-		public int SeekingCutoffInterval { get; set; }
-
-		/// <summary>
-		/// Returns all columns including those that are not visible
-		/// </summary>
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public RollColumns AllColumns => _columns;
-
-		[DefaultValue(750)]
-		[Category("Behavior")]
-		public int HoverInterval
-		{
-			get { return _hoverTimer.Interval; }
-			set { _hoverTimer.Interval = value; }
-		}
-
-		#endregion
-
-		#region Event Handlers
-
-		/// <summary>
-		/// Fire the <see cref="QueryItemText"/> event which requests the text for the passed cell
-		/// </summary>
-		[Category("Virtual")]
-		public event QueryItemTextHandler QueryItemText;
-
-		/// <summary>
-		/// Fire the <see cref="QueryItemBkColor"/> event which requests the background color for the passed cell
-		/// </summary>
-		[Category("Virtual")]
-		public event QueryItemBkColorHandler QueryItemBkColor;
-
-		[Category("Virtual")]
-		public event QueryRowBkColorHandler QueryRowBkColor;
-
-		/// <summary>
-		/// Fire the <see cref="QueryItemIconHandler"/> event which requests an icon for a given cell
-		/// </summary>
-		[Category("Virtual")]
-		public event QueryItemIconHandler QueryItemIcon;
-
-		/// <summary>
-		/// Fire the QueryFrameLag event which checks if a given frame is a lag frame
-		/// </summary>
-		[Category("Virtual")]
-		public event QueryFrameLagHandler QueryFrameLag;
-
-		/// <summary>
-		/// Fires when the mouse moves from one cell to another (including column header cells)
-		/// </summary>
-		[Category("Mouse")]
-		public event CellChangeEventHandler PointedCellChanged;
-
-		/// <summary>
-		/// Fires when a cell is hovered on
-		/// </summary>
-		[Category("Mouse")]
-		public event HoverEventHandler CellHovered;
-
-		/// <summary>
-		/// Occurs when a column header is clicked
-		/// </summary>
-		[Category("Action")]
-		public event ColumnClickEventHandler ColumnClick;
-
-		/// <summary>
-		/// Occurs when a column header is right-clicked
-		/// </summary>
-		[Category("Action")]
-		public event ColumnClickEventHandler ColumnRightClick;
-
-		/// <summary>
-		/// Occurs whenever the 'SelectedItems' property for this control changes
-		/// </summary>
-		[Category("Behavior")]
-		public event EventHandler SelectedIndexChanged;
-
-		/// <summary>
-		/// Occurs whenever the mouse wheel is scrolled while the right mouse button is held
-		/// </summary>
-		[Category("Behavior")]
-		public event RightMouseScrollEventHandler RightMouseScrolled;
-
-		[Category("Property Changed")]
-		[Description("Occurs when the column header has been reordered")]
-		public event ColumnReorderedEventHandler ColumnReordered;
-
-		[Category("Action")]
-		[Description("Occurs when the scroll value of the visible rows change (in vertical orientation this is the vertical scroll bar change, and in horizontal it is the horizontal scroll bar)")]
-		public event RowScrollEvent RowScroll;
-
-		[Category("Action")]
-		[Description("Occurs when the scroll value of the columns (in vertical orientation this is the horizontal scroll bar change, and in horizontal it is the vertical scroll bar)")]
-		public event ColumnScrollEvent ColumnScroll;
-
-		[Category("Action")]
-		[Description("Occurs when a cell is dragged and then dropped into a new cell, old cell is the cell that was being dragged, new cell is its new destination")]
-		public event CellDroppedEvent CellDropped;
-
-		/// <summary>
-		/// Retrieve the text for a cell
-		/// </summary>
-		public delegate void QueryItemTextHandler(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY);
-
-		/// <summary>
-		/// Retrieve the background color for a cell
-		/// </summary>
-		public delegate void QueryItemBkColorHandler(int index, RollColumn column, ref Color color);
-		public delegate void QueryRowBkColorHandler(int index, ref Color color);
-
-		/// <summary>
-		/// Retrieve the image for a given cell
-		/// </summary>
-		public delegate void QueryItemIconHandler(int index, RollColumn column, ref Bitmap icon, ref int offsetX, ref int offsetY);
-
-		/// <summary>
-		/// Check if a given frame is a lag frame
-		/// </summary>
-		public delegate bool QueryFrameLagHandler(int index, bool hideWasLag);
-
-		public delegate void CellChangeEventHandler(object sender, CellEventArgs e);
-
-		public delegate void HoverEventHandler(object sender, CellEventArgs e);
-
-		public delegate void RightMouseScrollEventHandler(object sender, MouseEventArgs e);
-
-		public delegate void ColumnClickEventHandler(object sender, ColumnClickEventArgs e);
-
-		public delegate void ColumnReorderedEventHandler(object sender, ColumnReorderedEventArgs e);
-
-		public delegate void RowScrollEvent(object sender, EventArgs e);
-
-		public delegate void ColumnScrollEvent(object sender, EventArgs e);
-
-		public delegate void CellDroppedEvent(object sender, CellEventArgs e);
-
-		public class CellEventArgs
-		{
-			public CellEventArgs(Cell oldCell, Cell newCell)
-			{
-				OldCell = oldCell;
-				NewCell = newCell;
-			}
-
-			public Cell OldCell { get; private set; }
-			public Cell NewCell { get; private set; }
-		}
-
-		public class ColumnClickEventArgs
-		{
-			public ColumnClickEventArgs(RollColumn column)
-			{
-				Column = column;
-			}
-
-			public RollColumn Column { get; private set; }
-		}
-
-		public class ColumnReorderedEventArgs
-		{
-			public ColumnReorderedEventArgs(int oldDisplayIndex, int newDisplayIndex, RollColumn column)
-			{
-				Column = column;
-				OldDisplayIndex = oldDisplayIndex;
-				NewDisplayIndex = newDisplayIndex;
-			}
-
-			public RollColumn Column { get; private set; }
-			public int OldDisplayIndex { get; private set; }
-			public int NewDisplayIndex { get; private set; }
-		}
-
-		#endregion
-
-		#region Api
-
-		public void SelectRow(int index, bool val)
-		{
-			if (_columns.VisibleColumns.Any())
-			{
-				if (val)
-				{
-					SelectCell(new Cell
-					{
-						RowIndex = index,
-						Column = _columns[0]
-					});
-				}
-				else
-				{
-					IEnumerable<Cell> items = _selectedItems.Where(cell => cell.RowIndex == index);
-					_selectedItems.RemoveWhere(items.Contains);
-				}
-			}
-		}
-
-		public void SelectAll()
-		{
-			var oldFullRowVal = FullRowSelect;
-			FullRowSelect = true;
-			for (int i = 0; i < RowCount; i++)
-			{
-				SelectRow(i, true);
-			}
-
-			FullRowSelect = oldFullRowVal;
-		}
-
-		public void DeselectAll()
-		{
-			_selectedItems.Clear();
-		}
-
-		public void TruncateSelection(int index)
-		{
-			_selectedItems.RemoveWhere(cell => cell.RowIndex > index);
-		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public bool IsPointingAtColumnHeader => IsHoveringOnColumnCell;
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public int? FirstSelectedIndex
-		{
-			get
-			{
-				if (AnyRowsSelected)
-				{
-					return SelectedRows.Min();
-				}
-
-				return null;
-			}
-		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public int? LastSelectedIndex
-		{
-			get
-			{
-				if (AnyRowsSelected)
-				{
-					return SelectedRows.Max();
-				}
-
-				return null;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the current Cell that the mouse was in.
-		/// </summary>
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public Cell CurrentCell { get; set; }
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public bool CurrentCellIsDataCell => CurrentCell?.RowIndex != null && CurrentCell.Column != null;
-
-		/// <summary>
-		/// Gets or sets the previous Cell that the mouse was in.
-		/// </summary>
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public Cell LastCell { get; private set; }
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public bool IsPaintDown { get; private set; }
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public bool UseCustomBackground { get; set; }
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public int DrawHeight { get; private set; }
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public int DrawWidth { get; private set; }
-
-		/// <summary>
-		/// Gets or sets the width of data cells when in Horizontal orientation.
-		/// </summary>
-		public int MaxCharactersInHorizontal
-		{
-			get
-			{
-				return _maxCharactersInHorizontal;
-			}
-
-			set
-			{
-				_maxCharactersInHorizontal = value;
-				UpdateCellSize();
-			}
-		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public bool RightButtonHeld { get; private set; }
-
-		public string UserSettingsSerialized()
-		{
-			var settings = ConfigService.SaveWithType(Settings);
-			return settings;
-		}
-
-		public void LoadSettingsSerialized(string settingsJson)
-		{
-			var settings = ConfigService.LoadWithType(settingsJson);
-
-			// TODO: don't silently fail, inform the user somehow
-			if (settings is InputRollSettings)
-			{
-				var rollSettings = settings as InputRollSettings;
-				_columns = rollSettings.Columns;
-				_columns.ChangedCallback = ColumnChangedCallback;
-				HorizontalOrientation = rollSettings.HorizontalOrientation;
-				LagFramesToHide = rollSettings.LagFramesToHide;
-				HideWasLagFrames = rollSettings.HideWasLagFrames;
-			}
-		}
-
-		private InputRollSettings Settings => new InputRollSettings
-		{
-			Columns = _columns,
-			HorizontalOrientation = HorizontalOrientation,
-			LagFramesToHide = LagFramesToHide,
-			HideWasLagFrames = HideWasLagFrames
-		};
-
-		public class InputRollSettings
-		{
-			public RollColumns Columns { get; set; }
-			public bool HorizontalOrientation { get; set; }
-			public int LagFramesToHide { get; set; }
-			public bool HideWasLagFrames { get; set; }
-		}
-
-		/// <summary>
-		/// Gets or sets the first visible row index, if scrolling is needed
-		/// </summary>
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public int FirstVisibleRow
-		{
-			get // SuuperW: This was checking if the scroll bars were needed, which is useless because their Value is 0 if they aren't needed.
-			{
-				if (HorizontalOrientation)
-				{
-					return _hBar.Value / CellWidth;
-				}
-				if (CellHeight == 0) CellHeight++;
-				return _vBar.Value / CellHeight;
-			}
-
-			set
-			{
-				if (HorizontalOrientation)
-				{
-					if (NeedsHScrollbar)
-					{
-						_programmaticallyUpdatingScrollBarValues = true;
-						if (value * CellWidth <= _hBar.Maximum)
-						{
-							_hBar.Value = value * CellWidth;
-						}
-						else
-						{
-							_hBar.Value = _hBar.Maximum;
-						}
-
-						_programmaticallyUpdatingScrollBarValues = false;
-					}
-				}
-				else
-				{
-					if (NeedsVScrollbar)
-					{
-						_programmaticallyUpdatingScrollBarValues = true;
-						if (value * CellHeight <= _vBar.Maximum)
-						{
-							_vBar.Value = value * CellHeight;
-						}
-						else
-						{
-							_vBar.Value = _vBar.Maximum;
-						}
-
-						_programmaticallyUpdatingScrollBarValues = false;
-					}
-				}
-			}
-		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		private int LastFullyVisibleRow
-		{
-			get
-			{
-				int halfRow = 0;
-				if ((DrawHeight - ColumnHeight - 3) % CellHeight < CellHeight / 2)
-				{
-					halfRow = 1;
-				}
-
-				return FirstVisibleRow + VisibleRows - halfRow + CountLagFramesDisplay(VisibleRows - halfRow);
-			}
-		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public int LastVisibleRow
-		{
-			get
-			{
-				return FirstVisibleRow + VisibleRows + CountLagFramesDisplay(VisibleRows);
-			}
-
-			set
-			{
-				int halfRow = 0;
-				if ((DrawHeight - ColumnHeight - 3) % CellHeight < CellHeight / 2)
-				{
-					halfRow = 1;
-				}
-
-				if (LagFramesToHide == 0)
-				{
-					FirstVisibleRow = Math.Max(value - (VisibleRows - halfRow), 0);
-				}
-				else
-				{
-					if (Math.Abs(LastFullyVisibleRow - value) > VisibleRows) // Big jump
-					{
-						FirstVisibleRow = Math.Max(value - (ExpectedDisplayRange() - halfRow), 0);
-						SetLagFramesArray();
-					}
-
-					// Small jump, more accurate
-					int lastVisible = LastFullyVisibleRow;
-					do
-					{
-						if ((lastVisible - value) / (LagFramesToHide + 1) != 0)
-						{
-							FirstVisibleRow = Math.Max(FirstVisibleRow - ((lastVisible - value) / (LagFramesToHide + 1)), 0);
-						}
-						else
-						{
-							FirstVisibleRow -= Math.Sign(lastVisible - value);
-						}
-
-						SetLagFramesArray();
-						lastVisible = LastFullyVisibleRow;
-					}
-					while ((lastVisible - value < 0 || lastVisible - value > _lagFrames[VisibleRows - halfRow]) && FirstVisibleRow != 0);
-				}
-			}
-		}
-
-		public bool IsVisible(int index)
-		{
-			return (index >= FirstVisibleRow) && (index <= LastFullyVisibleRow);
-		}
-
-		public bool IsPartiallyVisible(int index)
-		{
-			return index >= FirstVisibleRow && index <= LastVisibleRow;
-		}
-
-		/// <summary>
-		/// Gets the number of rows currently visible including partially visible rows.
-		/// </summary>
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public int VisibleRows
-		{
-			get
-			{
-				if (CellHeight == 0) CellHeight++;
-				if (HorizontalOrientation)
-				{
-					return (DrawWidth - ColumnWidth) / CellWidth;
-				}
-
-				return (DrawHeight - ColumnHeight - 3) / CellHeight; // Minus three makes it work
-			}
-		}
-
-		/// <summary>
-		/// Gets the first visible column index, if scrolling is needed
-		/// </summary>
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public int FirstVisibleColumn
-		{
-			get
-			{
-				if (CellHeight == 0) CellHeight++;
-				if (HorizontalOrientation)
-				{
-					return _vBar.Value / CellHeight;
-				}
-
-				var columnList = VisibleColumns.ToList();
-				return columnList.FindIndex(c => c.Right > _hBar.Value);
-			}
-		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public int LastVisibleColumnIndex
-		{
-			get
-			{
-				if (CellHeight == 0) CellHeight++;
-				List<RollColumn> columnList = VisibleColumns.ToList();
-				int ret;
-				if (HorizontalOrientation)
-				{
-					ret = (_vBar.Value + DrawHeight) / CellHeight;
-					if (ret >= columnList.Count)
-					{
-						ret = columnList.Count - 1;
-					}
-				}
-				else
-				{
-					ret = columnList.FindLastIndex(c => c.Left <= DrawWidth + _hBar.Value);
-				}
-
-				return ret;
-			}
-		}
-
-		private Cell _draggingCell;
-
-		public void DragCurrentCell()
-		{
-			_draggingCell = CurrentCell;
-		}
-
-		public void ReleaseCurrentCell()
-		{
-			if (_draggingCell != null)
-			{
-				var draggedCell = _draggingCell;
-				_draggingCell = null;
-
-				if (CurrentCell != draggedCell)
-				{
-					CellDropped?.Invoke(this, new CellEventArgs(draggedCell, CurrentCell));
-				}
-			}
-		}
-
-		/// <summary>
-		/// Scrolls to the given index, according to the scroll settings.
-		/// </summary>
-		public void ScrollToIndex(int index)
-		{
-			if (ScrollMethod == "near")
-			{
-				MakeIndexVisible(index);
-			}
-
-			if (!IsVisible(index) || AlwaysScroll)
-			{
-				if (ScrollMethod == "top")
-				{
-					FirstVisibleRow = index;
-				}
-				else if (ScrollMethod == "bottom")
-				{
-					LastVisibleRow = index;
-				}
-				else if (ScrollMethod == "center")
-				{
-					if (LagFramesToHide == 0)
-					{
-						FirstVisibleRow = Math.Max(index - (VisibleRows / 2), 0);
-					}
-					else
-					{
-						if (Math.Abs(FirstVisibleRow + CountLagFramesDisplay(VisibleRows / 2) - index) > VisibleRows) // Big jump
-						{
-							FirstVisibleRow = Math.Max(index - (ExpectedDisplayRange() / 2), 0);
-							SetLagFramesArray();
-						}
-
-						// Small jump, more accurate
-						int lastVisible = FirstVisibleRow + CountLagFramesDisplay(VisibleRows / 2);
-						do
-						{
-							if ((lastVisible - index) / (LagFramesToHide + 1) != 0)
-							{
-								FirstVisibleRow = Math.Max(FirstVisibleRow - ((lastVisible - index) / (LagFramesToHide + 1)), 0);
-							}
-							else
-							{
-								FirstVisibleRow -= Math.Sign(lastVisible - index);
-							}
-
-							SetLagFramesArray();
-							lastVisible = FirstVisibleRow + CountLagFramesDisplay(VisibleRows / 2);
-						}
-						while ((lastVisible - index < 0 || lastVisible - index > _lagFrames[VisibleRows]) && FirstVisibleRow != 0);
-					}
-				}
-			}
-		}
-
-		/// <summary>
-		/// Scrolls so that the given index is visible, if it isn't already; doesn't use scroll settings.
-		/// </summary>
-		public void MakeIndexVisible(int index)
-		{
-			if (!IsVisible(index))
-			{
-				if (FirstVisibleRow > index)
-				{
-					FirstVisibleRow = index;
-				}
-				else
-				{
-					LastVisibleRow = index;
-				}
-			}
-		}
-
-		[Browsable(false)]
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-		public IEnumerable<int> SelectedRows
-		{
-			get
-			{
-				return _selectedItems
-					.Where(cell => cell.RowIndex.HasValue)
-					.Select(cell => cell.RowIndex.Value)
-					.Distinct();
-			}
-		}
-
-		public bool AnyRowsSelected
-		{
-			get
-			{
-				return _selectedItems.Any(cell => cell.RowIndex.HasValue);
-			}
-		}
-
-		public void ClearSelectedRows()
-		{
-			_selectedItems.Clear();
-		}
-
-		public IEnumerable<ToolStripItem> GenerateContextMenuItems()
-		{
-			yield return new ToolStripSeparator();
-
-			var rotate = new ToolStripMenuItem
-			{
-				Name = "RotateMenuItem",
-				Text = "Rotate",
-				ShortcutKeyDisplayString = RotateHotkeyStr,
-			};
-
-			rotate.Click += (o, ev) =>
-			{
-				HorizontalOrientation ^= true;
-			};
-
-			yield return rotate;
-		}
-
-		public string RotateHotkeyStr => "Ctrl+Shift+F";
-
-		#endregion
-
-		#region Mouse and Key Events
-
-		private bool _columnDownMoved;
-		protected override void OnMouseMove(MouseEventArgs e)
-		{
-			_currentX = e.X;
-			_currentY = e.Y;
-
-			if (_columnDown != null)
-			{
-				_columnDownMoved = true;
-			}
-
-			Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
-
-			// SuuperW: Hide lag frames
-			if (QueryFrameLag != null && newCell.RowIndex.HasValue)
-			{
-				newCell.RowIndex += CountLagFramesDisplay(newCell.RowIndex.Value);
-			}
-
-			newCell.RowIndex += FirstVisibleRow;
-			if (newCell.RowIndex < 0)
-			{
-				newCell.RowIndex = 0;
-			}
-
-			if (!newCell.Equals(CurrentCell))
-			{
-				CellChanged(newCell);
-
-				if (IsHoveringOnColumnCell ||
-					(WasHoveringOnColumnCell && !IsHoveringOnColumnCell))
-				{
-					Refresh();
-				}
-				else if (_columnDown != null)
-				{
-					Refresh();
-				}
-			}
-			else if (_columnDown != null) // Kind of silly feeling to have this check twice, but the only alternative I can think of has it refreshing twice when pointed column changes with column down, and speed matters
-			{
-				Refresh();
-			}
-
-			base.OnMouseMove(e);
-		}
-
-		protected override void OnMouseEnter(EventArgs e)
-		{
-			CurrentCell = new Cell
-			{
-				Column = null,
-				RowIndex = null
-			};
-
-			base.OnMouseEnter(e);
-		}
-
-		protected override void OnMouseLeave(EventArgs e)
-		{
-			_currentX = null;
-			_currentY = null;
-			CurrentCell = null;
-			IsPaintDown = false;
-			_hoverTimer.Stop();
-			Refresh();
-			base.OnMouseLeave(e);
-		}
-
-		// TODO add query callback of whether to select the cell or not
-		protected override void OnMouseDown(MouseEventArgs e)
-		{
-			if (!GlobalWin.MainForm.EmulatorPaused && _currentX.HasValue)
-			{
-				// copypaste from OnMouseMove()
-				Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
-				if (QueryFrameLag != null && newCell.RowIndex.HasValue)
-				{
-					newCell.RowIndex += CountLagFramesDisplay(newCell.RowIndex.Value);
-				}
-
-				newCell.RowIndex += FirstVisibleRow;
-				if (newCell.RowIndex < 0)
-				{
-					newCell.RowIndex = 0;
-				}
-
-				if (!newCell.Equals(CurrentCell))
-				{
-					CellChanged(newCell);
-
-					if (IsHoveringOnColumnCell ||
-						(WasHoveringOnColumnCell && !IsHoveringOnColumnCell))
-					{
-						Refresh();
-					}
-					else if (_columnDown != null)
-					{
-						Refresh();
-					}
-				}
-				else if (_columnDown != null)
-				{
-					Refresh();
-				}
-			}
-
-			if (e.Button == MouseButtons.Left)
-			{
-				if (IsHoveringOnColumnCell)
-				{
-					_columnDown = CurrentCell.Column;
-				}
-				else if (InputPaintingMode)
-				{
-					IsPaintDown = true;
-				}
-			}
-
-			if (e.Button == MouseButtons.Right)
-			{
-				if (!IsHoveringOnColumnCell)
-				{
-					RightButtonHeld = true;
-				}
-			}
-
-			if (e.Button == MouseButtons.Left)
-			{
-				if (IsHoveringOnDataCell)
-				{
-					if (ModifierKeys == Keys.Alt)
-					{
-						// do marker drag here
-					}
-					else if (ModifierKeys == Keys.Shift && (CurrentCell.Column.Name == "FrameColumn" || CurrentCell.Column.Type == RollColumn.InputType.Text))
-					{
-						if (_selectedItems.Any())
-						{
-							if (FullRowSelect)
-							{
-								var selected = _selectedItems.Any(c => c.RowIndex.HasValue && CurrentCell.RowIndex.HasValue && c.RowIndex == CurrentCell.RowIndex);
-
-								if (!selected)
-								{
-									var rowIndices = _selectedItems
-										.Where(c => c.RowIndex.HasValue)
-										.Select(c => c.RowIndex ?? -1)
-										.Where(c => c >= 0) // Hack to avoid possible Nullable exceptions
-										.Distinct()
-										.ToList();
-
-									var firstIndex = rowIndices.Min();
-									var lastIndex = rowIndices.Max();
-
-									if (CurrentCell.RowIndex.Value < firstIndex)
-									{
-										for (int i = CurrentCell.RowIndex.Value; i < firstIndex; i++)
-										{
-											SelectCell(new Cell
-												{
-													RowIndex = i,
-													Column = CurrentCell.Column
-												});
-										}
-									}
-									else if (CurrentCell.RowIndex.Value > lastIndex)
-									{
-										for (int i = lastIndex + 1; i <= CurrentCell.RowIndex.Value; i++)
-										{
-											SelectCell(new Cell
-											{
-												RowIndex = i,
-												Column = CurrentCell.Column
-											});
-										}
-									}
-									else // Somewhere in between, a scenario that can happen with ctrl-clicking, find the previous and highlight from there
-									{
-										var nearest = rowIndices
-											.Where(x => x < CurrentCell.RowIndex.Value)
-											.Max();
-
-										for (int i = nearest + 1; i <= CurrentCell.RowIndex.Value; i++)
-										{
-											SelectCell(new Cell
-											{
-												RowIndex = i,
-												Column = CurrentCell.Column
-											});
-										}
-									}
-								}
-							}
-							else
-							{
-								MessageBox.Show("Shift click logic for individual cells has not yet implemented");
-							}
-						}
-						else
-						{
-							SelectCell(CurrentCell);
-						}
-					}
-					else if (ModifierKeys == Keys.Control && (CurrentCell.Column.Name == "FrameColumn" || CurrentCell.Column.Type == RollColumn.InputType.Text))
-					{
-						SelectCell(CurrentCell, toggle: true);
-					}
-					else if (ModifierKeys != Keys.Shift)
-					{
-						var hadIndex = _selectedItems.Any();
-						_selectedItems.Clear();
-						SelectCell(CurrentCell);
-					}
-
-					Refresh();
-
-					SelectedIndexChanged?.Invoke(this, new EventArgs());
-				}
-			}
-
-			base.OnMouseDown(e);
-
-			if (AllowRightClickSelecton && e.Button == MouseButtons.Right)
-			{
-				if (!IsHoveringOnColumnCell && CurrentCell != null)
-				{
-					_currentX = e.X;
-					_currentY = e.Y;
-					Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
-					newCell.RowIndex += FirstVisibleRow;
-					CellChanged(newCell);
-					SelectCell(CurrentCell);
-				}
-			}
-		}
-
-		protected override void OnMouseUp(MouseEventArgs e)
-		{
-			if (IsHoveringOnColumnCell)
-			{
-				if (_columnDown != null && _columnDownMoved)
-				{
-					DoColumnReorder();
-					_columnDown = null;
-					Refresh();
-				}
-				else if (e.Button == MouseButtons.Left)
-				{
-					ColumnClickEvent(ColumnAtX(e.X));
-				}
-				else if (e.Button == MouseButtons.Right)
-				{
-					ColumnRightClickEvent(ColumnAtX(e.X));
-				}
-			}
-
-			_columnDown = null;
-			_columnDownMoved = false;
-			RightButtonHeld = false;
-			IsPaintDown = false;
-			base.OnMouseUp(e);
-		}
-
-		private void IncrementScrollBar(ScrollBar bar, bool increment)
-		{
-			int newVal;
-			if (increment)
-			{
-				newVal = bar.Value + bar.SmallChange;
-				if (newVal > bar.Maximum - bar.LargeChange)
-				{
-					newVal = bar.Maximum - bar.LargeChange;
-				}
-			}
-			else
-			{
-				newVal = bar.Value - bar.SmallChange;
-				if (newVal < 0)
-				{
-					newVal = 0;
-				}
-			}
-
-			_programmaticallyUpdatingScrollBarValues = true;
-			bar.Value = newVal;
-			_programmaticallyUpdatingScrollBarValues = false;
-		}
-
-		protected override void OnMouseWheel(MouseEventArgs e)
-		{
-			if (RightButtonHeld)
-			{
-				DoRightMouseScroll(this, e);
-			}
-			else
-			{
-				if (HorizontalOrientation)
-				{
-					do
-					{
-						IncrementScrollBar(_hBar, e.Delta < 0);
-						SetLagFramesFirst();
-					}
-					while (_lagFrames[0] != 0 && _hBar.Value != 0 && _hBar.Value != _hBar.Maximum);
-				}
-				else
-				{
-					do
-					{
-						IncrementScrollBar(_vBar, e.Delta < 0);
-						SetLagFramesFirst();
-					}
-					while (_lagFrames[0] != 0 && _vBar.Value != 0 && _vBar.Value != _vBar.Maximum);
-				}
-
-				if (_currentX != null)
-				{
-					OnMouseMove(new MouseEventArgs(MouseButtons.None, 0, _currentX.Value, _currentY.Value, 0));
-				}
-
-				Refresh();
-			}
-		}
-
-		private void DoRightMouseScroll(object sender, MouseEventArgs e)
-		{
-			RightMouseScrolled?.Invoke(sender, e);
-		}
-
-		private void ColumnClickEvent(RollColumn column)
-		{
-			ColumnClick?.Invoke(this, new ColumnClickEventArgs(column));
-		}
-
-		private void ColumnRightClickEvent(RollColumn column)
-		{
-			ColumnRightClick?.Invoke(this, new ColumnClickEventArgs(column));
-		}
-
-		protected override void OnKeyDown(KeyEventArgs e)
-		{
-			if (!SuspendHotkeys)
-			{
-				if (e.Control && !e.Alt && e.Shift && e.KeyCode == Keys.F) // Ctrl+Shift+F
-				{
-					HorizontalOrientation ^= true;
-				}
-				// Scroll
-				else if (!e.Control && !e.Alt && !e.Shift && e.KeyCode == Keys.PageUp) // Page Up
-				{
-					if (FirstVisibleRow > 0)
-					{
-						LastVisibleRow = FirstVisibleRow;
-						Refresh();
-					}
-				}
-				else if (!e.Control && !e.Alt && !e.Shift && e.KeyCode == Keys.PageDown) // Page Down
-				{
-					var totalRows = LastVisibleRow - FirstVisibleRow;
-					if (totalRows <= RowCount)
-					{
-						var final = LastVisibleRow + totalRows;
-						if (final > RowCount)
-						{
-							final = RowCount;
-						}
-
-						LastVisibleRow = final;
-						Refresh();
-					}
-				}
-				else if (!e.Control && !e.Alt && !e.Shift && e.KeyCode == Keys.Home) // Home
-				{
-					FirstVisibleRow = 0;
-					Refresh();
-				}
-				else if (!e.Control && !e.Alt && !e.Shift && e.KeyCode == Keys.End) // End
-				{
-					LastVisibleRow = RowCount;
-					Refresh();
-				}
-				else if (!e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Up) // Up
-				{
-					if (FirstVisibleRow > 0)
-					{
-						FirstVisibleRow--;
-						Refresh();
-					}
-				}
-				else if (!e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Down) // Down
-				{
-					if (FirstVisibleRow < RowCount - 1)
-					{
-						FirstVisibleRow++;
-						Refresh();
-					}
-				}
-				// Selection courser
-				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Up) // Ctrl + Up
-				{
-					if (SelectedRows.Any() && LetKeysModifySelection && SelectedRows.First() > 0)
-					{
-						foreach (var row in SelectedRows.ToList())
-						{
-							SelectRow(row - 1, true);
-							SelectRow(row, false);
-						}
-					}
-				}
-				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Down) // Ctrl + Down
-				{
-					if (SelectedRows.Any() && LetKeysModifySelection)
-					{
-						foreach (var row in SelectedRows.Reverse().ToList())
-						{
-							SelectRow(row + 1, true);
-							SelectRow(row, false);
-						}
-					}
-				}
-				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Left) // Ctrl + Left
-				{
-					if (SelectedRows.Any() && LetKeysModifySelection)
-					{
-						SelectRow(SelectedRows.Last(), false);
-					}
-				}
-				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Right) // Ctrl + Right
-				{
-					if (SelectedRows.Any() && LetKeysModifySelection && SelectedRows.Last() < _rowCount - 1)
-					{
-						SelectRow(SelectedRows.Last() + 1, true);
-					}
-				}
-				else if (e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.Left) // Ctrl + Shift + Left
-				{
-					if (SelectedRows.Any() && LetKeysModifySelection && SelectedRows.First() > 0)
-					{
-						SelectRow(SelectedRows.First() - 1, true);
-					}
-				}
-				else if (e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.Right) // Ctrl + Shift + Right
-				{
-					if (SelectedRows.Any() && LetKeysModifySelection)
-					{
-						SelectRow(SelectedRows.First(), false);
-					}
-				}
-				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.PageUp) // Ctrl + Page Up
-				{
-					//jump to above marker with selection courser
-					if (LetKeysModifySelection)
-					{
-						
-					}
-				}
-				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.PageDown) // Ctrl + Page Down
-				{
-					//jump to below marker with selection courser
-					if (LetKeysModifySelection)
-					{
-
-					}
-
-				}
-				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Home) // Ctrl + Home
-				{
-					//move selection courser to frame 0
-					if (LetKeysModifySelection)
-					{
-						DeselectAll();
-						SelectRow(0, true);
-					}
-				}
-				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.End) // Ctrl + End
-				{
-					//move selection courser to end of movie
-					if (LetKeysModifySelection)
-					{
-						DeselectAll();
-						SelectRow(RowCount-1, true);
-					}
-				}
-
-			}
-
-			base.OnKeyDown(e);
-		}
-
-		#endregion
-
-		#region Change Events
-
-		protected override void OnResize(EventArgs e)
-		{
-			RecalculateScrollBars();
-			base.OnResize(e);
-			Refresh();
-		}
-
-		private void OrientationChanged()
-		{
-			RecalculateScrollBars();
-
-			// TODO scroll to correct positions
-			ColumnChangedCallback();
-			RecalculateScrollBars();
-
-			Refresh();
-		}
-
-		/// <summary>
-		/// Call this function to change the CurrentCell to newCell
-		/// </summary>
-		private void CellChanged(Cell newCell)
-		{
-			LastCell = CurrentCell;
-			CurrentCell = newCell;
-
-			if (PointedCellChanged != null &&
-				(LastCell.Column != CurrentCell.Column || LastCell.RowIndex != CurrentCell.RowIndex))
-			{
-				PointedCellChanged(this, new CellEventArgs(LastCell, CurrentCell));
-			}
-
-			if (CurrentCell?.Column != null && CurrentCell.RowIndex.HasValue)
-			{
-				_hoverTimer.Start();
-			}
-			else
-			{
-				_hoverTimer.Stop();
-			}
-		}
-
-		private void VerticalBar_ValueChanged(object sender, EventArgs e)
-		{
-			if (!_programmaticallyUpdatingScrollBarValues)
-			{
-				Refresh();
-			}
-
-			if (_horizontalOrientation)
-			{
-				ColumnScroll?.Invoke(this, e);
-			}
-			else
-			{
-				RowScroll?.Invoke(this, e);
-			}
-		}
-
-		private void HorizontalBar_ValueChanged(object sender, EventArgs e)
-		{
-			if (!_programmaticallyUpdatingScrollBarValues)
-			{
-				Refresh();
-			}
-
-			if (_horizontalOrientation)
-			{
-				RowScroll?.Invoke(this, e);
-			}
-			else
-			{
-				ColumnScroll?.Invoke(this, e);
-			}
-		}
-
-		private void ColumnChangedCallback()
-		{
-			RecalculateScrollBars();
-			if (_columns.VisibleColumns.Any())
-			{
-				ColumnWidth = _columns.VisibleColumns.Max(c => c.Width.Value) + CellWidthPadding * 4;
-			}
-		}
-
-		#endregion
-
-		#region Helpers
-
-		// TODO: Make into an extension method
-		private static Color Add(Color color, int val)
-		{
-			var col = color.ToArgb();
-			col += val;
-			return Color.FromArgb(col);
-		}
-
-		private void DoColumnReorder()
-		{
-			if (_columnDown != CurrentCell.Column)
-			{
-				var oldIndex = _columns.IndexOf(_columnDown);
-				var newIndex = _columns.IndexOf(CurrentCell.Column);
-
-				ColumnReordered?.Invoke(this, new ColumnReorderedEventArgs(oldIndex, newIndex, _columnDown));
-
-				_columns.Remove(_columnDown);
-				_columns.Insert(newIndex, _columnDown);
-			}
-		}
-
-		// ScrollBar.Maximum = DesiredValue + ScrollBar.LargeChange - 1
-		// See MSDN Page for more information on the dumb ScrollBar.Maximum Property
-		private void RecalculateScrollBars()
-		{
-			if (_vBar == null || _hBar == null) return;
-
-			UpdateDrawSize();
-
+				// Measure width change to ignore extra padding at start/end
+				var size1 = _renderer.MeasureString("A", _font);
+				var size2 = _renderer.MeasureString("AA", _font);
+				_charSize = new Size(size2.Width - size1.Width, size1.Height); // TODO make this a property so changing it updates other values.
+			}
+
+			UpdateCellSize();
+			ColumnWidth = CellWidth;
+			ColumnHeight = CellHeight + 2;
+
+			_vBar.SmallChange = CellHeight;
+			_vBar.LargeChange = CellHeight * 20;
+
+			_hBar.SmallChange = CellWidth;
+			_hBar.LargeChange = 20;
+
+			Controls.Add(_vBar);
+			Controls.Add(_hBar);
+
+			_vBar.ValueChanged += VerticalBar_ValueChanged;
+			_hBar.ValueChanged += HorizontalBar_ValueChanged;
+
+			RecalculateScrollBars();
+			_columns.ChangedCallback = ColumnChangedCallback;
+
+			_hoverTimer.Interval = 750;
+			_hoverTimer.Tick += HoverTimerEventProcessor;
+			_hoverTimer.Stop();
+
+			_foreColor = ForeColor;
+			_backColor = BackColor;
+		}
+
+		private void HoverTimerEventProcessor(object sender, EventArgs e)
+		{
+			_hoverTimer.Stop();
+
+			CellHovered?.Invoke(this, new CellEventArgs(LastCell, CurrentCell));
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			_renderer.Dispose();
+			base.Dispose(disposing);
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			if (IsHoveringOnColumnEdge)
+			{
+				if (HorizontalOrientation)
+				{
+					// TODO
+				}
+				else
+				{
+					var maxLength = CurrentCell.Column.Text?.Length ?? 0;
+
+					for (int i = 0; i < RowCount; i++)
+					{
+						string text = "";
+						int offSetX = 0, offSetY = 0;
+						QueryItemText?.Invoke(i, CurrentCell.Column, out text, ref offSetX, ref offSetY);
+						if (text.Length > maxLength)
+						{
+							maxLength = text.Length;
+						}
+					}
+
+					var newWidth = (maxLength * _charSize.Width) + (CellWidthPadding * 2);
+					CurrentCell.Column.Width = newWidth;
+					_columns.ColumnsChanged();
+					Refresh();
+				}
+				
+			}
+
+			base.OnDoubleClick(e);
+		}
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets the amount of left and right padding on the text inside a cell
+		/// </summary>
+		[DefaultValue(3)]
+		[Category("Behavior")]
+		public int CellWidthPadding { get; set; }
+
+		/// <summary>
+		/// Gets or sets the amount of top and bottom padding on the text inside a cell
+		/// </summary>
+		[DefaultValue(1)]
+		[Category("Behavior")]
+		public int CellHeightPadding { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether grid lines are displayed around cells
+		/// </summary>
+		[Category("Appearance")]
+		[DefaultValue(true)]
+		public bool GridLines { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the control is horizontal or vertical
+		/// </summary>
+		[Category("Behavior")]
+		public bool HorizontalOrientation
+		{
+			get
+			{
+				return _horizontalOrientation;
+			}
+			set
+			{
+				if (_horizontalOrientation != value)
+				{
+					int temp = ScrollSpeed;
+					_horizontalOrientation = value;
+					OrientationChanged();
+					_hBar.SmallChange = CellWidth;
+					_vBar.SmallChange = CellHeight;
+					ScrollSpeed = temp;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the scrolling speed
+		/// </summary>
+		[Category("Behavior")]
+		public int ScrollSpeed
+		{
+			get
+			{
+				if (HorizontalOrientation)
+				{
+					return _hBar.SmallChange / CellWidth;
+				}
+
+				return _vBar.SmallChange / CellHeight;
+			}
+
+			set
+			{
+				if (HorizontalOrientation)
+				{
+					_hBar.SmallChange = value * CellWidth;
+				}
+				else
+				{
+					_vBar.SmallChange = value * CellHeight;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the sets the virtual number of rows to be displayed. Does not include the column header row.
+		/// </summary>
+		[Category("Behavior")]
+		public int RowCount
+		{
+			get
+			{
+				return _rowCount;
+			}
+
+			set
+			{
+				_rowCount = value;
+				RecalculateScrollBars();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether columns can be resized
+		/// </summary>
+		[Category("Behavior")]
+		public bool AllowColumnResize { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether columns can be reordered
+		/// </summary>
+		[Category("Behavior")]
+		public bool AllowColumnReorder { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the entire row will always be selected 
+		/// </summary>
+		[Category("Appearance")]
+		[DefaultValue(false)]
+		public bool FullRowSelect { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether multiple items can to be selected
+		/// </summary>
+		[Category("Behavior")]
+		[DefaultValue(true)]
+		public bool MultiSelect { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the control is in input painting mode
+		/// </summary>
+		[Category("Behavior")]
+		[DefaultValue(false)]
+		public bool InputPaintingMode { get; set; }
+
+		/// <summary>
+		/// All visible columns
+		/// </summary>
+		[Category("Behavior")]
+		public IEnumerable<RollColumn> VisibleColumns => _columns.VisibleColumns;
+
+		/// <summary>
+		/// Gets or sets how the InputRoll scrolls when calling ScrollToIndex.
+		/// </summary>
+		[DefaultValue("near")]
+		[Category("Behavior")]
+		public string ScrollMethod { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating how the scrolling behavior for the hover event
+		/// </summary>
+		[Category("Behavior")]
+		public bool AlwaysScroll { get; set; }
+
+		/// <summary>
+		/// Gets or sets the lowest seek interval to activate the progress bar
+		/// </summary>
+		[Category("Behavior")]
+		public int SeekingCutoffInterval { get; set; }
+
+		/// <summary>
+		/// Returns all columns including those that are not visible
+		/// </summary>
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public RollColumns AllColumns => _columns;
+
+		[DefaultValue(750)]
+		[Category("Behavior")]
+		public int HoverInterval
+		{
+			get { return _hoverTimer.Interval; }
+			set { _hoverTimer.Interval = value; }
+		}
+
+		#endregion
+
+		#region Event Handlers
+
+		/// <summary>
+		/// Fire the <see cref="QueryItemText"/> event which requests the text for the passed cell
+		/// </summary>
+		[Category("Virtual")]
+		public event QueryItemTextHandler QueryItemText;
+
+		/// <summary>
+		/// Fire the <see cref="QueryItemBkColor"/> event which requests the background color for the passed cell
+		/// </summary>
+		[Category("Virtual")]
+		public event QueryItemBkColorHandler QueryItemBkColor;
+
+		[Category("Virtual")]
+		public event QueryRowBkColorHandler QueryRowBkColor;
+
+		/// <summary>
+		/// Fire the <see cref="QueryItemIconHandler"/> event which requests an icon for a given cell
+		/// </summary>
+		[Category("Virtual")]
+		public event QueryItemIconHandler QueryItemIcon;
+
+		/// <summary>
+		/// Fire the QueryFrameLag event which checks if a given frame is a lag frame
+		/// </summary>
+		[Category("Virtual")]
+		public event QueryFrameLagHandler QueryFrameLag;
+
+		/// <summary>
+		/// Fires when the mouse moves from one cell to another (including column header cells)
+		/// </summary>
+		[Category("Mouse")]
+		public event CellChangeEventHandler PointedCellChanged;
+
+		/// <summary>
+		/// Fires when a cell is hovered on
+		/// </summary>
+		[Category("Mouse")]
+		public event HoverEventHandler CellHovered;
+
+		/// <summary>
+		/// Occurs when a column header is clicked
+		/// </summary>
+		[Category("Action")]
+		public event ColumnClickEventHandler ColumnClick;
+
+		/// <summary>
+		/// Occurs when a column header is right-clicked
+		/// </summary>
+		[Category("Action")]
+		public event ColumnClickEventHandler ColumnRightClick;
+
+		/// <summary>
+		/// Occurs whenever the 'SelectedItems' property for this control changes
+		/// </summary>
+		[Category("Behavior")]
+		public event EventHandler SelectedIndexChanged;
+
+		/// <summary>
+		/// Occurs whenever the mouse wheel is scrolled while the right mouse button is held
+		/// </summary>
+		[Category("Behavior")]
+		public event RightMouseScrollEventHandler RightMouseScrolled;
+
+		[Category("Property Changed")]
+		[Description("Occurs when the column header has been reordered")]
+		public event ColumnReorderedEventHandler ColumnReordered;
+
+		[Category("Action")]
+		[Description("Occurs when the scroll value of the visible rows change (in vertical orientation this is the vertical scroll bar change, and in horizontal it is the horizontal scroll bar)")]
+		public event RowScrollEvent RowScroll;
+
+		[Category("Action")]
+		[Description("Occurs when the scroll value of the columns (in vertical orientation this is the horizontal scroll bar change, and in horizontal it is the vertical scroll bar)")]
+		public event ColumnScrollEvent ColumnScroll;
+
+		[Category("Action")]
+		[Description("Occurs when a cell is dragged and then dropped into a new cell, old cell is the cell that was being dragged, new cell is its new destination")]
+		public event CellDroppedEvent CellDropped;
+
+		/// <summary>
+		/// Retrieve the text for a cell
+		/// </summary>
+		public delegate void QueryItemTextHandler(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY);
+
+		/// <summary>
+		/// Retrieve the background color for a cell
+		/// </summary>
+		public delegate void QueryItemBkColorHandler(int index, RollColumn column, ref Color color);
+		public delegate void QueryRowBkColorHandler(int index, ref Color color);
+
+		/// <summary>
+		/// Retrieve the image for a given cell
+		/// </summary>
+		public delegate void QueryItemIconHandler(int index, RollColumn column, ref Bitmap icon, ref int offsetX, ref int offsetY);
+
+		/// <summary>
+		/// Check if a given frame is a lag frame
+		/// </summary>
+		public delegate bool QueryFrameLagHandler(int index, bool hideWasLag);
+
+		public delegate void CellChangeEventHandler(object sender, CellEventArgs e);
+
+		public delegate void HoverEventHandler(object sender, CellEventArgs e);
+
+		public delegate void RightMouseScrollEventHandler(object sender, MouseEventArgs e);
+
+		public delegate void ColumnClickEventHandler(object sender, ColumnClickEventArgs e);
+
+		public delegate void ColumnReorderedEventHandler(object sender, ColumnReorderedEventArgs e);
+
+		public delegate void RowScrollEvent(object sender, EventArgs e);
+
+		public delegate void ColumnScrollEvent(object sender, EventArgs e);
+
+		public delegate void CellDroppedEvent(object sender, CellEventArgs e);
+
+		public class CellEventArgs
+		{
+			public CellEventArgs(Cell oldCell, Cell newCell)
+			{
+				OldCell = oldCell;
+				NewCell = newCell;
+			}
+
+			public Cell OldCell { get; }
+			public Cell NewCell { get; }
+		}
+
+		public class ColumnClickEventArgs
+		{
+			public ColumnClickEventArgs(RollColumn column)
+			{
+				Column = column;
+			}
+
+			public RollColumn Column { get; }
+		}
+
+		public class ColumnReorderedEventArgs
+		{
+			public ColumnReorderedEventArgs(int oldDisplayIndex, int newDisplayIndex, RollColumn column)
+			{
+				Column = column;
+				OldDisplayIndex = oldDisplayIndex;
+				NewDisplayIndex = newDisplayIndex;
+			}
+
+			public RollColumn Column { get; }
+			public int OldDisplayIndex { get; }
+			public int NewDisplayIndex { get; }
+		}
+
+		#endregion
+
+		#region Api
+
+		public void SelectRow(int index, bool val)
+		{
+			if (_columns.VisibleColumns.Any())
+			{
+				if (val)
+				{
+					SelectCell(new Cell
+					{
+						RowIndex = index,
+						Column = _columns[0]
+					});
+				}
+				else
+				{
+					IEnumerable<Cell> items = _selectedItems.Where(cell => cell.RowIndex == index);
+					_selectedItems.RemoveWhere(items.Contains);
+				}
+			}
+		}
+
+		public void SelectAll()
+		{
+			var oldFullRowVal = FullRowSelect;
+			FullRowSelect = true;
+			for (int i = 0; i < RowCount; i++)
+			{
+				SelectRow(i, true);
+			}
+
+			FullRowSelect = oldFullRowVal;
+		}
+
+		public void DeselectAll()
+		{
+			_selectedItems.Clear();
+		}
+
+		public void TruncateSelection(int index)
+		{
+			_selectedItems.RemoveWhere(cell => cell.RowIndex > index);
+		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool IsPointingAtColumnHeader => IsHoveringOnColumnCell;
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int? FirstSelectedIndex
+		{
+			get
+			{
+				if (AnyRowsSelected)
+				{
+					return SelectedRows.Min();
+				}
+
+				return null;
+			}
+		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int? LastSelectedIndex
+		{
+			get
+			{
+				if (AnyRowsSelected)
+				{
+					return SelectedRows.Max();
+				}
+
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the current Cell that the mouse was in.
+		/// </summary>
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Cell CurrentCell { get; set; }
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool CurrentCellIsDataCell => CurrentCell?.RowIndex != null && CurrentCell.Column != null;
+
+		/// <summary>
+		/// Gets or sets the previous Cell that the mouse was in.
+		/// </summary>
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Cell LastCell { get; private set; }
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool IsPaintDown { get; private set; }
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool UseCustomBackground { get; set; }
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int DrawHeight { get; private set; }
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int DrawWidth { get; private set; }
+
+		/// <summary>
+		/// Gets or sets the width of data cells when in Horizontal orientation.
+		/// </summary>
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int MaxCharactersInHorizontal
+		{
+			get
+			{
+				return _maxCharactersInHorizontal;
+			}
+
+			set
+			{
+				_maxCharactersInHorizontal = value;
+				UpdateCellSize();
+			}
+		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool RightButtonHeld { get; private set; }
+
+		public string UserSettingsSerialized()
+		{
+			var settings = ConfigService.SaveWithType(Settings);
+			return settings;
+		}
+
+		public void LoadSettingsSerialized(string settingsJson)
+		{
+			var settings = ConfigService.LoadWithType(settingsJson);
+
+			// TODO: don't silently fail, inform the user somehow
+			if (settings is InputRollSettings)
+			{
+				var rollSettings = settings as InputRollSettings;
+				_columns = rollSettings.Columns;
+				_columns.ChangedCallback = ColumnChangedCallback;
+				HorizontalOrientation = rollSettings.HorizontalOrientation;
+				LagFramesToHide = rollSettings.LagFramesToHide;
+				HideWasLagFrames = rollSettings.HideWasLagFrames;
+			}
+		}
+
+		private InputRollSettings Settings => new InputRollSettings
+		{
+			Columns = _columns,
+			HorizontalOrientation = HorizontalOrientation,
+			LagFramesToHide = LagFramesToHide,
+			HideWasLagFrames = HideWasLagFrames
+		};
+
+		public class InputRollSettings
+		{
+			public RollColumns Columns { get; set; }
+			public bool HorizontalOrientation { get; set; }
+			public int LagFramesToHide { get; set; }
+			public bool HideWasLagFrames { get; set; }
+		}
+
+		/// <summary>
+		/// Gets or sets the first visible row index, if scrolling is needed
+		/// </summary>
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int FirstVisibleRow
+		{
+			get
+			{
+				if (HorizontalOrientation)
+				{
+					return _hBar.Value / CellWidth;
+				}
+
+				return _vBar.Value / CellHeight;
+			}
+
+			set
+			{
+				if (HorizontalOrientation)
+				{
+					if (NeedsHScrollbar)
+					{
+						_programmaticallyUpdatingScrollBarValues = true;
+						if (value * CellWidth <= _hBar.Maximum)
+						{
+							_hBar.Value = value * CellWidth;
+						}
+						else
+						{
+							_hBar.Value = _hBar.Maximum;
+						}
+
+						_programmaticallyUpdatingScrollBarValues = false;
+					}
+				}
+				else
+				{
+					if (NeedsVScrollbar)
+					{
+						_programmaticallyUpdatingScrollBarValues = true;
+						if (value * CellHeight <= _vBar.Maximum)
+						{
+							_vBar.Value = value * CellHeight;
+						}
+						else
+						{
+							_vBar.Value = _vBar.Maximum;
+						}
+
+						_programmaticallyUpdatingScrollBarValues = false;
+					}
+				}
+			}
+		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		private int LastFullyVisibleRow
+		{
+			get
+			{
+				int halfRow = 0;
+				if ((DrawHeight - ColumnHeight - 3) % CellHeight < CellHeight / 2)
+				{
+					halfRow = 1;
+				}
+
+				return FirstVisibleRow + VisibleRows - halfRow + CountLagFramesDisplay(VisibleRows - halfRow);
+			}
+		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int LastVisibleRow
+		{
+			get
+			{
+				return FirstVisibleRow + VisibleRows + CountLagFramesDisplay(VisibleRows);
+			}
+
+			set
+			{
+				int halfRow = 0;
+				if ((DrawHeight - ColumnHeight - 3) % CellHeight < CellHeight / 2)
+				{
+					halfRow = 1;
+				}
+
+				if (LagFramesToHide == 0)
+				{
+					FirstVisibleRow = Math.Max(value - (VisibleRows - halfRow), 0);
+				}
+				else
+				{
+					if (Math.Abs(LastFullyVisibleRow - value) > VisibleRows) // Big jump
+					{
+						FirstVisibleRow = Math.Max(value - (ExpectedDisplayRange() - halfRow), 0);
+						SetLagFramesArray();
+					}
+
+					// Small jump, more accurate
+					int lastVisible = LastFullyVisibleRow;
+					do
+					{
+						if ((lastVisible - value) / (LagFramesToHide + 1) != 0)
+						{
+							FirstVisibleRow = Math.Max(FirstVisibleRow - ((lastVisible - value) / (LagFramesToHide + 1)), 0);
+						}
+						else
+						{
+							FirstVisibleRow -= Math.Sign(lastVisible - value);
+						}
+
+						SetLagFramesArray();
+						lastVisible = LastFullyVisibleRow;
+					}
+					while ((lastVisible - value < 0 || lastVisible - value > _lagFrames[VisibleRows - halfRow]) && FirstVisibleRow != 0);
+				}
+			}
+		}
+
+		public bool IsVisible(int index)
+		{
+			return (index >= FirstVisibleRow) && (index <= LastFullyVisibleRow);
+		}
+
+		public bool IsPartiallyVisible(int index)
+		{
+			return index >= FirstVisibleRow && index <= LastVisibleRow;
+		}
+
+		/// <summary>
+		/// Gets the number of rows currently visible including partially visible rows.
+		/// </summary>
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int VisibleRows
+		{
+			get
+			{
+				if (HorizontalOrientation)
+				{
+					return (DrawWidth - ColumnWidth) / CellWidth;
+				}
+
+				return (DrawHeight - ColumnHeight - 3) / CellHeight; // Minus three makes it work
+			}
+		}
+
+		/// <summary>
+		/// Gets the first visible column index, if scrolling is needed
+		/// </summary>
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int FirstVisibleColumn
+		{
+			get
+			{
+				var columnList = VisibleColumns.ToList();
+
+				if (HorizontalOrientation)
+				{
+					return Enumerable.Range(0, columnList.Count).First(i => GetHColBottom(i) > _vBar.Value);
+				}
+
+				return columnList.FindIndex(c => c.Right > _hBar.Value);
+			}
+		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int LastVisibleColumnIndex
+		{
+			get
+			{
+				List<RollColumn> columnList = VisibleColumns.ToList();
+
+				if (HorizontalOrientation)
+				{
+					int count = columnList.Count;
+					return Enumerable.Range(0, count).Select(i => count - 1 - i).First(i => GetHColTop(i) <= DrawWidth + _hBar.Value);
+				}
+
+				return columnList.FindLastIndex(c => c.Left <= DrawWidth + _hBar.Value);
+			}
+		}
+
+		private Cell _draggingCell;
+
+		public void DragCurrentCell()
+		{
+			_draggingCell = CurrentCell;
+		}
+
+		public void ReleaseCurrentCell()
+		{
+			if (_draggingCell != null)
+			{
+				var draggedCell = _draggingCell;
+				_draggingCell = null;
+
+				if (CurrentCell != draggedCell)
+				{
+					CellDropped?.Invoke(this, new CellEventArgs(draggedCell, CurrentCell));
+				}
+			}
+		}
+
+		/// <summary>
+		/// Scrolls to the given index, according to the scroll settings.
+		/// </summary>
+		public void ScrollToIndex(int index)
+		{
+			if (ScrollMethod == "near")
+			{
+				MakeIndexVisible(index);
+			}
+
+			if (!IsVisible(index) || AlwaysScroll)
+			{
+				if (ScrollMethod == "top")
+				{
+					FirstVisibleRow = index;
+				}
+				else if (ScrollMethod == "bottom")
+				{
+					LastVisibleRow = index;
+				}
+				else if (ScrollMethod == "center")
+				{
+					if (LagFramesToHide == 0)
+					{
+						FirstVisibleRow = Math.Max(index - (VisibleRows / 2), 0);
+					}
+					else
+					{
+						if (Math.Abs(FirstVisibleRow + CountLagFramesDisplay(VisibleRows / 2) - index) > VisibleRows) // Big jump
+						{
+							FirstVisibleRow = Math.Max(index - (ExpectedDisplayRange() / 2), 0);
+							SetLagFramesArray();
+						}
+
+						// Small jump, more accurate
+						int lastVisible = FirstVisibleRow + CountLagFramesDisplay(VisibleRows / 2);
+						do
+						{
+							if ((lastVisible - index) / (LagFramesToHide + 1) != 0)
+							{
+								FirstVisibleRow = Math.Max(FirstVisibleRow - ((lastVisible - index) / (LagFramesToHide + 1)), 0);
+							}
+							else
+							{
+								FirstVisibleRow -= Math.Sign(lastVisible - index);
+							}
+
+							SetLagFramesArray();
+							lastVisible = FirstVisibleRow + CountLagFramesDisplay(VisibleRows / 2);
+						}
+						while ((lastVisible - index < 0 || lastVisible - index > _lagFrames[VisibleRows]) && FirstVisibleRow != 0);
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Scrolls so that the given index is visible, if it isn't already; doesn't use scroll settings.
+		/// </summary>
+		public void MakeIndexVisible(int index)
+		{
+			if (!IsVisible(index))
+			{
+				if (FirstVisibleRow > index)
+				{
+					FirstVisibleRow = index;
+				}
+				else
+				{
+					LastVisibleRow = index;
+				}
+			}
+		}
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public IEnumerable<int> SelectedRows
+		{
+			get
+			{
+				return _selectedItems
+					.Where(cell => cell.RowIndex.HasValue)
+					.Select(cell => cell.RowIndex.Value)
+					.Distinct();
+			}
+		}
+
+		public bool AnyRowsSelected
+		{
+			get
+			{
+				return _selectedItems.Any(cell => cell.RowIndex.HasValue);
+			}
+		}
+
+		public void ClearSelectedRows()
+		{
+			_selectedItems.Clear();
+		}
+
+		public IEnumerable<ToolStripItem> GenerateContextMenuItems()
+		{
+			yield return new ToolStripSeparator();
+
+			var rotate = new ToolStripMenuItem
+			{
+				Name = "RotateMenuItem",
+				Text = "Rotate",
+				ShortcutKeyDisplayString = RotateHotkeyStr,
+			};
+
+			rotate.Click += (o, ev) =>
+			{
+				HorizontalOrientation ^= true;
+			};
+
+			yield return rotate;
+		}
+
+		public string RotateHotkeyStr => "Ctrl+Shift+F";
+
+		#endregion
+
+		#region Mouse and Key Events
+
+		private bool _columnDownMoved;
+		private int _previousX; // TODO: move me
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			_previousX = _currentX ?? 0;
+			_currentX = e.X;
+			_currentY = e.Y;
+
+			if (_columnResizing != null)
+			{
+				if (_currentX != _previousX)
+				{
+					_columnResizing.Width += _currentX - _previousX;
+					_columns.ColumnsChanged();
+					Refresh();
+				}
+			}
+			else if (_columnDown != null)
+			{
+				_columnDownMoved = true;
+			}
+
+			Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
+			
+			// SuuperW: Hide lag frames
+			if (QueryFrameLag != null && newCell.RowIndex.HasValue)
+			{
+				newCell.RowIndex += CountLagFramesDisplay(newCell.RowIndex.Value);
+			}
+
+			newCell.RowIndex += FirstVisibleRow;
+			if (newCell.RowIndex < 0)
+			{
+				newCell.RowIndex = 0;
+			}
+
+			if (!newCell.Equals(CurrentCell))
+			{
+				CellChanged(newCell);
+
+				if (IsHoveringOnColumnCell ||
+					(WasHoveringOnColumnCell && !IsHoveringOnColumnCell))
+				{
+					Refresh();
+				}
+				else if (_columnDown != null)
+				{
+					Refresh();
+				}
+			}
+			else if (_columnDown != null)  // Kind of silly feeling to have this check twice, but the only alternative I can think of has it refreshing twice when pointed column changes with column down, and speed matters
+			{
+				Refresh();
+			}
+
+			Cursor = IsHoveringOnColumnEdge || _columnResizing != null
+				? Cursors.VSplit
+				: Cursors.Default;
+
+			base.OnMouseMove(e);
+		}
+
+		protected override void OnMouseEnter(EventArgs e)
+		{
+			CurrentCell = new Cell
+			{
+				Column = null,
+				RowIndex = null
+			};
+
+			base.OnMouseEnter(e);
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			_currentX = null;
+			_currentY = null;
+			CurrentCell = null;
+			IsPaintDown = false;
+			_columnResizing = null;
+			_hoverTimer.Stop();
+			Refresh();
+			base.OnMouseLeave(e);
+		}
+
+		// TODO add query callback of whether to select the cell or not
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			if (!GlobalWin.MainForm.EmulatorPaused && _currentX.HasValue)
+			{
+				// TODO: this is copy pasta from OnMouseMove()
+				Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
+				if (QueryFrameLag != null && newCell.RowIndex.HasValue)
+				{
+					newCell.RowIndex += CountLagFramesDisplay(newCell.RowIndex.Value);
+				}
+
+				newCell.RowIndex += FirstVisibleRow;
+				if (newCell.RowIndex < 0)
+				{
+					newCell.RowIndex = 0;
+				}
+
+				if (!newCell.Equals(CurrentCell))
+				{
+					CellChanged(newCell);
+
+					if (IsHoveringOnColumnCell ||
+						(WasHoveringOnColumnCell && !IsHoveringOnColumnCell))
+					{
+						Refresh();
+					}
+					else if (_columnDown != null)
+					{
+						Refresh();
+					}
+				}
+				else if (_columnDown != null)
+				{
+					Refresh();
+				}
+			}
+
+			if (e.Button == MouseButtons.Left)
+			{
+				if (IsHoveringOnColumnEdge)
+				{
+					_columnResizing = CurrentCell.Column;
+				}
+				if (IsHoveringOnColumnCell)
+				{
+					_columnDown = CurrentCell.Column;
+				}
+				else if (InputPaintingMode)
+				{
+					IsPaintDown = true;
+				}
+			}
+
+			if (e.Button == MouseButtons.Right)
+			{
+				if (!IsHoveringOnColumnCell)
+				{
+					RightButtonHeld = true;
+				}
+			}
+
+			if (e.Button == MouseButtons.Left)
+			{
+				if (IsHoveringOnDataCell)
+				{
+					if (ModifierKeys == Keys.Alt)
+					{
+						// do marker drag here
+					}
+					else if (ModifierKeys == Keys.Shift && CurrentCell.Column.Type == ColumnType.Text)
+					{
+						if (_selectedItems.Any())
+						{
+							if (FullRowSelect)
+							{
+								var selected = _selectedItems.Any(c => c.RowIndex.HasValue && CurrentCell.RowIndex.HasValue && c.RowIndex == CurrentCell.RowIndex);
+
+								if (!selected)
+								{
+									var rowIndices = _selectedItems
+										.Where(c => c.RowIndex.HasValue)
+										.Select(c => c.RowIndex ?? -1)
+										.Where(c => c >= 0) // Hack to avoid possible Nullable exceptions
+										.Distinct()
+										.ToList();
+
+									var firstIndex = rowIndices.Min();
+									var lastIndex = rowIndices.Max();
+
+									if (CurrentCell.RowIndex.Value < firstIndex)
+									{
+										for (int i = CurrentCell.RowIndex.Value; i < firstIndex; i++)
+										{
+											SelectCell(new Cell
+												{
+													RowIndex = i,
+													Column = CurrentCell.Column
+												});
+										}
+									}
+									else if (CurrentCell.RowIndex.Value > lastIndex)
+									{
+										for (int i = lastIndex + 1; i <= CurrentCell.RowIndex.Value; i++)
+										{
+											SelectCell(new Cell
+											{
+												RowIndex = i,
+												Column = CurrentCell.Column
+											});
+										}
+									}
+									else // Somewhere in between, a scenario that can happen with ctrl-clicking, find the previous and highlight from there
+									{
+										var nearest = rowIndices
+											.Where(x => x < CurrentCell.RowIndex.Value)
+											.Max();
+
+										for (int i = nearest + 1; i <= CurrentCell.RowIndex.Value; i++)
+										{
+											SelectCell(new Cell
+											{
+												RowIndex = i,
+												Column = CurrentCell.Column
+											});
+										}
+									}
+								}
+							}
+							else
+							{
+								MessageBox.Show("Shift click logic for individual cells has not yet implemented");
+							}
+						}
+						else
+						{
+							SelectCell(CurrentCell);
+						}
+					}
+					else if (ModifierKeys == Keys.Control && CurrentCell.Column.Type == ColumnType.Text)
+					{
+						SelectCell(CurrentCell, toggle: true);
+					}
+					else if (ModifierKeys != Keys.Shift)
+					{
+						_selectedItems.Clear();
+						SelectCell(CurrentCell);
+					}
+
+					Refresh();
+
+					SelectedIndexChanged?.Invoke(this, new EventArgs());
+				}
+			}
+
+			base.OnMouseDown(e);
+
+			if (AllowRightClickSelection && e.Button == MouseButtons.Right)
+			{
+				if (!IsHoveringOnColumnCell && CurrentCell != null)
+				{
+					_currentX = e.X;
+					_currentY = e.Y;
+					Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
+					newCell.RowIndex += FirstVisibleRow;
+					CellChanged(newCell);
+					SelectCell(CurrentCell);
+				}
+			}
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			if (_columnResizing == null && IsHoveringOnColumnCell)
+			{
+				if (_columnDown != null && _columnDownMoved)
+				{
+					DoColumnReorder();
+					_columnDown = null;
+					Refresh();
+				}
+				else if (e.Button == MouseButtons.Left)
+				{
+					ColumnClickEvent(ColumnAtPixel(e.X));
+				}
+				else if (e.Button == MouseButtons.Right)
+				{
+					ColumnRightClickEvent(ColumnAtPixel(e.X));
+				}
+			}
+
+			_columnResizing = null;
+			_columnDown = null;
+			_columnDownMoved = false;
+			RightButtonHeld = false;
+			IsPaintDown = false;
+			base.OnMouseUp(e);
+		}
+
+		private void IncrementScrollBar(ScrollBar bar, bool increment)
+		{
+			int newVal;
+			if (increment)
+			{
+				newVal = bar.Value + bar.SmallChange;
+				if (newVal > bar.Maximum - bar.LargeChange)
+				{
+					newVal = bar.Maximum - bar.LargeChange;
+				}
+			}
+			else
+			{
+				newVal = bar.Value - bar.SmallChange;
+				if (newVal < 0)
+				{
+					newVal = 0;
+				}
+			}
+
+			_programmaticallyUpdatingScrollBarValues = true;
+			bar.Value = newVal;
+			_programmaticallyUpdatingScrollBarValues = false;
+		}
+
+		protected override void OnMouseWheel(MouseEventArgs e)
+		{
+			if (RightButtonHeld)
+			{
+				DoRightMouseScroll(this, e);
+			}
+			else
+			{
+				if (HorizontalOrientation)
+				{
+					do
+					{
+						IncrementScrollBar(_hBar, e.Delta < 0);
+						SetLagFramesFirst();
+					}
+					while (_lagFrames[0] != 0 && _hBar.Value != 0 && _hBar.Value != _hBar.Maximum);
+				}
+				else
+				{
+					do
+					{
+						IncrementScrollBar(_vBar, e.Delta < 0);
+						SetLagFramesFirst();
+					}
+					while (_lagFrames[0] != 0 && _vBar.Value != 0 && _vBar.Value != _vBar.Maximum);
+				}
+
+				if (_currentX != null)
+				{
+					OnMouseMove(new MouseEventArgs(MouseButtons.None, 0, _currentX.Value, _currentY.Value, 0));
+				}
+
+				Refresh();
+			}
+		}
+
+		private void DoRightMouseScroll(object sender, MouseEventArgs e)
+		{
+			RightMouseScrolled?.Invoke(sender, e);
+		}
+
+		private void ColumnClickEvent(RollColumn column)
+		{
+			ColumnClick?.Invoke(this, new ColumnClickEventArgs(column));
+		}
+
+		private void ColumnRightClickEvent(RollColumn column)
+		{
+			ColumnRightClick?.Invoke(this, new ColumnClickEventArgs(column));
+		}
+
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			if (!SuspendHotkeys)
+			{
+				if (e.Control && !e.Alt && e.Shift && e.KeyCode == Keys.F) // Ctrl+Shift+F
+				{
+					HorizontalOrientation ^= true;
+				}
+				// Scroll
+				else if (!e.Control && !e.Alt && !e.Shift && e.KeyCode == Keys.PageUp) // Page Up
+				{
+					if (FirstVisibleRow > 0)
+					{
+						LastVisibleRow = FirstVisibleRow;
+						Refresh();
+					}
+				}
+				else if (!e.Control && !e.Alt && !e.Shift && e.KeyCode == Keys.PageDown) // Page Down
+				{
+					var totalRows = LastVisibleRow - FirstVisibleRow;
+					if (totalRows <= RowCount)
+					{
+						var final = LastVisibleRow + totalRows;
+						if (final > RowCount)
+						{
+							final = RowCount;
+						}
+
+						LastVisibleRow = final;
+						Refresh();
+					}
+				}
+				else if (!e.Control && !e.Alt && !e.Shift && e.KeyCode == Keys.Home) // Home
+				{
+					FirstVisibleRow = 0;
+					Refresh();
+				}
+				else if (!e.Control && !e.Alt && !e.Shift && e.KeyCode == Keys.End) // End
+				{
+					LastVisibleRow = RowCount;
+					Refresh();
+				}
+				else if (!e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Up) // Up
+				{
+					if (FirstVisibleRow > 0)
+					{
+						FirstVisibleRow--;
+						Refresh();
+					}
+				}
+				else if (!e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Down) // Down
+				{
+					if (FirstVisibleRow < RowCount - 1)
+					{
+						FirstVisibleRow++;
+						Refresh();
+					}
+				}
+				// Selection courser
+				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Up) // Ctrl + Up
+				{
+					if (SelectedRows.Any() && LetKeysModifySelection && SelectedRows.First() > 0)
+					{
+						foreach (var row in SelectedRows.ToList()) // clones SelectedRows
+						{
+							SelectRow(row - 1, true);
+							SelectRow(row, false);
+						}
+					}
+				}
+				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Down) // Ctrl + Down
+				{
+					if (SelectedRows.Any() && LetKeysModifySelection)
+					{
+						foreach (var row in SelectedRows.Reverse()) // clones SelectedRows
+						{
+							SelectRow(row + 1, true);
+							SelectRow(row, false);
+						}
+					}
+				}
+				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Left) // Ctrl + Left
+				{
+					if (SelectedRows.Any() && LetKeysModifySelection)
+					{
+						SelectRow(SelectedRows.Last(), false);
+					}
+				}
+				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Right) // Ctrl + Right
+				{
+					if (SelectedRows.Any() && LetKeysModifySelection && SelectedRows.Last() < _rowCount - 1)
+					{
+						SelectRow(SelectedRows.Last() + 1, true);
+					}
+				}
+				else if (e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.Left) // Ctrl + Shift + Left
+				{
+					if (SelectedRows.Any() && LetKeysModifySelection && SelectedRows.First() > 0)
+					{
+						SelectRow(SelectedRows.First() - 1, true);
+					}
+				}
+				else if (e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.Right) // Ctrl + Shift + Right
+				{
+					if (SelectedRows.Any() && LetKeysModifySelection)
+					{
+						SelectRow(SelectedRows.First(), false);
+					}
+				}
+				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.PageUp) // Ctrl + Page Up
+				{
+					//jump to above marker with selection courser
+					if (LetKeysModifySelection)
+					{
+						
+					}
+				}
+				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.PageDown) // Ctrl + Page Down
+				{
+					//jump to below marker with selection courser
+					if (LetKeysModifySelection)
+					{
+
+					}
+
+				}
+				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Home) // Ctrl + Home
+				{
+					//move selection courser to frame 0
+					if (LetKeysModifySelection)
+					{
+						DeselectAll();
+						SelectRow(0, true);
+					}
+				}
+				else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.End) // Ctrl + End
+				{
+					//move selection courser to end of movie
+					if (LetKeysModifySelection)
+					{
+						DeselectAll();
+						SelectRow(RowCount-1, true);
+					}
+				}
+
+			}
+
+			base.OnKeyDown(e);
+		}
+
+		#endregion
+
+		#region Change Events
+
+		protected override void OnResize(EventArgs e)
+		{
+			RecalculateScrollBars();
+			base.OnResize(e);
+			Refresh();
+		}
+
+		private void OrientationChanged()
+		{
+			RecalculateScrollBars();
+
+			// TODO scroll to correct positions
+			ColumnChangedCallback();
+			RecalculateScrollBars();
+
+			Refresh();
+		}
+
+		/// <summary>
+		/// Call this function to change the CurrentCell to newCell
+		/// </summary>
+		private void CellChanged(Cell newCell)
+		{
+			LastCell = CurrentCell;
+			CurrentCell = newCell;
+
+			if (PointedCellChanged != null &&
+				(LastCell.Column != CurrentCell.Column || LastCell.RowIndex != CurrentCell.RowIndex))
+			{
+				PointedCellChanged(this, new CellEventArgs(LastCell, CurrentCell));
+			}
+
+			if (CurrentCell?.Column != null && CurrentCell.RowIndex.HasValue)
+			{
+				_hoverTimer.Start();
+			}
+			else
+			{
+				_hoverTimer.Stop();
+			}
+		}
+
+		private void VerticalBar_ValueChanged(object sender, EventArgs e)
+		{
+			if (!_programmaticallyUpdatingScrollBarValues)
+			{
+				Refresh();
+			}
+
+			if (_horizontalOrientation)
+			{
+				ColumnScroll?.Invoke(_vBar, e);
+			}
+			else
+			{
+				RowScroll?.Invoke(_vBar, e);
+			}
+		}
+
+		private void HorizontalBar_ValueChanged(object sender, EventArgs e)
+		{
+			if (!_programmaticallyUpdatingScrollBarValues)
+			{
+				Refresh();
+			}
+
+			if (_horizontalOrientation)
+			{
+				RowScroll?.Invoke(_hBar, e);
+			}
+			else
+			{
+				ColumnScroll?.Invoke(_vBar, e);
+			}
+		}
+
+		private void ColumnChangedCallback()
+		{
+			RecalculateScrollBars();
+			if (_columns.VisibleColumns.Any())
+			{
+				ColumnWidth = _columns.VisibleColumns.Max(c => c.Width.Value) + CellWidthPadding * 4;
+			}
+		}
+
+		#endregion
+
+		#region Helpers
+
+		private void DoColumnReorder()
+		{
+			if (_columnDown != CurrentCell.Column)
+			{
+				var oldIndex = _columns.IndexOf(_columnDown);
+				var newIndex = _columns.IndexOf(CurrentCell.Column);
+
+				ColumnReordered?.Invoke(this, new ColumnReorderedEventArgs(oldIndex, newIndex, _columnDown));
+
+				_columns.Remove(_columnDown);
+				_columns.Insert(newIndex, _columnDown);
+			}
+		}
+
+		// ScrollBar.Maximum = DesiredValue + ScrollBar.LargeChange - 1
+		// See MSDN Page for more information on the dumb ScrollBar.Maximum Property
+		private void RecalculateScrollBars()
+		{
+			UpdateDrawSize();
+
 			var columns = _columns.VisibleColumns.ToList();
-
-			if (CellHeight == 0) CellHeight++;
-			if (HorizontalOrientation)
+			int iLastColumn = columns.Count - 1;
+
+			if (HorizontalOrientation)
+			{
+				NeedsVScrollbar = GetHColBottom(iLastColumn) > DrawHeight;
+				NeedsHScrollbar = RowCount > 1;
+			}
+			else
+			{
+				NeedsVScrollbar = ColumnHeight + (RowCount * RowHeight)  > Height;
+				NeedsHScrollbar = TotalColWidth.HasValue && TotalColWidth.Value - DrawWidth + 1 > 0;
+			}
+
+			UpdateDrawSize();
+			if (VisibleRows > 0)
+			{
+				if (HorizontalOrientation)
+				{
+					_hBar.Maximum = Math.Max((VisibleRows - 1) * CellWidth, _hBar.Maximum);
+					_hBar.LargeChange = (VisibleRows - 1) * CellWidth;
+					_vBar.LargeChange = Math.Max(0, DrawHeight / 2);
+				}
+				else
+				{
+					_vBar.Maximum = Math.Max((VisibleRows - 1) * CellHeight, _vBar.Maximum); // ScrollBar.Maximum is dumb
+					_vBar.LargeChange = (VisibleRows - 1) * CellHeight;
+					// DrawWidth can be negative if the TAStudio window is small enough
+					// Clamp LargeChange to 0 here to prevent exceptions
+					_hBar.LargeChange = Math.Max(0, DrawWidth / 2);
+				}
+			}
+
+			// Update VBar
+			if (NeedsVScrollbar)
+			{
+				if (HorizontalOrientation)
+				{
+					_vBar.Maximum = GetHColBottom(iLastColumn) - DrawHeight + _vBar.LargeChange;
+					if (_vBar.Maximum < 0)
+					{
+						_vBar.Maximum = 0;
+					}
+				}
+				else
+				{
+					_vBar.Maximum = RowsToPixels(RowCount + 1) - (CellHeight * 3) + _vBar.LargeChange - 1;
+					if (_vBar.Maximum < 0)
+					{
+						_vBar.Maximum = 0;
+					}
+				}
+
+				_vBar.Location = new Point(Width - _vBar.Width, 0);
+				_vBar.Height = Height;
+				_vBar.Visible = true;
+			}
+			else
+			{
+				_vBar.Visible = false;
+				_vBar.Value = 0;
+			}
+
+			// Update HBar
+			if (NeedsHScrollbar)
+			{
+				if (HorizontalOrientation)
+				{
+					_hBar.Maximum = RowsToPixels(RowCount + 1) - (CellHeight * 3) + _hBar.LargeChange - 1;
+				}
+				else
+				{
+					_hBar.Maximum = TotalColWidth.Value - DrawWidth + _hBar.LargeChange;
+				}
+
+				_hBar.Location = new Point(0, Height - _hBar.Height);
+				_hBar.Width = Width - (NeedsVScrollbar ? (_vBar.Width + 1) : 0);
+				_hBar.Visible = true;
+			}
+			else
+			{
+				_hBar.Visible = false;
+				_hBar.Value = 0;
+			}
+		}
+
+		private void UpdateDrawSize()
+		{
+			if (NeedsVScrollbar)
+			{
+				DrawWidth = Width - _vBar.Width;
+			}
+			else
+			{
+				DrawWidth = Width;
+			}
+			if (NeedsHScrollbar)
+			{
+				DrawHeight = Height - _hBar.Height;
+			}
+			else
+			{
+				DrawHeight = Height;
+			}
+		}
+
+		/// <summary>
+		/// If FullRowSelect is enabled, selects all cells in the row that contains the given cell. Otherwise only given cell is added.
+		/// </summary>
+		/// <param name="cell">The cell to select.</param>
+		/// <param name="toggle">Specifies whether or not to toggle the current state, rather than force the value to true</param>
+		private void SelectCell(Cell cell, bool toggle = false)
+		{
+			if (cell.RowIndex.HasValue && cell.RowIndex < RowCount)
+			{
+				if (!MultiSelect)
+				{
+					_selectedItems.Clear();
+				}
+
+				if (FullRowSelect)
+				{
+					if (toggle && _selectedItems.Any(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex))
+					{
+						_selectedItems.RemoveWhere(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex);
+					}
+					else
+					{
+						foreach (var column in _columns)
+						{
+							_selectedItems.Add(new Cell
+							{
+								RowIndex = cell.RowIndex,
+								Column = column
+							});
+						}
+					}
+				}
+				else
+				{
+					if (toggle && _selectedItems.Any(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex))
+					{
+						var item = _selectedItems
+							.FirstOrDefault(x => x.Equals(cell));
+
+						if (item != null)
+						{
+							_selectedItems.Remove(item);
+						}
+					}
+					else
+					{
+						_selectedItems.Add(CurrentCell);
+					}
+				}
+			}
+		}
+
+		private bool IsHoveringOnColumnCell => CurrentCell?.Column != null && !CurrentCell.RowIndex.HasValue;
+
+		private bool IsHoveringOnColumnEdge => AllowColumnResize && IsHoveringOnColumnCell && IsPointingOnCellEdge(_currentX);
+
+		private bool IsHoveringOnDataCell => CurrentCell?.Column != null && CurrentCell.RowIndex.HasValue;
+
+		private bool WasHoveringOnColumnCell => LastCell?.Column != null && !LastCell.RowIndex.HasValue;
+
+		private bool WasHoveringOnDataCell => LastCell?.Column != null && LastCell.RowIndex.HasValue;
+
+		private bool IsPointingOnCellEdge(int? x)
+		{
+			if (x.HasValue)
+			{
+				if (HorizontalOrientation)
+				{
+					return false; // TODO: support column resize in horizontal orientation
+				}
+
+				foreach (RollColumn column in _columns.VisibleColumns)
+				{
+					if (column.Left - _hBar.Value + (column.Width - column.Width / 6) <= x.Value && column.Right - _hBar.Value >= x.Value)
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		/// <summary>
+		/// Finds the specific cell that contains the (x, y) coordinate.
+		/// </summary>
+		/// <remarks>The row number that it returns will be between 0 and VisibleRows, NOT the absolute row number.</remarks>
+		/// <param name="x">X coordinate point.</param>
+		/// <param name="y">Y coordinate point.</param>
+		/// <returns>The cell with row number and RollColumn reference, both of which can be null. </returns>
+		private Cell CalculatePointedCell(int x, int y)
+		{
+			var newCell = new Cell();
+			var columns = _columns.VisibleColumns.ToList();
+
+			// If pointing to a column header
+			if (columns.Any())
+			{
+				if (HorizontalOrientation)
+				{
+					newCell.RowIndex = PixelsToRows(x);
+					newCell.Column = ColumnAtPixel(y);
+				}
+				else
+				{
+					newCell.RowIndex = PixelsToRows(y);
+					newCell.Column = ColumnAtPixel(x);
+				}
+			}
+
+			if (!(IsPaintDown || RightButtonHeld) && newCell.RowIndex <= -1) // -2 if we're entering from the top
+			{
+				newCell.RowIndex = null;
+			}
+
+			return newCell;
+		}
+
+		// A boolean that indicates if the InputRoll is too large vertically and requires a vertical scrollbar.
+		private bool NeedsVScrollbar { get; set; }
+
+		// A boolean that indicates if the InputRoll is too large horizontally and requires a horizontal scrollbar.
+		private bool NeedsHScrollbar { get; set; }
+
+		/// <summary>
+		/// Gets the total width of all the columns by using the last column's Right property.
+		/// </summary>
+		/// <returns>A nullable Int representing total width.</returns>
+		private int? TotalColWidth
+		{
+			get
+			{
+				if (_columns.VisibleColumns.Any())
+				{
+					return _columns.VisibleColumns.Last().Right;
+				}
+
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Returns the RollColumn object at the specified visible pixel coordinate.
+		/// </summary>
+		/// <param name="pixels">The pixel coordinate.</param>
+		/// <returns>RollColumn object that contains the pixel coordinate or null if none exists.</returns>
+		private RollColumn ColumnAtPixel(int pixel)
+		{
+			if (_horizontalOrientation)
+			{
+				foreach (var item in _columns.VisibleColumns.Select((n, i) => new { Column = n, Index = i }))
+				{
+					if (GetHColTop(item.Index) - _vBar.Value <= pixel && GetHColBottom(item.Index) - _vBar.Value >= pixel)
+					{
+						return item.Column;
+					}
+				}
+			}
+			else
 			{
-				NeedsVScrollbar = columns.Count > DrawHeight / CellHeight;
-				NeedsHScrollbar = RowCount > 1;
-			}
-			else
-			{
-				NeedsVScrollbar = RowCount > 1;
-				NeedsHScrollbar = TotalColWidth.HasValue && TotalColWidth.Value - DrawWidth + 1 > 0;
-			}
-
-			UpdateDrawSize();
-			if (VisibleRows > 0)
-			{
-				if (HorizontalOrientation)
+				foreach (RollColumn column in _columns.VisibleColumns)
 				{
-					_vBar.LargeChange = DrawHeight / 2;
-					_hBar.Maximum = Math.Max((VisibleRows - 1) * CellHeight, _hBar.Maximum);
-					_hBar.LargeChange = (VisibleRows - 1) * CellHeight;
-				}
-				else
-				{
-					_vBar.Maximum = Math.Max((VisibleRows - 1) * CellHeight, _vBar.Maximum); // ScrollBar.Maximum is dumb
-					_vBar.LargeChange = (VisibleRows - 1) * CellHeight;
-					// DrawWidth can be negative if the TAStudio window is small enough
-					// Clamp LargeChange to 0 here to prevent exceptions
-					_hBar.LargeChange = Math.Max(0, DrawWidth / 2);
-				}
-			}
-
-			// Update VBar
-			if (NeedsVScrollbar)
-			{
-				if (HorizontalOrientation)
-				{
-					_vBar.Maximum = ((columns.Count() * CellHeight) - DrawHeight) + _vBar.LargeChange;
-				}
-				else
-				{
-					_vBar.Maximum = RowsToPixels(RowCount + 1) - (CellHeight * 3) + _vBar.LargeChange - 1;
-				}
-
-				_vBar.Location = new Point(Width - _vBar.Width, 0);
-				_vBar.Height = Height;
-				_vBar.Visible = true;
-			}
-			else
-			{
-				_vBar.Visible = false;
-				_vBar.Value = 0;
-			}
-
-			// Update HBar
-			if (NeedsHScrollbar)
-			{
-				if (HorizontalOrientation)
-				{
-					_hBar.Maximum = RowsToPixels(RowCount + 1) - (CellHeight * 3) + _hBar.LargeChange - 1;
-				}
-				else
-				{
-					_hBar.Maximum = TotalColWidth.Value - DrawWidth + _hBar.LargeChange;
-				}
-
-				_hBar.Location = new Point(0, Height - _hBar.Height);
-				_hBar.Width = Width - (NeedsVScrollbar ? (_vBar.Width + 1) : 0);
-				_hBar.Visible = true;
-			}
-			else
-			{
-				_hBar.Visible = false;
-				_hBar.Value = 0;
-			}
-		}
-
-		private void UpdateDrawSize()
-		{
-			if (NeedsVScrollbar)
-			{
-				DrawWidth = Width - _vBar.Width;
-			}
-			else
-			{
-				DrawWidth = Width;
-			}
-			if (NeedsHScrollbar)
-			{
-				DrawHeight = Height - _hBar.Height;
-			}
-			else
-			{
-				DrawHeight = Height;
-			}
-		}
-
-		/// <summary>
-		/// If FullRowSelect is enabled, selects all cells in the row that contains the given cell. Otherwise only given cell is added.
-		/// </summary>
-		/// <param name="cell">The cell to select.</param>
-		private void SelectCell(Cell cell, bool toggle = false)
-		{
-			if (cell.RowIndex.HasValue && cell.RowIndex < RowCount)
-			{
-				if (!MultiSelect)
-				{
-					_selectedItems.Clear();
-				}
-
-				if (FullRowSelect)
-				{
-					if (toggle && _selectedItems.Any(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex))
+					if (column.Left.Value - _hBar.Value <= pixel && column.Right.Value - _hBar.Value >= pixel)
 					{
-						var items = _selectedItems
-							.Where(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex)
-							.ToList();
-
-						foreach (var item in items)
-						{
-							_selectedItems.Remove(item);
-						}
+						return column;
 					}
-					else
-					{
-						foreach (var column in _columns)
-						{
-							_selectedItems.Add(new Cell
-							{
-								RowIndex = cell.RowIndex,
-								Column = column
-							});
-						}
-					}
-				}
-				else
-				{
-					if (toggle && _selectedItems.Any(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex))
-					{
-						var item = _selectedItems
-							.FirstOrDefault(x => x.Equals(cell));
+				}
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Converts a row number to a horizontal or vertical coordinate.
+		/// </summary>
+		/// <returns>A vertical coordinate if Vertical Oriented, otherwise a horizontal coordinate.</returns>
+		private int RowsToPixels(int index)
+		{
+			if (_horizontalOrientation)
+			{
+				return (index * CellWidth) + ColumnWidth;
+			}
+
+			return (index * CellHeight) + ColumnHeight;
+		}
+
+		/// <summary>
+		/// Converts a horizontal or vertical coordinate to a row number.
+		/// </summary>
+		/// <param name="pixels">A vertical coordinate if Vertical Oriented, otherwise a horizontal coordinate.</param>
+		/// <returns>A row number between 0 and VisibleRows if it is a data row, otherwise a negative number if above all Datarows.</returns>
+		private int PixelsToRows(int pixels)
+		{
+			// Using Math.Floor and float because integer division rounds towards 0 but we want to round down.
+			if (_horizontalOrientation)
+			{
+				return (int)Math.Floor((float)(pixels - ColumnWidth) / CellWidth);
+			}
+			return (int)Math.Floor((float)(pixels - ColumnHeight) / CellHeight);
+		}
+
+		private int GetHColHeight(int index) =>
+			_horizontalColumnHeights != null && index < _horizontalColumnHeights.Length ? _horizontalColumnHeights[index] : CellHeight;
+
+		private int GetHColTop(int index) =>
+			_horizontalColumnTops != null && index < _horizontalColumnTops.Length ? _horizontalColumnTops[index] : (index * CellHeight);
 
-						if (item != null)
-						{
-							_selectedItems.Remove(item);
-						}
-					}
-					else
-					{
-						_selectedItems.Add(CurrentCell);
-					}
-				}
-			}
-		}
-
-		private bool IsHoveringOnColumnCell => CurrentCell?.Column != null && !CurrentCell.RowIndex.HasValue;
-
-		private bool IsHoveringOnDataCell => CurrentCell?.Column != null && CurrentCell.RowIndex.HasValue;
-
-		private bool WasHoveringOnColumnCell => LastCell?.Column != null && !LastCell.RowIndex.HasValue;
-
-		private bool WasHoveringOnDataCell => LastCell?.Column != null && LastCell.RowIndex.HasValue;
-
-		/// <summary>
-		/// Finds the specific cell that contains the (x, y) coordinate.
-		/// </summary>
-		/// <remarks>The row number that it returns will be between 0 and VisibleRows, NOT the absolute row number.</remarks>
-		/// <param name="x">X coordinate point.</param>
-		/// <param name="y">Y coordinate point.</param>
-		/// <returns>The cell with row number and RollColumn reference, both of which can be null. </returns>
-		private Cell CalculatePointedCell(int x, int y)
-		{
-			var newCell = new Cell();
-			var columns = _columns.VisibleColumns.ToList();
-
-			// If pointing to a column header
-			if (columns.Any())
-			{
-				if (HorizontalOrientation)
-				{
-					newCell.RowIndex = PixelsToRows(x);
-
-					if (CellHeight == 0) CellHeight++;
-
-					int colIndex = (y + _vBar.Value) / CellHeight;
-					if (colIndex >= 0 && colIndex < columns.Count)
-					{
-						newCell.Column = columns[colIndex];
-					}
-				}
-				else
-				{
-					newCell.RowIndex = PixelsToRows(y);
-					newCell.Column = ColumnAtX(x);
-				}
-			}
-
-			if (!(IsPaintDown || RightButtonHeld) && newCell.RowIndex <= -1) // -2 if we're entering from the top
-			{
-				newCell.RowIndex = null;
-			}
-
-			return newCell;
-		}
-
-		// A boolean that indicates if the InputRoll is too large vertically and requires a vertical scrollbar.
-		private bool NeedsVScrollbar { get; set; }
-
-		// A boolean that indicates if the InputRoll is too large horizontally and requires a horizontal scrollbar.
-		private bool NeedsHScrollbar { get; set; }
-
-		/// <summary>
-		/// Updates the width of the supplied column.
-		/// <remarks>Call when changing the ColumnCell text, CellPadding, or text font.</remarks>
-		/// </summary>
-		/// <param name="col">The RollColumn object to update.</param>
-		/// <returns>The new width of the RollColumn object.</returns>
-		private int UpdateWidth(RollColumn col)
-		{
-			switch (Renderer)
-			{
-				case RollRenderer.GDI:
-					col.Width = (col.Text.Length * _charSize.Width) + (CellWidthPadding * 4);
-					break;
-				case RollRenderer.GDIPlus:
-					col.Width = (int)Math.Round((col.Text.Length * _charSizeF.Width) + (CellWidthPadding * 4));
-					break;
-			}
-			return col.Width.Value;
-		}
-
-		/// <summary>
-		/// Gets the total width of all the columns by using the last column's Right property.
-		/// </summary>
-		/// <returns>A nullable Int representing total width.</returns>
-		private int? TotalColWidth
-		{
-			get
-			{
-				if (_columns.VisibleColumns.Any())
-				{
-					return _columns.VisibleColumns.Last().Right;
-				}
-
-				return null;
-			}
-		}
-
-		/// <summary>
-		/// Returns the RollColumn object at the specified visible x coordinate. Coordinate should be between 0 and Width of the InputRoll Control.
-		/// </summary>
-		/// <param name="x">The x coordinate.</param>
-		/// <returns>RollColumn object that contains the x coordinate or null if none exists.</returns>
-		private RollColumn ColumnAtX(int x)
-		{
-			foreach (RollColumn column in _columns.VisibleColumns)
-			{
-				if (column.Left.Value - _hBar.Value <= x && column.Right.Value - _hBar.Value >= x)
-				{
-					return column;
-				}
-			}
-
-			return null;
-		}
-
-		/// <summary>
-		/// Converts a row number to a horizontal or vertical coordinate.
-		/// </summary>
-		/// <returns>A vertical coordinate if Vertical Oriented, otherwise a horizontal coordinate.</returns>
-		private int RowsToPixels(int index)
-		{
-			if (_horizontalOrientation)
-			{
-				return (index * CellWidth) + ColumnWidth;
-			}
-
-			return (index * CellHeight) + ColumnHeight;
-		}
-
-		/// <summary>
-		/// Converts a horizontal or vertical coordinate to a row number.
-		/// </summary>
-		/// <param name="pixels">A vertical coordinate if Vertical Oriented, otherwise a horizontal coordinate.</param>
-		/// <returns>A row number between 0 and VisibleRows if it is a Datarow, otherwise a negative number if above all Datarows.</returns>
-		private int PixelsToRows(int pixels)
-		{
-			// Using Math.Floor and float because integer division rounds towards 0 but we want to round down.
-			if (_horizontalOrientation)
-			{
-				return (int)Math.Floor((float)(pixels - ColumnWidth) / CellWidth);
-			}
-			if (CellHeight == 0) CellHeight++;
-			return (int)Math.Floor((float)(pixels - ColumnHeight) / CellHeight);
-		}
+		private int GetHColBottom(int index) =>
+			GetHColTop(index) + GetHColHeight(index);
 
 		// The width of the largest column cell in Horizontal Orientation
-
-		private int ColumnWidth { get; set; }
-
-		// The height of a column cell in Vertical Orientation.
-		private int ColumnHeight { get; set; }
-
-		// The width of a cell in Horizontal Orientation. Only can be changed by changing the Font or CellPadding.
-		private int CellWidth { get; set; }
-
-		[Browsable(false)]
-		public int RowHeight => CellHeight;
-
-		/// <summary>
-		/// Gets or sets a value indicating the height of a cell in Vertical Orientation. Only can be changed by changing the Font or CellPadding.
-		/// </summary>
-		private int CellHeight { get; set; }
-
-		/// <summary>
-		/// Call when _charSize, MaxCharactersInHorizontal, or CellPadding is changed.
-		/// </summary>
-		private void UpdateCellSize()
-		{
-			switch (Renderer)
-			{
-				case RollRenderer.GDI:
-					CellHeight = _charSize.Height + (CellHeightPadding * 2);
-					CellWidth = (_charSize.Width * MaxCharactersInHorizontal) + (CellWidthPadding * 4); // Double the padding for horizontal because it looks better
-					break;
-				case RollRenderer.GDIPlus:
-					CellHeight = (int)Math.Round(_charSizeF.Height + (CellHeightPadding * 2) + 1);	// needed for GDI+ to match GDI cell height
-					CellWidth = (int)Math.Round((_charSizeF.Width * MaxCharactersInHorizontal) + (CellWidthPadding * 4)); // Double the padding for horizontal because it looks better
-					break;
-			}
-		}
-
-		// SuuperW: Count lag frames between FirstDisplayed and given display position
-		private int CountLagFramesDisplay(int relativeIndex)
-		{
-			if (QueryFrameLag != null && LagFramesToHide != 0)
-			{
-				int count = 0;
-				for (int i = 0; i <= relativeIndex; i++)
-				{
-					count += _lagFrames[i];
-				}
-
-				return count;
-			}
-
-			return 0;
-		}
-
-		// Count lag frames between FirstDisplayed and given relative frame index
-		private int CountLagFramesAbsolute(int relativeIndex)
-		{
-			if (QueryFrameLag != null && LagFramesToHide != 0)
-			{
-				int count = 0;
-				for (int i = 0; i + count <= relativeIndex; i++)
-				{
-					count += _lagFrames[i];
-				}
-
-				return count;
-			}
-
-			return 0;
-		}
-
-		private void SetLagFramesArray()
-		{
-			if (QueryFrameLag != null && LagFramesToHide != 0)
-			{
-				bool showNext = false;
-
-				// First one needs to check BACKWARDS for lag frame count.
-				SetLagFramesFirst();
-				int f = _lagFrames[0];
-				if (QueryFrameLag(FirstVisibleRow + f, HideWasLagFrames))
-				{
-					showNext = true;
-				}
-
-				for (int i = 1; i <= VisibleRows; i++)
-				{
-					_lagFrames[i] = 0;
-					if (!showNext)
-					{
-						for (; _lagFrames[i] < LagFramesToHide; _lagFrames[i]++)
-						{
-							if (!QueryFrameLag(FirstVisibleRow + i + f, HideWasLagFrames))
-							{
-								break;
-							}
-
-							f++;
-						}
-					}
-					else
-					{
-						if (!QueryFrameLag(FirstVisibleRow + i + f, HideWasLagFrames))
-						{
-							showNext = false;
-						}
-					}
-
-					if (_lagFrames[i] == LagFramesToHide && QueryFrameLag(FirstVisibleRow + i + f, HideWasLagFrames))
-					{
-						showNext = true;
-					}
-				}
-			}
-			else
-			{
-				for (int i = 0; i <= VisibleRows; i++)
-				{
-					_lagFrames[i] = 0;
-				}
-			}
-		}
-		private void SetLagFramesFirst()
-		{
-			if (QueryFrameLag != null && LagFramesToHide != 0)
-			{
-				// Count how many lag frames are above displayed area.
-				int count = 0;
-				do
-				{
-					count++;
-				}
-				while (QueryFrameLag(FirstVisibleRow - count, HideWasLagFrames) && count <= LagFramesToHide);
-				count--;
-
-				// Count forward
-				int fCount = -1;
-				do
-				{
-					fCount++;
-				}
-				while (QueryFrameLag(FirstVisibleRow + fCount, HideWasLagFrames) && count + fCount < LagFramesToHide);
-				_lagFrames[0] = (byte)fCount;
-			}
-			else
-			{
-				_lagFrames[0] = 0;
-			}
-		}
-
-		// Number of displayed + hidden frames, if fps is as expected
-		private int ExpectedDisplayRange()
-		{
-			return (VisibleRows + 1) * LagFramesToHide;
-		}
-
-		#endregion
-
-		#region Classes
-
-		public class RollColumns : List<RollColumn>
-		{
-			public RollColumn this[string name]
-			{
-				get
-				{
-					return this.SingleOrDefault(column => column.Name == name);
-				}
-			}
-
-			public IEnumerable<RollColumn> VisibleColumns
-			{
-				get
-				{
-					return this.Where(c => c.Visible);
-				}
-			}
-
-			public Action ChangedCallback { get; set; }
-
-			private void DoChangeCallback()
-			{
-				// no check will make it crash for user too, not sure which way of alarm we prefer. no alarm at all will cause all sorts of subtle bugs
-				if (ChangedCallback == null)
-				{
-					System.Diagnostics.Debug.Fail($"{nameof(ColumnChangedCallback)} has died!");
-				}
-				else
-				{
-					ChangedCallback();
-				}
-			}
-
-			// TODO: this shouldn't be exposed.  But in order to not expose it, each RollColumn must have a change callback, and all property changes must call it, it is quicker and easier to just call this when needed
-			public void ColumnsChanged()
-			{
-				int pos = 0;
-
-				var columns = VisibleColumns.ToList();
-
-				for (int i = 0; i < columns.Count; i++)
-				{
-					columns[i].Left = pos;
-					pos += columns[i].Width.Value;
-					columns[i].Right = pos;
-				}
-
-				DoChangeCallback();
-			}
-
-			public new void Add(RollColumn column)
-			{
-				if (this.Any(c => c.Name == column.Name))
-				{
-					// The designer sucks, doing nothing for now
-					return;
-					//throw new InvalidOperationException("A column with this name already exists.");
-				}
-
-				base.Add(column);
-				ColumnsChanged();
-			}
-
-			public new void AddRange(IEnumerable<RollColumn> collection)
-			{
-				foreach (var column in collection)
-				{
-					if (this.Any(c => c.Name == column.Name))
-					{
-						// The designer sucks, doing nothing for now
-						return;
-
-						throw new InvalidOperationException("A column with this name already exists.");
-					}
-				}
-
-				base.AddRange(collection);
-				ColumnsChanged();
-			}
-
-			public new void Insert(int index, RollColumn column)
-			{
-				if (this.Any(c => c.Name == column.Name))
-				{
-					throw new InvalidOperationException("A column with this name already exists.");
-				}
-
-				base.Insert(index, column);
-				ColumnsChanged();
-			}
-
-			public new void InsertRange(int index, IEnumerable<RollColumn> collection)
-			{
-				foreach (var column in collection)
-				{
-					if (this.Any(c => c.Name == column.Name))
-					{
-						throw new InvalidOperationException("A column with this name already exists.");
-					}
-				}
-
-				base.InsertRange(index, collection);
-				ColumnsChanged();
-			}
-
-			public new bool Remove(RollColumn column)
-			{
-				var result = base.Remove(column);
-				ColumnsChanged();
-				return result;
-			}
-
-			public new int RemoveAll(Predicate<RollColumn> match)
-			{
-				var result = base.RemoveAll(match);
-				ColumnsChanged();
-				return result;
-			}
-
-			public new void RemoveAt(int index)
-			{
-				base.RemoveAt(index);
-				ColumnsChanged();
-			}
-
-			public new void RemoveRange(int index, int count)
-			{
-				base.RemoveRange(index, count);
-				ColumnsChanged();
-			}
-
-			public new void Clear()
-			{
-				base.Clear();
-				ColumnsChanged();
-			}
-
-			public IEnumerable<string> Groups
-			{
-				get
-				{
-					return this
-						.Select(x => x.Group)
-						.Distinct();
-				}
-			}
-		}
-
-		public class RollColumn
-		{
-			public enum InputType { Boolean, Float, Text, Image }
-
-			public string Group { get; set; }
-			public int? Width { get; set; }
-			public int? Left { get; set; }
-			public int? Right { get; set; }
-			public string Name { get; set; }
-			public string Text { get; set; }
-			public InputType Type { get; set; }
-			public bool Visible { get; set; }
-
-			/// <summary>
-			/// Column will be drawn with an emphasized look, if true
-			/// </summary>
-			private bool _emphasis;
-			public bool Emphasis
-			{
-				get { return _emphasis; }
-				set { _emphasis = value; }
-			}
-
-			public RollColumn()
-			{
-				Visible = true;
-			}
-		}
-
-		/// <summary>
-		/// Represents a single cell of the <seealso cref="InputRoll"/>
-		/// </summary>
-		public class Cell
-		{
-			public RollColumn Column { get; internal set; }
-			public int? RowIndex { get; internal set; }
-			public string CurrentText { get; internal set; }
-
-			public Cell() { }
-
-			public Cell(Cell cell)
-			{
-				Column = cell.Column;
-				RowIndex = cell.RowIndex;
-			}
-
-			public bool IsDataCell => Column != null && RowIndex.HasValue;
-
-			public override bool Equals(object obj)
-			{
-				if (obj is Cell)
-				{
-					var cell = obj as Cell;
-					return this.Column == cell.Column && this.RowIndex == cell.RowIndex;
-				}
-
-				return base.Equals(obj);
-			}
-
-			public override int GetHashCode()
-			{
-				return Column.GetHashCode() + RowIndex.GetHashCode();
-			}
-		}
-
-		private class SortCell : IComparer<Cell>
-		{
-			int IComparer<Cell>.Compare(Cell a, Cell b)
-			{
-				Cell c1 = a as Cell;
-				Cell c2 = b as Cell;
-				if (c1.RowIndex.HasValue)
-				{
-					if (c2.RowIndex.HasValue)
-					{
-						int row = c1.RowIndex.Value.CompareTo(c2.RowIndex.Value);
-						if (row == 0)
-						{
-							return c1.Column.Name.CompareTo(c2.Column.Name);
-						}
-
-						return row;
-					}
-					
-					return 1;
-				}
-
-				if (c2.RowIndex.HasValue)
-				{
-					return -1;
-				}
-
-				return c1.Column.Name.CompareTo(c2.Column.Name);
-			}
-		}
-
-		public enum RollRenderer
-		{
-			GDI = 0,
-			GDIPlus = 1
-		}
-
-		#endregion
-	}
-}
+		private int ColumnWidth { get; set; }
+
+		// The height of a column cell in Vertical Orientation.
+		private int ColumnHeight { get; set; }
+
+		// The width of a cell in Horizontal Orientation. Only can be changed by changing the Font or CellPadding.
+		private int CellWidth { get; set; }
+
+		[Browsable(false)]
+		public int RowHeight => CellHeight;
+
+		/// <summary>
+		/// Gets or sets a value indicating the height of a cell in Vertical Orientation. Only can be changed by changing the Font or CellPadding.
+		/// </summary>
+		private int CellHeight { get; set; } = 8;
+
+		/// <summary>
+		/// Call when _charSize, MaxCharactersInHorizontal, or CellPadding is changed.
+		/// </summary>
+		private void UpdateCellSize()
+		{
+			CellHeight = _charSize.Height + (CellHeightPadding * 2);
+			CellWidth = (_charSize.Width * MaxCharactersInHorizontal) + (CellWidthPadding * 4); // Double the padding for horizontal because it looks better
+		}
+
+		// SuuperW: Count lag frames between FirstDisplayed and given display position
+		private int CountLagFramesDisplay(int relativeIndex)
+		{
+			if (QueryFrameLag != null && LagFramesToHide != 0)
+			{
+				int count = 0;
+				for (int i = 0; i <= relativeIndex; i++)
+				{
+					count += _lagFrames[i];
+				}
+
+				return count;
+			}
+
+			return 0;
+		}
+
+		// Count lag frames between FirstDisplayed and given relative frame index
+		private int CountLagFramesAbsolute(int relativeIndex)
+		{
+			if (QueryFrameLag != null && LagFramesToHide != 0)
+			{
+				int count = 0;
+				for (int i = 0; i + count <= relativeIndex; i++)
+				{
+					count += _lagFrames[i];
+				}
+
+				return count;
+			}
+
+			return 0;
+		}
+
+		private void SetLagFramesArray()
+		{
+			if (QueryFrameLag != null && LagFramesToHide != 0)
+			{
+				bool showNext = false;
+
+				// First one needs to check BACKWARDS for lag frame count.
+				SetLagFramesFirst();
+				int f = _lagFrames[0];
+				if (QueryFrameLag(FirstVisibleRow + f, HideWasLagFrames))
+				{
+					showNext = true;
+				}
+
+				for (int i = 1; i <= VisibleRows; i++)
+				{
+					_lagFrames[i] = 0;
+					if (!showNext)
+					{
+						for (; _lagFrames[i] < LagFramesToHide; _lagFrames[i]++)
+						{
+							if (!QueryFrameLag(FirstVisibleRow + i + f, HideWasLagFrames))
+							{
+								break;
+							}
+
+							f++;
+						}
+					}
+					else
+					{
+						if (!QueryFrameLag(FirstVisibleRow + i + f, HideWasLagFrames))
+						{
+							showNext = false;
+						}
+					}
+
+					if (_lagFrames[i] == LagFramesToHide && QueryFrameLag(FirstVisibleRow + i + f, HideWasLagFrames))
+					{
+						showNext = true;
+					}
+				}
+			}
+			else
+			{
+				for (int i = 0; i <= VisibleRows; i++)
+				{
+					_lagFrames[i] = 0;
+				}
+			}
+		}
+		private void SetLagFramesFirst()
+		{
+			if (QueryFrameLag != null && LagFramesToHide != 0)
+			{
+				// Count how many lag frames are above displayed area.
+				int count = 0;
+				do
+				{
+					count++;
+				}
+				while (QueryFrameLag(FirstVisibleRow - count, HideWasLagFrames) && count <= LagFramesToHide);
+				count--;
+
+				// Count forward
+				int fCount = -1;
+				do
+				{
+					fCount++;
+				}
+				while (QueryFrameLag(FirstVisibleRow + fCount, HideWasLagFrames) && count + fCount < LagFramesToHide);
+				_lagFrames[0] = (byte)fCount;
+			}
+			else
+			{
+				_lagFrames[0] = 0;
+			}
+		}
+
+		// Number of displayed + hidden frames, if fps is as expected
+		private int ExpectedDisplayRange()
+		{
+			return (VisibleRows + 1) * LagFramesToHide;
+		}
+
+		#endregion
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs
new file mode 100644
index 0000000000..0999e9ebe6
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumn.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public class RollColumn
+	{
+		public string Group { get; set; }
+		public int? Width { get; set; }
+		public int? Left { get; set; }
+		public int? Right { get; set; }
+		public string Name { get; set; }
+		public string Text { get; set; }
+		public ColumnType Type { get; set; }
+		public bool Visible { get; set; } = true;
+
+		/// <summary>
+		/// Column will be drawn with an emphasized look, if true
+		/// </summary>
+		public bool Emphasis { get; set; }
+
+		/// <summary>
+		/// Column header text will be drawn rotated, if true
+		/// </summary>
+		public bool Rotatable { get; set; }
+
+		/// <summary>
+		/// If drawn rotated, specifies the desired height, or null to auto-size
+		/// </summary>
+		public int? RotatedHeight { get; set; }
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumns.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumns.cs
new file mode 100644
index 0000000000..96ee91ea59
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/RollColumns.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public class RollColumns : List<RollColumn>
+	{
+		public RollColumn this[string name] => this.SingleOrDefault(column => column.Name == name);
+
+		public IEnumerable<RollColumn> VisibleColumns => this.Where(c => c.Visible);
+
+		public Action ChangedCallback { get; set; }
+
+		// TODO: this shouldn't be exposed.  But in order to not expose it, each RollColumn must have a change callback, and all property changes must call it, it is quicker and easier to just call this when needed
+		public void ColumnsChanged()
+		{
+			int pos = 0;
+
+			foreach (var col in VisibleColumns)
+			{
+				col.Left = pos;
+				pos += col.Width ?? 0;
+				col.Right = pos;
+			}
+
+			ChangedCallback?.Invoke();
+		}
+
+		public new void Add(RollColumn column)
+		{
+			if (this.Any(c => c.Name == column.Name))
+			{
+				// The designer sucks, doing nothing for now
+				return;
+				//throw new InvalidOperationException("A column with this name already exists.");
+			}
+
+			base.Add(column);
+			ColumnsChanged();
+		}
+
+		public new void AddRange(IEnumerable<RollColumn> collection)
+		{
+			var items = collection.ToList();
+			foreach (var column in items)
+			{
+				if (this.Any(c => c.Name == column.Name))
+				{
+					// The designer sucks, doing nothing for now
+					return;
+
+					throw new InvalidOperationException("A column with this name already exists.");
+				}
+			}
+
+			base.AddRange(items);
+			ColumnsChanged();
+		}
+
+		public new void Insert(int index, RollColumn column)
+		{
+			if (this.Any(c => c.Name == column.Name))
+			{
+				// The designer sucks, doing nothing for now
+				return;
+
+				throw new InvalidOperationException("A column with this name already exists.");
+			}
+
+			base.Insert(index, column);
+			ColumnsChanged();
+		}
+
+		public new void InsertRange(int index, IEnumerable<RollColumn> collection)
+		{
+			var items = collection.ToList();
+			foreach (var column in items)
+			{
+				if (this.Any(c => c.Name == column.Name))
+				{
+					throw new InvalidOperationException("A column with this name already exists.");
+				}
+			}
+
+			base.InsertRange(index, items);
+			ColumnsChanged();
+		}
+
+		public new bool Remove(RollColumn column)
+		{
+			var result = base.Remove(column);
+			ColumnsChanged();
+			return result;
+		}
+
+		public new int RemoveAll(Predicate<RollColumn> match)
+		{
+			var result = base.RemoveAll(match);
+			ColumnsChanged();
+			return result;
+		}
+
+		public new void RemoveAt(int index)
+		{
+			base.RemoveAt(index);
+			ColumnsChanged();
+		}
+
+		public new void RemoveRange(int index, int count)
+		{
+			base.RemoveRange(index, count);
+			ColumnsChanged();
+		}
+
+		public new void Clear()
+		{
+			base.Clear();
+			ColumnsChanged();
+		}
+
+		public IEnumerable<string> Groups => this
+			.Select(x => x.Group)
+			.Distinct();
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs b/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs
index 278fc0c73d..7dabe03020 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs
@@ -47,6 +47,7 @@ namespace BizHawk.Client.EmuHawk.CustomControls
 		{
 			InitializeComponent();
 
+			this.ControlBox = false; // Do not set in designer (causes problems with auto scaling)
 			this.messageLbl.Text = message;
 			this.Text = title;
 			this.m_sysIcon = icon;
@@ -58,7 +59,7 @@ namespace BizHawk.Client.EmuHawk.CustomControls
 		public void SetMessageToAutoSize()
 		{
 			this.messageLbl.AutoSize = true;
-			this.messageLbl.MaximumSize = new Size(this.MaximumSize.Width - this.m_sysIcon.Width - 25, this.MaximumSize.Height);
+			this.messageLbl.MaximumSize = new Size(this.MaximumSize.Width - this.m_sysIcon.Width - UIHelper.ScaleX(25), this.MaximumSize.Height);
 		}
 
 		/// <summary>
@@ -220,11 +221,11 @@ namespace BizHawk.Client.EmuHawk.CustomControls
 
 		}
 
-		const int FORM_Y_MARGIN = 10;
-		const int FORM_X_MARGIN = 16;
-		const int BUTTON_SPACE = 5;
-		const int CHECKBOX_SPACE = 15;
-		const int TEXT_Y_MARGIN = 30;
+		private static readonly int FORM_Y_MARGIN = UIHelper.ScaleY(10);
+		private static readonly int FORM_X_MARGIN = UIHelper.ScaleX(16);
+		private static readonly int BUTTON_SPACE = UIHelper.ScaleX(5);
+		private static readonly int CHECKBOX_SPACE = UIHelper.ScaleX(15);
+		private static readonly int TEXT_Y_MARGIN = UIHelper.ScaleY(30);
 
 		/// <summary>
 		/// Auto fits the dialog box to fit the text and the buttons.
diff --git a/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs b/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs
index 3c58b8066b..ccdd5ea1dd 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/MsgBox.designer.cs
@@ -105,7 +105,6 @@
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.btn1;
 			this.ClientSize = new System.Drawing.Size(485, 149);
-			this.ControlBox = false;
 			this.Controls.Add(this.btn3);
 			this.Controls.Add(this.chkBx);
 			this.Controls.Add(this.btn1);
diff --git a/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs b/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
deleted file mode 100644
index 2fd17e6f68..0000000000
--- a/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using System;
-using System.Linq;
-using System.Windows.Forms;
-
-namespace BizHawk.Client.EmuHawk
-{
-	public class TasListView : VirtualListView
-	{
-		public class Cell
-		{
-			public int? RowIndex;
-			public string Column;
-
-			// Convenience hack
-			public override string ToString()
-			{
-				return string.IsNullOrEmpty(Column) ? "?" : $"{Column} - {(RowIndex.HasValue ? RowIndex.ToString() : "?")}";
-			}
-		}
-
-		public bool RightButtonHeld { get; set; }
-
-		public int? LastSelectedIndex
-		{
-			get
-			{
-				if (SelectedIndices.Count > 0)
-				{
-					return SelectedIndices
-						.OfType<int>()
-						.OrderBy(x => x)
-						.Last();
-				}
-
-				return null;
-			}
-		}
-
-		private Cell _currentPointedCell = new Cell();
-		public Cell CurrentCell
-		{
-			get { return _currentPointedCell; }
-		}
-
-		private Cell _lastPointedCell = new Cell();
-		public Cell LastCell
-		{
-			get { return _lastPointedCell; }
-		}
-
-		public bool InputPaintingMode { get; set; }
-		public bool IsPaintDown { get; private set; }
-
-		/// <summary>
-		/// Calculates the column name and row number that the point (x, y) lies in.
-		/// </summary>
-		/// <param name="x">X coordinate</param>
-		/// <param name="y">Y coordinate</param>
-		private void CalculatePointedCell(int x, int y)
-		{
-			int? newRow;
-			string newColumn = "";
-
-			var accumulator = 0;
-			foreach (ColumnHeader column in Columns)
-			{
-				accumulator += column.Width;
-				if (accumulator < x)
-				{
-					continue;
-				}
-
-				newColumn = column.Name;
-				break;
-			}
-
-			var rowHeight = this.LineHeight;// 5 (in VirtualListView) and 6 work here for me, but are they always dependable, how can I get the padding?
-			var headerHeight = rowHeight + 6;
-
-			newRow = ((y - headerHeight) / rowHeight) + this.VScrollPos;
-			if (newRow >= ItemCount)
-			{
-				newRow = null;
-			}
-
-			if (newColumn != CurrentCell.Column || newRow != CurrentCell.RowIndex)
-			{
-				LastCell.Column = CurrentCell.Column;
-				LastCell.RowIndex = CurrentCell.RowIndex;
-
-				CurrentCell.Column = newColumn;
-				CurrentCell.RowIndex = newRow;
-
-				CellChanged(LastCell, CurrentCell);
-			}
-		}
-
-		public class CellEventArgs
-		{
-			public CellEventArgs(Cell oldCell, Cell newCell)
-			{
-				OldCell = oldCell;
-				NewCell = newCell;
-			}
-
-			public Cell OldCell { get; private set; }
-			public Cell NewCell { get; private set; }
-		}
-
-		public delegate void CellChangeEventHandler(object sender, CellEventArgs e);
-		public event CellChangeEventHandler PointedCellChanged;
-
-		private void CellChanged(Cell oldCell, Cell newCell)
-		{
-			if (PointedCellChanged != null)
-			{
-				PointedCellChanged(this, new CellEventArgs(oldCell, newCell));
-			}
-		}
-
-		protected override void OnMouseLeave(EventArgs e)
-		{
-			_currentPointedCell.Column = "";
-			_currentPointedCell.RowIndex = null;
-			IsPaintDown = false;
-			base.OnMouseLeave(e);
-		}
-
-		protected override void OnMouseMove(MouseEventArgs e)
-		{
-			CalculatePointedCell(e.X, e.Y);
-			base.OnMouseMove(e);
-		}
-
-		protected override void OnMouseDown(MouseEventArgs e)
-		{
-			if (e.Button == MouseButtons.Left && InputPaintingMode)
-			{
-				IsPaintDown = true;
-			}
-
-			if (e.Button == MouseButtons.Right)
-			{
-				RightButtonHeld = true;
-			}
-
-			base.OnMouseDown(e);
-		}
-
-		protected override void OnMouseUp(MouseEventArgs e)
-		{
-			IsPaintDown = false;
-			RightButtonHeld = false;
-
-			base.OnMouseUp(e);
-		}
-
-		protected override void OnMouseWheel(MouseEventArgs e)
-		{
-			if (RightButtonHeld)
-			{
-				DoRightMouseScroll(this, e);
-			}
-			else
-			{
-				base.OnMouseWheel(e);
-			}
-		}
-
-		public delegate void RightMouseScrollEventHandler(object sender, MouseEventArgs e);
-		public event RightMouseScrollEventHandler RightMouseScrolled;
-
-		private void DoRightMouseScroll(object sender, MouseEventArgs e)
-		{
-			if (RightMouseScrolled != null)
-			{
-				RightMouseScrolled(sender, e);
-			}
-		}
-	}
-}
diff --git a/BizHawk.Client.EmuHawk/CustomControls/TasListView.resx b/BizHawk.Client.EmuHawk/CustomControls/TasListView.resx
deleted file mode 100644
index 43b04417e2..0000000000
--- a/BizHawk.Client.EmuHawk/CustomControls/TasListView.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="RightClickMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs b/BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
deleted file mode 100644
index 6f800dc407..0000000000
--- a/BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
+++ /dev/null
@@ -1,854 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Drawing;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-
-namespace BizHawk.Client.EmuHawk
-{
-	#region win32interop
-
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct LvDispInfo 
-	{
-		public NmHdr Hdr;
-		public LvItem Item;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct NmHdr 
-	{
-		public IntPtr HwndFrom;
-		public IntPtr IdFrom;
-		public int Code;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct NmItemActivate 
-	{
-		public NmHdr Hdr;
-		public int Item;
-		public int SubItem;
-		public uint NewState;
-		public uint OldState;
-		public uint uChanged;
-		public POINT Action;
-		public uint lParam;
-		public uint KeyFlags;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct RECT
-	{
-		public int Top;
-		public int Left;
-		public int Bottom;
-		public int Right;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct NmCustomDrawInfo 
-	{
-		public NmHdr Hdr;
-		public uint dwDrawStage;
-		public IntPtr Hdc;
-		public RECT Rect;
-		public IntPtr dwItemSpec;
-		public uint ItemState;
-		private int _pad64bits;
-		public IntPtr lItemlParam;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct NmLvCustomDraw 
-	{
-		public NmCustomDrawInfo Nmcd;
-		public int ClearText;
-		public int ClearTextBackground;
-		public int SubItem;
-	}
-
-
-
-	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-	internal struct LvItem 
-	{
-		public uint Mask;
-		public int Item;
-		public int SubItem;
-		public uint State;
-		public uint StateMask;
-		public IntPtr PszText;
-		public int cchTextMax;
-		public int Image;
-		public IntPtr lParam;
-		public int Indent;
-	}
-
-	[FlagsAttribute]
-	internal enum CustomDrawReturnFlags 
-	{
-		CDRF_DODEFAULT = 0x00000000,
-		CDRF_NEWFONT = 0x00000002,
-		CDRF_SKIPDEFAULT = 0x00000004,
-		CDRF_NOTIFYPOSTPAINT = 0x00000010,
-		CDRF_NOTIFYITEMDRAW = 0x00000020,
-		CDRF_NOTIFYSUBITEMDRAW = 0x00000020,
-		CDRF_NOTIFYPOSTERASE = 0x00000040,
-	}
-
-	[FlagsAttribute]
-	internal enum CustomDrawDrawStageFlags 
-	{
-		CDDS_PREPAINT = 0x00000001,
-		CDDS_POSTPAINT = 0x00000002,
-		CDDS_PREERASE = 0x00000003,
-		CDDS_POSTERASE = 0x00000004,
-
-		// the 0x000010000 bit means it's individual item specific
-		CDDS_ITEM = 0x00010000,
-		CDDS_ITEMPREPAINT = (CDDS_ITEM | CDDS_PREPAINT),
-		CDDS_ITEMPOSTPAINT = (CDDS_ITEM | CDDS_POSTPAINT),
-		CDDS_ITEMPREERASE = (CDDS_ITEM | CDDS_PREERASE),
-		CDDS_ITEMPOSTERASE = (CDDS_ITEM | CDDS_POSTERASE),
-		CDDS_SUBITEM = 0x00020000,
-		CDDS_SUBITEMPREPAINT = (CDDS_SUBITEM | CDDS_ITEMPREPAINT),
-		CDDS_SUBITEMPOSTPAINT = (CDDS_SUBITEM | CDDS_ITEMPOSTPAINT),
-		CDDS_SUBITEMPREERASE = (CDDS_SUBITEM | CDDS_ITEMPREERASE),
-		CDDS_SUBITEMPOSTERASE = (CDDS_SUBITEM | CDDS_ITEMPOSTERASE),
-	}
-
-	[FlagsAttribute]
-	internal enum LvHitTestFlags 
-	{
-		LVHT_NOWHERE = 0x0001,
-		LVHT_ONITEMICON = 0x0002,
-		LVHT_ONITEMLABEL = 0x0004,
-		LVHT_ONITEMSTATEICON = 0x0008,
-		LVHT_ONITEM = (LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON),
-
-		LVHT_ABOVE = 0x0008,
-		LVHT_BELOW = 0x0010,
-		LVHT_TORIGHT = 0x0020,
-		LVHT_TOLEFT = 0x0040
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct POINT 
-	{
-		public int X;
-		public int Y;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	internal class LvHitTestInfo 
-	{
-		public POINT Point;
-		public uint Flags;
-		public int Item;
-		public int SubItem;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct NMLISTVIEW 
-	{
-		public NmHdr hdr;
-		public int iItem;
-		public int iSubItem;
-		public uint uNewState;
-		public uint uOldState;
-		public uint uChanged;
-		public POINT ptAction;
-		public IntPtr lParam;
-	}
-
-
-	internal enum ListViewItemMask : short 
-	{
-		LVIF_TEXT = 0x0001,
-		LVIF_IMAGE = 0x0002,
-		LVIF_PARAM = 0x0004,
-		LVIF_STATE = 0x0008,
-
-		LVIF_INDENT = 0x0010,
-		LVIF_NORECOMPUTE = 0x0800,
-		LVIF_GROUPID = 0x0100,
-		LVIF_COLUMNS = 0x0200
-	}
-
-	internal enum LvNi 
-	{
-		ALL = 0x0000,
-		FOCUSED = 0x0001,
-		SELECTED = 0x0002,
-		CUT = 0x0004,
-		DROPHILITED = 0x0008,
-
-		ABOVE = 0x0100,
-		BELOW = 0x0200,
-		TOLEFT = 0x0400,
-		TORIGHT = 0x0800
-	}
-
-	internal enum ListViewMessages 
-	{
-		LVM_FIRST = 0x1000,
-		LVM_GETITEMCOUNT = (LVM_FIRST + 4),
-		LVM_SETCALLBACKMASK = (LVM_FIRST + 11),
-		LVM_GETNEXTITEM = (LVM_FIRST + 12),
-		LVM_HITTEST = (LVM_FIRST + 18),
-		LVM_ENSUREVISIBLE = (LVM_FIRST + 19),
-		LVM_SETITEMSTATE = (LVM_FIRST + 43),
-		LVM_GETITEMSTATE = (LVM_FIRST + 44),
-		LVM_SETITEMCOUNT = (LVM_FIRST + 47),
-		LVM_GETSUBITEMRECT = (LVM_FIRST + 56)
-	}
-
-	internal enum ListViewStyles : short 
-	{
-		LVS_OWNERDATA = 0x1000,
-		LVS_SORTASCENDING = 0x0010,
-		LVS_SORTDESCENDING = 0x0020,
-		LVS_SHAREIMAGELISTS = 0x0040,
-		LVS_NOLABELWRAP = 0x0080,
-		LVS_AUTOARRANGE = 0x0100
-	}
-
-	internal enum ListViewStylesICF : uint 
-	{
-		LVSICF_NOINVALIDATEALL = 0x00000001,
-		LVSICF_NOSCROLL = 0x00000002
-	}
-
-	internal enum WindowsMessage : uint 
-	{
-		WM_ERASEBKGND = 0x0014,
-		WM_SCROLL = 0x115,
-		WM_LBUTTONDOWN = 0x0201,
-		WM_LBUTTONUP = 0x0202,
-		WM_LBUTTONDBLCLK = 0x0203,
-		WM_RBUTTONDOWN = 0x0204,
-		WM_RBUTTONUP = 0x0205,
-		WM_RBUTTONDBLCLK = 0x0206,
-		WM_SETFOCUS = 0x0007,
-		WM_NOTIFY = 0x004E,
-		WM_USER = 0x0400,
-		WM_REFLECT = WM_USER + 0x1c00
-	}
-
-	internal enum Notices
-	{
-		NM_FIRST = 0,
-		NM_CUSTOMDRAW = NM_FIRST - 12,
-		NM_CLICK = NM_FIRST - 2,
-		NM_DBLCLICK = NM_FIRST - 3,
-	}
-
-	internal enum ListViewNotices
-	{
-		LVN_FIRST = (0 - 100),
-		LVN_LAST = (0 - 199),
-		LVN_BEGINDRAG = LVN_FIRST - 9,
-		LVN_BEGINRDRAG = LVN_FIRST - 11,
-		LVN_GETDISPINFOA = LVN_FIRST - 50,
-		LVN_GETDISPINFOW = LVN_FIRST - 77,
-		LVN_SETDISPINFOA = LVN_FIRST - 51,
-		LVN_SETDISPINFOW = LVN_FIRST - 78,
-		LVN_ODCACHEHINT = LVN_FIRST - 13,
-		LVN_ODFINDITEMW = LVN_FIRST - 79
-	}
-
-	[Flags]
-	internal enum ListViewCallBackMask : uint 
-	{
-		LVIS_FOCUSED = 0x0001,
-		LVIS_SELECTED = 0x0002,
-		LVIS_CUT = 0x0004,
-		LVIS_DROPHILITED = 0x0008,
-		LVIS_GLOW = 0x0010,
-		LVIS_ACTIVATING = 0x0020,
-
-		LVIS_OVERLAYMASK = 0x0F00,
-		LVIS_STATEIMAGEMASK = 0xF000,
-	}
-
-	#endregion
-
-	#region VirtualListView Delegates
-
-	/// <summary>
-	/// Retrieve the background color for a Listview cell (item and subitem).
-	/// </summary>
-	/// <param name="item">Listview item (row).</param>
-	/// <param name="subItem">Listview subitem (column).</param>
-	/// <param name="color">Background color to use</param>
-	public delegate void QueryItemBkColorHandler(int item, int subItem, ref Color color);
-
-	/// <summary>
-	/// Retrieve the text for a Listview cell (item and subitem).
-	/// </summary>
-	/// <param name="item">Listview item (row).</param>
-	/// <param name="subItem">Listview subitem (column).</param>
-	/// <param name="text">Text to display.</param>
-	public delegate void QueryItemTextHandler(int item, int subItem, out string text);
-
-	/// <summary>
-	/// Retrieve the image index for a Listview item.
-	/// </summary>
-	/// <param name="item">Listview item (row).</param>
-	/// <param name="subItem">Listview subitem (column) - should always be zero.</param>
-	/// <param name="imageIndex">Index of associated ImageList.</param>
-	public delegate void QueryItemImageHandler(int item, int subItem, out int imageIndex);
-
-	/// <summary>
-	/// Retrieve the indent for a Listview item.  The indent is always width of an image.
-	/// For example, 1 indents the Listview item one image width.
-	/// </summary>
-	/// <param name="item">Listview item (row).</param>
-	/// <param name="itemIndent">The amount to indent the Listview item.</param>
-	public delegate void QueryItemIndentHandler(int item, out int itemIndent);
-
-	public delegate void QueryItemHandler(int idx, out ListViewItem item);
-
-	#endregion
-
-	/// <summary>
-	/// VirtualListView is a virtual Listview which allows for a large number of items(rows)
-	/// to be displayed.  The virtual Listview contains very little actual information -
-	/// mainly item selection and focus information.
-	/// </summary>
-	public class VirtualListView : ListView 
-	{
-		// store the item count to prevent the call to SendMessage(LVM_GETITEMCOUNT)
-		private int _itemCount;
-
-		#region Display query callbacks
-
-		/// <summary>
-		/// Fire the QueryItemBkColor event which requests the background color for the passed Listview cell
-		/// </summary>
-		public event QueryItemBkColorHandler QueryItemBkColor;
-
-		/// <summary>
-		/// Fire the QueryItemText event which requests the text for the passed Listview cell.
-		/// </summary>
-		[Category("Data")]
-		public event QueryItemTextHandler QueryItemText;
-		
-		/// <summary>
-		/// Fire the QueryItemImage event which requests the ImageIndex for the passed Listview item.
-		/// </summary>
-		[Category("Data")]
-		public event QueryItemImageHandler QueryItemImage;
-		
-		/// <summary>
-		/// Fire the QueryItemIndent event which requests the indent for the passed Listview item.
-		/// </summary>
-		[Category("Data")]
-		public event QueryItemIndentHandler QueryItemIndent;
-		
-		[Category("Data")]
-		public event QueryItemHandler QueryItem;
-
-		#endregion
-
-		#region Properties
-
-		/// <summary>
-		/// Gets or sets the sets the virtual number of items to be displayed.
-		/// </summary>
-		[Category("Behavior")]
-		public int ItemCount 
-		{
-			get 
-			{
-				return _itemCount;
-			}
-
-			set 
-			{
-				_itemCount = value;
-
-				// If the virtual item count is set before the handle is created
-				// then the image lists don't get loaded properly
-				if (!IsHandleCreated)
-				{
-					return;
-				}
-
-				SetVirtualItemCount();
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets how list items are to be displayed.
-		/// Hide the ListView.View property.
-		/// Virtual Listviews only allow Details or List.
-		/// </summary>
-		public new View View 
-		{
-			get 
-			{
-				return base.View;
-			}
-
-			set 
-			{
-				if (value == View.LargeIcon ||
-					value == View.SmallIcon) 
-				{
-					throw new ArgumentException($"Icon views are invalid for virtual {nameof(ListView)}s", nameof(View));
-				}
-
-				base.View = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets the required creation parameters when the control handle is created.
-		/// Use LVS_OWNERDATA to set this as a virtual Listview.
-		/// </summary>
-		protected override CreateParams CreateParams 
-		{
-			get 
-			{
-				var cp = base.CreateParams;
-				
-				// LVS_OWNERDATA style must be set when the control is created
-				cp.Style |= (int)ListViewStyles.LVS_OWNERDATA;
-				return cp;
-			}
-		}
-
-		#endregion
-
-		[Browsable(false)]
-		[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
-		public int LineHeight { get; private set; }
-
-		[Browsable(false)]
-		[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
-		public int NumberOfVisibleRows
-		{
-			get
-			{
-				return Height / LineHeight;
-			}
-		}
-
-		#region Constructors
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="VirtualListView"/> class. 
-		/// Create a new instance of this control.
-		/// </summary>
-		public VirtualListView() 
-		{
-			// virtual listviews must be Details or List view with no sorting
-			View = View.Details;
-			Sorting = SortOrder.None;
-
-			UseCustomBackground = true;
-
-			ptrlvhti = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(LvHitTestInfo)));
-
-			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
-			SetStyle(ControlStyles.Opaque, true);
-			SetStyle(ControlStyles.AllPaintingInWmPaint, true);
-
-			LineHeight = this.Font.Height + 5;
-		}
-
-		~VirtualListView() 
-		{
-			Marshal.FreeHGlobal(ptrlvhti);
-		}
-
-		#endregion
-
-		#region Methods
-		/// <summary>
-		/// Set the state of the passed Listview item's index.
-		/// </summary>
-		/// <param name="index">Listview item's index.</param>
-		/// <param name="selected">Select the passed item?</param>
-		public void SelectItem(int index, bool selected) 
-		{
-			var ptrItem = IntPtr.Zero;
-
-			try 
-			{
-				// Determine whether selecting or unselecting.
-				uint select = selected ? (uint)ListViewCallBackMask.LVIS_SELECTED : 0;
-
-				// Fill in the LVITEM structure with state fields.
-				var stateItem = new LvItem
-				{
-					Mask = (uint)ListViewItemMask.LVIF_STATE,
-					Item = index,
-					SubItem = 0,
-					State = @select,
-					StateMask = (uint)ListViewCallBackMask.LVIS_SELECTED
-				};
-
-				// Copy the structure to unmanaged memory.
-				ptrItem = Marshal.AllocHGlobal(Marshal.SizeOf(stateItem.GetType()));
-				Marshal.StructureToPtr(stateItem, ptrItem, true);
-
-				// Send the message to the control window.
-				Win32.SendMessage(
-					this.Handle,
-					(int)ListViewMessages.LVM_SETITEMSTATE,
-					(IntPtr)index,
-					ptrItem);
-			} 
-			catch (Exception ex) 
-			{
-				System.Diagnostics.Trace.WriteLine($"VirtualListView.SetItemState error={ex.Message}");
-				
-				// TODO: should this eat any exceptions?
-				throw;
-			} 
-			finally 
-			{
-				// Always release the unmanaged memory.
-				if (ptrItem != IntPtr.Zero) 
-				{
-					Marshal.FreeHGlobal(ptrItem);
-				}
-			}
-		}
-
-		private void SetVirtualItemCount() 
-		{
-			Win32.SendMessage(
-				this.Handle,
-				(int)ListViewMessages.LVM_SETITEMCOUNT,
-				(IntPtr)this._itemCount,
-				IntPtr.Zero);
-		}
-
-		protected void OnDispInfoNotice(ref Message m, bool useAnsi)
-		{
-			var info = (LvDispInfo)m.GetLParam(typeof(LvDispInfo));
-
-			if ((info.Item.Mask & (uint)ListViewItemMask.LVIF_TEXT) > 0)
-			{
-				if (QueryItemText != null)
-				{
-					string lvtext;
-					QueryItemText(info.Item.Item, info.Item.SubItem, out lvtext);
-					if (lvtext != null)
-					{
-						try
-						{
-							int maxIndex = Math.Min(info.Item.cchTextMax - 1, lvtext.Length);
-							var data = new char[maxIndex + 1];
-							lvtext.CopyTo(0, data, 0, lvtext.Length);
-							data[maxIndex] = '\0';
-							Marshal.Copy(data, 0, info.Item.PszText, data.Length);
-						}
-						catch (Exception e)
-						{
-							Debug.WriteLine($"Failed to copy text name from client: {e}", $"{nameof(VirtualListView)}.{nameof(OnDispInfoNotice)}");
-						}
-					}
-				}
-			}
-
-			if ((info.Item.Mask & (uint)ListViewItemMask.LVIF_IMAGE) > 0)
-			{
-				int imageIndex = 0;
-				if (QueryItemImage != null)
-				{
-					QueryItemImage(info.Item.Item, info.Item.SubItem, out imageIndex);
-				}
-
-				info.Item.Image = imageIndex;
-				Marshal.StructureToPtr(info, m.LParam, false);
-			}
-
-			if ((info.Item.Mask & (uint)ListViewItemMask.LVIF_INDENT) > 0)
-			{
-				int itemIndent = 0;
-				if (QueryItemIndent != null)
-				{
-					QueryItemIndent(info.Item.Item, out itemIndent);
-				}
-
-				info.Item.Indent = itemIndent;
-				Marshal.StructureToPtr(info, m.LParam, false);
-			}
-
-			m.Result = new IntPtr(0);
-		}
-
-		protected void OnCustomDrawNotice(ref Message m) 
-		{
-			var cd = (NmLvCustomDraw)m.GetLParam(typeof(NmLvCustomDraw));
-			switch (cd.Nmcd.dwDrawStage) 
-			{
-				case (int)CustomDrawDrawStageFlags.CDDS_ITEMPREPAINT:
-				case (int)CustomDrawDrawStageFlags.CDDS_PREPAINT:
-					m.Result = new IntPtr((int)CustomDrawReturnFlags.CDRF_NOTIFYSUBITEMDRAW);
-					break;
-				case (int)CustomDrawDrawStageFlags.CDDS_SUBITEMPREPAINT:
-					if (QueryItemBkColor != null)
-					{
-						var color = Color.FromArgb(cd.ClearTextBackground & 0xFF, (cd.ClearTextBackground >> 8) & 0xFF, (cd.ClearTextBackground >> 16) & 0xFF);
-						QueryItemBkColor(cd.Nmcd.dwItemSpec.ToInt32(), cd.SubItem, ref color);
-						cd.ClearTextBackground = (color.B << 16) | (color.G << 8) | color.R;
-						Marshal.StructureToPtr(cd, m.LParam, false);
-					}
-
-					m.Result = new IntPtr((int)CustomDrawReturnFlags.CDRF_DODEFAULT);
-					break;
-			}
-		}
-		
-		/// <summary>
-		/// Event to be fired whenever the control scrolls
-		/// </summary>
-		public event ScrollEventHandler Scroll;
-		protected virtual void OnScroll(ScrollEventArgs e)
-		{
-			var handler = this.Scroll;
-			if (handler != null)
-			{
-				handler(this, e);
-			}
-		}
-
-		[DllImport("user32.dll", CharSet = CharSet.Auto)]
-		public static extern int GetScrollPos(IntPtr hWnd, Orientation nBar);
-
-		/// <summary>
-		/// Gets the Vertical Scroll position of the control.
-		/// </summary>
-		public int VScrollPos
-		{
-			get { return GetScrollPos(this.Handle, Orientation.Vertical); }
-		}
-		
-		protected override void WndProc(ref Message m) 
-		{
-			var messageProcessed = false;
-			switch (m.Msg)
-			{
-				case (int)WindowsMessage.WM_REFLECT + (int)WindowsMessage.WM_NOTIFY:
-					var nm1 = (NmHdr)m.GetLParam(typeof(NmHdr));
-					switch (nm1.Code)
-					{
-						case (int)Notices.NM_CUSTOMDRAW:
-							OnCustomDrawNotice(ref m);
-							messageProcessed = true;
-
-							if (QueryItemBkColor == null || !UseCustomBackground)
-							{
-								m.Result = (IntPtr)0;
-							}
-
-							break;
-						case (int)ListViewNotices.LVN_GETDISPINFOW:
-							OnDispInfoNotice(ref m, false);
-							messageProcessed = true;
-							break;
-						case (int)ListViewNotices.LVN_BEGINDRAG:
-							OnBeginItemDrag(MouseButtons.Left, ref m);
-							messageProcessed = true;
-							break;
-						case (int)ListViewNotices.LVN_BEGINRDRAG:
-							OnBeginItemDrag(MouseButtons.Right, ref m);
-							messageProcessed = true;
-							break;
-					}
-
-					break;
-				case (int)WindowsMessage.WM_SCROLL:
-					// http://stackoverflow.com/questions/1851620/handling-scroll-event-on-listview-in-c-sharp
-					OnScroll(new ScrollEventArgs((ScrollEventType)(m.WParam.ToInt32() & 0xffff), m.WParam.ToInt32()));
-					break;
-				case (int)WindowsMessage.WM_ERASEBKGND:
-					if (BlazingFast)
-					{
-						messageProcessed = true;
-						m.Result = new IntPtr(1);
-					}
-
-					break;
-			}
-			
-			if (!messageProcessed) 
-			{
-				try 
-				{
-					base.WndProc(ref m);
-				}
-				catch (Exception ex)
-				{
-					Trace.WriteLine($"Message {m} caused an exception: {ex.Message}");
-				}
-			}
-		}
-
-		public bool BlazingFast { get; set; }
-		public bool UseCustomBackground { get; set; }
-
-		protected ListViewItem GetItem(int idx) 
-		{
-			ListViewItem item = null;
-			if (QueryItem != null) 
-			{
-				QueryItem(idx, out item);
-			}
-
-			if (item == null) 
-			{
-				throw new ArgumentException($"cannot find item {idx} via {nameof(QueryItem)} event");
-			}
-
-			return item;
-		}
-
-		protected void OnBeginItemDrag(MouseButtons mouseButton, ref Message m) 
-		{
-			var info = (NMLISTVIEW)m.GetLParam(typeof(NMLISTVIEW));
-			ListViewItem item = null;
-			if (QueryItem != null) 
-			{
-				QueryItem(info.iItem, out item);
-			}
-
-			OnItemDrag(new ItemDragEventArgs(mouseButton, item));
-		}
-
-		protected override void OnHandleCreated(EventArgs e) 
-		{
-			base.OnHandleCreated(e);
-
-			// ensure the value for ItemCount is sent to the control properly if the user set it 
-			// before the handle was created
-			SetVirtualItemCount();
-		}
-
-		protected override void OnHandleDestroyed(EventArgs e) 
-		{
-			// the ListView OnHandleDestroyed accesses the Items list for all selected items
-			ItemCount = 0;
-			base.OnHandleDestroyed(e);
-		}
-
-		#endregion
-
-		LvHitTestInfo lvhti = new LvHitTestInfo();
-		IntPtr ptrlvhti;
-		int selection = -1;
-
-		public int hitTest(int x, int y) 
-		{
-			lvhti.Point.X = x;
-			lvhti.Point.Y = y;
-			Marshal.StructureToPtr(lvhti, ptrlvhti, true);
-			int z = (int)Win32.SendMessage(this.Handle, (int)ListViewMessages.LVM_HITTEST, (IntPtr)0, ptrlvhti);
-			Marshal.PtrToStructure(ptrlvhti, lvhti);
-			return z;
-		}
-
-		public void ensureVisible(int index) 
-		{
-			Win32.SendMessage(Handle, (int)ListViewMessages.LVM_ENSUREVISIBLE, (IntPtr)index, (IntPtr)1);
-		}
-
-		public void ensureVisible() 
-		{
-			ensureVisible(selectedItem);
-		}
-
-		public void setSelection(int index) 
-		{
-			clearSelection();
-			selection = index;
-			SelectItem(selection, true);
-		}
-
-		public int selectedItem
-		{
-			get
-			{
-				if (SelectedIndices.Count == 0)
-				{
-					return -1;
-				}
-				else
-				{
-					return SelectedIndices[0];
-				}
-			} 
-			
-			set
-			{
-				setSelection(value);
-			}
-		}
-
-		public void clearSelection() 
-		{
-			if (selection != -1)
-			{
-				SelectItem(selection, false);
-			}
-
-			selection = -1;
-		}
-
-		// Informs user that a select all event is in place, can be used in change events to wait until this is false
-		public bool SelectAllInProgress { get; set; }
-
-		public void SelectAll()
-		{
-			this.BeginUpdate();
-			SelectAllInProgress = true;
-
-			for (var i = 0; i < _itemCount; i++)
-			{
-				if (i == _itemCount - 1)
-				{
-					SelectAllInProgress = false;
-				}
-
-				this.SelectItem(i, true);
-			}
-
-			this.EndUpdate();
-		}
-
-		public void DeselectAll()
-		{
-			this.BeginUpdate();
-			SelectAllInProgress = true;
-
-			for (var i = 0; i < _itemCount; i++)
-			{
-				if (i == _itemCount - 1)
-				{
-					SelectAllInProgress = false;
-				}
-
-				this.SelectItem(i, false);
-			}
-
-			this.EndUpdate();
-		}
-
-		protected override void OnKeyDown(KeyEventArgs e)
-		{
-			if (e.KeyCode == Keys.A && e.Control && !e.Alt && !e.Shift) // Select All
-			{
-				SelectAll();
-			}
-
-			base.OnKeyDown(e);
-		}
-	}
-}
diff --git a/BizHawk.Client.EmuHawk/EmuHawkUtil.cs b/BizHawk.Client.EmuHawk/EmuHawkUtil.cs
new file mode 100644
index 0000000000..ca0879fd32
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/EmuHawkUtil.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using BizHawk.Client.Common;
+using BizHawk.Client.EmuHawk.CustomControls;
+using BizHawk.Emulation.Common;
+using Cores = BizHawk.Emulation.Cores;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public static class EmuHawkUtil
+	{
+		public static bool EnsureCoreIsAccurate(IEmulator emulator)
+		{
+			static bool PromptToSwitchCore(string currentCore, string recommendedCore, Action disableCurrentCore)
+			{
+				using var box = new MsgBox(
+					$"While the {currentCore} core is faster, it is not nearly as accurate as {recommendedCore}.{Environment.NewLine}It is recommended that you switch to the {recommendedCore} core for movie recording.{Environment.NewLine}Switch to {recommendedCore}?",
+					"Accuracy Warning",
+					MessageBoxIcon.Warning);
+
+				box.SetButtons(
+					new[] { "Switch", "Continue" },
+					new[] { DialogResult.Yes, DialogResult.Cancel });
+
+				box.MaximumSize = UIHelper.Scale(new Size(575, 175));
+				box.SetMessageToAutoSize();
+
+				var result = box.ShowDialog();
+
+				if (result != DialogResult.Yes)
+				{
+					return false;
+				}
+
+				disableCurrentCore();
+				GlobalWin.MainForm.RebootCore();
+				return true;
+			}
+
+			if (emulator is Cores.Nintendo.SNES9X.Snes9x)
+			{
+				return PromptToSwitchCore("Snes9x", "bsnes", () => Global.Config.SNES_InSnes9x = false);
+			}
+			if (emulator is Cores.Consoles.Nintendo.QuickNES.QuickNES)
+			{
+				return PromptToSwitchCore("QuickNes", "NesHawk", () => Global.Config.NES_InQuickNES = false);
+			}
+
+			return true;
+		}
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
index 756dcfca33..b37ca52fa2 100644
--- a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
+++ b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
@@ -7,10 +7,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Common;
 using BizHawk.Common.ReflectionExtensions;
-using BizHawk.Client.Common;
-
 
 namespace BizHawk.Client.EmuHawk.WinFormExtensions
 {
@@ -43,44 +40,7 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
 			return control.BeginInvoke(action);
 		}
 
-		public static void AddColumn(this ListView listView, string columnName, bool enabled, int columnWidth)
-		{
-			if (enabled)
-			{
-				if (listView.Columns[columnName] == null)
-				{
-					var column = new ColumnHeader
-					{
-						Name = columnName,
-						Text = columnName.Replace("Column", ""),
-						Width = columnWidth,
-					};
-
-					listView.Columns.Add(column);
-				}
-			}
-		}
-
-		public static void AddColumn(this ListView listView, ToolDialogSettings.Column column)
-		{
-			if (column.Visible)
-			{
-				if (listView.Columns[column.Name] == null)
-				{
-					var lsstViewColumn = new ColumnHeader
-					{
-						Name = column.Name,
-						Text = column.Name.Replace("Column", ""),
-						Width = column.Width,
-						DisplayIndex = column.Index
-					};
-
-					listView.Columns.Add(lsstViewColumn);
-				}
-			}
-		}
-
-		public static ToolStripMenuItem GenerateColumnsMenu(this ToolDialogSettings.ColumnList list, Action changeCallback)
+		public static ToolStripMenuItem ToColumnsMenu(this InputRoll inputRoll, Action changeCallback)
 		{
 			var menu = new ToolStripMenuItem
 			{
@@ -88,33 +48,31 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
 				Text = "Columns"
 			};
 
-			var dummyList = list;
+			var columns = inputRoll.AllColumns;
 
-			foreach (var column in dummyList)
+			foreach (var column in columns)
 			{
 				var menuItem = new ToolStripMenuItem
 				{
 					Name = column.Name,
-					Text = column.Name.Replace("Column", "")
+					Text = $"{column.Text} ({column.Name})",
+					Checked = column.Visible,
+					CheckOnClick = true,
+					Tag = column.Name
 				};
 
-				menuItem.Click += (o, ev) =>
+				menuItem.CheckedChanged += (o, ev) =>
 				{
-					dummyList[menuItem.Name].Visible ^= true;
+					var sender = (ToolStripMenuItem)o;
+					columns.Find(c => c.Name == (string)sender.Tag).Visible = sender.Checked;
+					columns.ColumnsChanged();
 					changeCallback();
+					inputRoll.Refresh();
 				};
 
 				menu.DropDownItems.Add(menuItem);
 			}
 
-			menu.DropDownOpened += (o, e) =>
-			{
-				foreach (var column in dummyList)
-				{
-					(menu.DropDownItems[column.Name] as ToolStripMenuItem).Checked = column.Visible;
-				}
-			};
-
 			return menu;
 		}
 
@@ -123,6 +81,13 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
 			return control.PointToScreen(new Point(child.Location.X, child.Location.Y));
 		}
 
+		public static Color Add(this Color color, int val)
+		{
+			var col = color.ToArgb();
+			col += val;
+			return Color.FromArgb(col);
+		}
+
 		#region Enumerable to Enumerable<T>
 
 		/// <summary>
@@ -139,16 +104,6 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
 			return tabControl.TabPages.Cast<TabPage>();
 		}
 
-		public static IEnumerable<int> SelectedIndices(this ListView listView)
-		{
-			return listView.SelectedIndices.Cast<int>();
-		}
-
-		public static IEnumerable<ColumnHeader> ColumnHeaders(this ListView listView)
-		{
-			return listView.Columns.OfType<ColumnHeader>();
-		}
-
 		#endregion
 	}
 
@@ -251,7 +206,7 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
 			{
 				foreach (ListViewItem.ListViewSubItem item in listViewControl.Items[index].SubItems)
 				{
-					if (!String.IsNullOrWhiteSpace(item.Text))
+					if (!string.IsNullOrWhiteSpace(item.Text))
 					{
 						sb.Append(item.Text).Append('\t');
 					}
diff --git a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs
index 613d465979..07590da894 100644
--- a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs
+++ b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs
@@ -11,6 +11,7 @@ using BizHawk.Emulation.Cores.Nintendo.SNES9X;
 using BizHawk.Emulation.Cores.Sega.Saturn;
 using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
 using BizHawk.Emulation.Cores.Sony.PSP;
+using BizHawk.Emulation.Cores.Arcades.MAME;
 
 using BizHawk.Client.Common;
 
@@ -51,6 +52,10 @@ namespace BizHawk.Client.EmuHawk.CoreExtensions
 			{
 				return Properties.Resources.snes9x;
 			}
+			else if (core is MAME)
+			{
+				return Properties.Resources.mame;
+			}
 			else
 			{
 				return null;
diff --git a/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs
index c125b2286d..3e71f5ff11 100644
--- a/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs
+++ b/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs
@@ -50,7 +50,7 @@ namespace BizHawk.Client.EmuHawk.ToolExtensions
 					}
 
 					//TODO - do TSMI and TSDD need disposing? yuck
-					var item = new ToolStripMenuItem { Text = caption };
+					var item = new ToolStripMenuItem { Text = caption.Replace("&", "&&") };
 					items.Add(item);
 
 					item.Click += (o, ev) =>
diff --git a/BizHawk.Client.EmuHawk/FileFilterEntry.cs b/BizHawk.Client.EmuHawk/FileFilterEntry.cs
new file mode 100644
index 0000000000..9465b9b940
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/FileFilterEntry.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public class FileFilterEntry
+	{
+		public string Description { get; }
+		public string[] Filters { get; }
+		public string[] DeveloperFilters { get; }
+
+		public FileFilterEntry(string description, string filters, string developerFilters = null)
+		{
+			Description = description;
+			Filters = filters?.Split(';') ?? Array.Empty<string>();
+			DeveloperFilters = developerFilters?.Split(';') ?? Array.Empty<string>();
+		}
+
+		public IEnumerable<string> EffectiveFilters
+		{
+			get
+			{
+				IEnumerable<string> effectiveFilters = Filters;
+				if (VersionInfo.DeveloperBuild)
+				{
+					effectiveFilters = effectiveFilters.Concat(DeveloperFilters);
+				}
+				return effectiveFilters;
+			}
+		}
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/FileLoader.cs b/BizHawk.Client.EmuHawk/FileLoader.cs
index 3d49dd87a1..d08f5c693d 100644
--- a/BizHawk.Client.EmuHawk/FileLoader.cs
+++ b/BizHawk.Client.EmuHawk/FileLoader.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common.IEmulatorExtensions;
-using BizHawk.Emulation.Cores.PCEngine;
 using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
@@ -40,31 +39,8 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		// This is the list from MainForm->RomFilter()'s non-developer build.  It needs to be kept up-to-date when new cores are added.
-		// adelikat: This is annoying and bad. Maybe we could generate RomFilter from this property?
-		private string[] KnownRomExtensions
-		{
-			get
-			{
-				if (VersionInfo.DeveloperBuild)
-				{
-					return new[]
-					{
-						".NES", ".FDS", ".UNF", ".SMS", ".GG", ".SG", ".GB", ".GBC", ".GBA", ".PCE", ".SGX", ".BIN", ".SMD", ".GEN", ".MD", ".SMC",
-						".SFC", ".A26", ".A78", ".LNX", ".COL", ".ROM", ".M3U", ".CUE", ".CCD", ".SGB", ".Z64", ".V64", ".N64", ".WS", ".WSC", ".XML",
-						".DSK", ".DO", ".PO", ".PSF", ".MINIPSF", ".NSF", ".EXE", ".PRG", ".D64", ".G64", ".CRT", ".TAP", ".32X", ".MDS", ".TZX",
-						".PZX", ".CSW", ".WAV", ".CDT"
-					};
-				}
-
-				return new[] 
-				{
-					".NES", ".FDS", ".UNF", ".SMS", ".GG", ".SG", ".GB", ".GBC", ".GBA", ".PCE", ".SGX", ".BIN", ".SMD", ".GEN", ".MD", ".SMC",
-					".SFC", ".A26", ".A78", ".LNX", ".COL", ".ROM", ".M3U", ".CUE", ".CCD", ".SGB", ".Z64", ".V64", ".N64", ".WS", ".WSC", ".XML",
-					".DSK", ".DO", ".PO", ".PSF", ".MINIPSF", ".NSF", ".PRG", ".D64", ".G64", ".CRT", ".TAP", ".32X", ".MDS", ".TZX", ".PZX", ".CSW", ".WAV"
-				};
-			}
-		}
+		private IEnumerable<string> KnownRomExtensions =>
+			RomFilterEntries.SelectMany(f => f.EffectiveFilters.Where(s => s.StartsWith("*.", StringComparison.Ordinal)).Select(s => s.Substring(1).ToUpperInvariant()));
 
 		private readonly string[] _nonArchive = { ".ISO", ".CUE", ".CCD" };
 
@@ -173,7 +149,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			foreach (string file in fileList)
 			{
-				var ext = Path.GetExtension(file).ToUpper() ?? "";
+				var ext = Path.GetExtension(file).ToUpperInvariant() ?? "";
 				FileInformation fileInformation = new FileInformation(Path.GetDirectoryName(file), Path.GetFileName(file), archive);
 
 				switch (ext)
diff --git a/BizHawk.Client.EmuHawk/Input/Input.cs b/BizHawk.Client.EmuHawk/Input/Input.cs
index c1d873ad76..9facff47c6 100644
--- a/BizHawk.Client.EmuHawk/Input/Input.cs
+++ b/BizHawk.Client.EmuHawk/Input/Input.cs
@@ -3,8 +3,6 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Threading;
 
-using SlimDX.DirectInput;
-
 using BizHawk.Common;
 using BizHawk.Client.Common;
 
@@ -70,6 +68,13 @@ namespace BizHawk.Client.EmuHawk
 			Pad = 4
 		}
 
+		public enum AllowInput
+		{
+			None = 0,
+			All = 1,
+			OnlyController = 2
+		}
+
 		/// <summary>
 		/// If your form needs this kind of input focus, be sure to say so.
 		/// Really, this only makes sense for mouse, but I've started building it out for other things
@@ -196,71 +201,53 @@ namespace BizHawk.Client.EmuHawk
 		{
 			public LogicalButton LogicalButton;
 			public InputEventType EventType;
+			public InputFocus Source;
 			public override string ToString()
 			{
 				return $"{EventType.ToString()}:{LogicalButton.ToString()}";
 			}
 		}
 
-		private readonly WorkingDictionary<string, object> ModifierState = new WorkingDictionary<string, object>();
+		private readonly Dictionary<string, LogicalButton> ModifierState = new Dictionary<string, LogicalButton>();
 		private readonly WorkingDictionary<string, bool> LastState = new WorkingDictionary<string, bool>();
-		private readonly WorkingDictionary<string, bool> UnpressState = new WorkingDictionary<string, bool>();
-		private readonly HashSet<string> IgnoreKeys = new HashSet<string>(new[] { "LeftShift", "RightShift", "LeftControl", "RightControl", "LeftAlt", "RightAlt" });
 		private readonly WorkingDictionary<string, float> FloatValues = new WorkingDictionary<string, float>();
 		private readonly WorkingDictionary<string, float> FloatDeltas = new WorkingDictionary<string, float>();
 		private bool trackdeltas = false;
+		private bool IgnoreEventsNextPoll = false;
 
-		void HandleButton(string button, bool newState)
+		void HandleButton(string button, bool newState, InputFocus source)
 		{
-			bool isModifier = IgnoreKeys.Contains(button);
-			if (EnableIgnoreModifiers && isModifier) return;
-			if (LastState[button] && newState) return;
-			if (!LastState[button] && !newState) return;
+			ModifierKey currentModifier = ButtonToModifierKey(button);
+			if (EnableIgnoreModifiers && currentModifier != ModifierKey.None) return;
+			if (LastState[button] == newState) return;
 
 			//apply 
 			//NOTE: this is not quite right. if someone held leftshift+rightshift it would be broken. seems unlikely, though.
-			if (button == "LeftShift")
+			if (currentModifier != ModifierKey.None)
 			{
-				_Modifiers &= ~ModifierKey.Shift;
 				if (newState)
-					_Modifiers |= ModifierKey.Shift;
+					_Modifiers |= currentModifier;
+				else
+					_Modifiers &= ~currentModifier;
 			}
-			if (button == "RightShift") { _Modifiers &= ~ModifierKey.Shift; if (newState) _Modifiers |= ModifierKey.Shift; }
-			if (button == "LeftControl") { _Modifiers &= ~ModifierKey.Control; if (newState) _Modifiers |= ModifierKey.Control; }
-			if (button == "RightControl") { _Modifiers &= ~ModifierKey.Control; if (newState) _Modifiers |= ModifierKey.Control; }
-			if (button == "LeftAlt") { _Modifiers &= ~ModifierKey.Alt; if (newState) _Modifiers |= ModifierKey.Alt; }
-			if (button == "RightAlt") { _Modifiers &= ~ModifierKey.Alt; if (newState) _Modifiers |= ModifierKey.Alt; }
-
-			if (UnpressState.ContainsKey(button))
-			{
-				if (newState) return;
-				Console.WriteLine($"Removing Unpress {button} with {nameof(newState)} {newState}");
-				UnpressState.Remove(button);
-				LastState[button] = false;
-				return;
-			}
-
 
 			//dont generate events for things like Ctrl+LeftControl
 			ModifierKey mods = _Modifiers;
-			if (button == "LeftShift") mods &= ~ModifierKey.Shift;
-			if (button == "RightShift") mods &= ~ModifierKey.Shift;
-			if (button == "LeftControl") mods &= ~ModifierKey.Control;
-			if (button == "RightControl") mods &= ~ModifierKey.Control;
-			if (button == "LeftAlt") mods &= ~ModifierKey.Alt;
-			if (button == "RightAlt") mods &= ~ModifierKey.Alt;
+			if (currentModifier != ModifierKey.None)
+				mods &= ~currentModifier;
 
 			var ie = new InputEvent
 				{
 					EventType = newState ? InputEventType.Press : InputEventType.Release,
-					LogicalButton = new LogicalButton(button, mods)
+					LogicalButton = new LogicalButton(button, mods),
+					Source = source
 				};
 			LastState[button] = newState;
 
 			//track the pressed events with modifiers that we send so that we can send corresponding unpresses with modifiers
 			//this is an interesting idea, which we may need later, but not yet.
 			//for example, you may see this series of events: press:ctrl+c, release:ctrl, release:c
-			//but you might would rather have press:ctr+c, release:ctrl+c
+			//but you might would rather have press:ctrl+c, release:ctrl+c
 			//this code relates the releases to the original presses.
 			//UPDATE - this is necessary for the frame advance key, which has a special meaning when it gets stuck down
 			//so, i am adding it as of 11-sep-2011
@@ -270,32 +257,53 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				if (ModifierState[button] != null)
+				LogicalButton buttonModifierState;
+				if (ModifierState.TryGetValue(button, out buttonModifierState))
 				{
-					LogicalButton alreadyReleased = ie.LogicalButton;
-					var ieModified = new InputEvent
-						{
-							LogicalButton = (LogicalButton)ModifierState[button],
-							EventType = InputEventType.Release
-						};
-					if (ieModified.LogicalButton != alreadyReleased)
-						_NewEvents.Add(ieModified);
+					if (buttonModifierState != ie.LogicalButton && !IgnoreEventsNextPoll)
+					{
+						_NewEvents.Add(
+							new InputEvent
+							{
+								LogicalButton = buttonModifierState,
+								EventType = InputEventType.Release,
+								Source = source
+							});
+					}
+					ModifierState.Remove(button);
 				}
-				ModifierState[button] = null;
 			}
 
-			_NewEvents.Add(ie);
+			if (!IgnoreEventsNextPoll)
+			{
+				_NewEvents.Add(ie);
+			}
 		}
 
-		ModifierKey _Modifiers;
+		private static ModifierKey ButtonToModifierKey(string button)
+		{
+			switch (button)
+			{
+				case "LeftShift":  return ModifierKey.Shift;
+				case "RightShift": return ModifierKey.Shift;
+				case "LeftControl":  return ModifierKey.Control;
+				case "RightControl": return ModifierKey.Control;
+				case "LeftAlt":  return ModifierKey.Alt;
+				case "RightAlt": return ModifierKey.Alt;
+			}
+			return ModifierKey.None;
+		}
+
+		private ModifierKey _Modifiers;
 		private readonly List<InputEvent> _NewEvents = new List<InputEvent>();
 
-		//do we need this?
 		public void ClearEvents()
 		{
 			lock (this)
 			{
 				InputEvents.Clear();
+				// To "clear" anything currently in the input device buffers
+				IgnoreEventsNextPoll = true;
 			}
 		}
 
@@ -351,7 +359,7 @@ namespace BizHawk.Client.EmuHawk
 
 					//analyze keys
 					foreach (var ke in keyEvents)
-						HandleButton(ke.Key.ToString(), ke.Pressed);
+						HandleButton(ke.Key.ToString(), ke.Pressed, InputFocus.Keyboard);
 
 					lock (FloatValues)
 					{
@@ -378,7 +386,7 @@ namespace BizHawk.Client.EmuHawk
 						{
 							string xname = $"X{pad.PlayerNumber} ";
 							for (int b = 0; b < pad.NumButtons; b++)
-								HandleButton(xname + pad.ButtonName(b), pad.Pressed(b));
+								HandleButton(xname + pad.ButtonName(b), pad.Pressed(b), InputFocus.Pad);
 							foreach (var sv in pad.GetFloats())
 							{
 								string n = xname + sv.Item1;
@@ -394,7 +402,7 @@ namespace BizHawk.Client.EmuHawk
 						{
 							string jname = $"J{pad.PlayerNumber} ";
 							for (int b = 0; b < pad.NumButtons; b++)
-								HandleButton(jname + pad.ButtonName(b), pad.Pressed(b));
+								HandleButton(jname + pad.ButtonName(b), pad.Pressed(b), InputFocus.Pad);
 							foreach (var sv in pad.GetFloats())
 							{
 								string n = jname + sv.Item1;
@@ -423,11 +431,11 @@ namespace BizHawk.Client.EmuHawk
 							FloatValues["WMouse Y"] = P.Y;
 
 							var B = System.Windows.Forms.Control.MouseButtons;
-							HandleButton("WMouse L", (B & System.Windows.Forms.MouseButtons.Left) != 0);
-							HandleButton("WMouse C", (B & System.Windows.Forms.MouseButtons.Middle) != 0);
-							HandleButton("WMouse R", (B & System.Windows.Forms.MouseButtons.Right) != 0);
-							HandleButton("WMouse 1", (B & System.Windows.Forms.MouseButtons.XButton1) != 0);
-							HandleButton("WMouse 2", (B & System.Windows.Forms.MouseButtons.XButton2) != 0);
+							HandleButton("WMouse L", (B & System.Windows.Forms.MouseButtons.Left) != 0, InputFocus.Mouse);
+							HandleButton("WMouse C", (B & System.Windows.Forms.MouseButtons.Middle) != 0, InputFocus.Mouse);
+							HandleButton("WMouse R", (B & System.Windows.Forms.MouseButtons.Right) != 0, InputFocus.Mouse);
+							HandleButton("WMouse 1", (B & System.Windows.Forms.MouseButtons.XButton1) != 0, InputFocus.Mouse);
+							HandleButton("WMouse 2", (B & System.Windows.Forms.MouseButtons.XButton2) != 0, InputFocus.Mouse);
 						}
 						else
 						{
@@ -439,22 +447,26 @@ namespace BizHawk.Client.EmuHawk
 							//HandleButton("WMouse 1", false);
 							//HandleButton("WMouse 2", false);
 						}
-
 					}
 
-					//WHAT!? WE SHOULD NOT BE SO NAIVELY TOUCHING MAINFORM FROM THE INPUTTHREAD. ITS BUSY RUNNING.
-					bool swallow = !GlobalWin.MainForm.AllowInput(false);
-
-					foreach (var ie in _NewEvents)
+					if (_NewEvents.Count != 0)
 					{
-						//events are swallowed in some cases:
-						if (ie.LogicalButton.Alt && !GlobalWin.MainForm.AllowInput(true))
-						{ }
-						else if (ie.EventType == InputEventType.Press && swallow)
-						{ }
-						else
+						//WHAT!? WE SHOULD NOT BE SO NAIVELY TOUCHING MAINFORM FROM THE INPUTTHREAD. ITS BUSY RUNNING.
+						AllowInput allowInput = GlobalWin.MainForm.AllowInput(false);
+
+						foreach (var ie in _NewEvents)
+						{
+							//events are swallowed in some cases:
+							if (ie.LogicalButton.Alt && ShouldSwallow(GlobalWin.MainForm.AllowInput(true), ie))
+								continue;
+							if (ie.EventType == InputEventType.Press && ShouldSwallow(allowInput, ie))
+								continue;
+
 							EnqueueEvent(ie);
+						}
 					}
+
+					IgnoreEventsNextPoll = false;
 				} //lock(this)
 
 				//arbitrary selection of polling frequency:
@@ -462,6 +474,11 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private static bool ShouldSwallow(AllowInput allowInput, InputEvent inputEvent)
+		{
+			return allowInput == AllowInput.None || (allowInput == AllowInput.OnlyController && inputEvent.Source != InputFocus.Pad);
+		}
+
 		public void StartListeningForFloatEvents()
 		{
 			lock (FloatValues)
@@ -500,42 +517,39 @@ namespace BizHawk.Client.EmuHawk
 		}
 
 		//returns the next Press event, if available. should be useful
-		public string GetNextBindEvent()
+		public string GetNextBindEvent(ref InputEvent lastPress)
 		{
 			//this whole process is intimately involved with the data structures, which can conflict with the input thread.
 			lock (this)
 			{
 				if (InputEvents.Count == 0) return null;
-				if (!GlobalWin.MainForm.AllowInput(false)) return null;
+				AllowInput allowInput = GlobalWin.MainForm.AllowInput(false);
 
-				//we only listen to releases for input binding, because we need to distinguish releases of pure modifierkeys from modified keys
+				//wait for the first release after a press to complete input binding, because we need to distinguish pure modifierkeys from modified keys
 				//if you just pressed ctrl, wanting to bind ctrl, we'd see: pressed:ctrl, unpressed:ctrl
 				//if you just pressed ctrl+c, wanting to bind ctrl+c, we'd see: pressed:ctrl, pressed:ctrl+c, unpressed:ctrl+c, unpressed:ctrl
-				//so its the first unpress we need to listen for
+				//but in the 2nd example the unpresses will be swapped if ctrl is released first, so we'll take the last press before the release
 
 				while (InputEvents.Count != 0)
 				{
-					var ie = DequeueEvent();
+					InputEvent ie = DequeueEvent();
 
-					//as a special perk, we'll accept escape immediately
-					if (ie.EventType == InputEventType.Press && ie.LogicalButton.Button == "Escape")
-						goto ACCEPT;
+					if (ShouldSwallow(allowInput, ie)) continue;
 
-					if (ie.EventType == InputEventType.Press) continue;
+					if (ie.EventType == InputEventType.Press)
+					{
+						lastPress = ie;
+						//don't allow presses to directly complete binding except escape which we'll accept as a special perk
+						if (ie.LogicalButton.Button != "Escape")
+							continue;
+					}
+					else if (lastPress == null) continue;
 
-				ACCEPT:
-					Console.WriteLine("Bind Event: {0} ", ie);
-
-					foreach (var kvp in LastState)
-						if (kvp.Value)
-						{
-							Console.WriteLine($"Unpressing {kvp.Key}");
-							UnpressState[kvp.Key] = true;
-						}
+					Console.WriteLine("Bind Event: {0} ", lastPress);
 
 					InputEvents.Clear();
 
-					return ie.LogicalButton.ToString();
+					return lastPress.LogicalButton.ToString();
 				}
 
 				return null;
@@ -545,16 +559,6 @@ namespace BizHawk.Client.EmuHawk
 		//controls whether modifier keys will be ignored as key press events
 		//this should be used by hotkey binders, but we may want modifier key events
 		//to get triggered in the main form
-		public bool EnableIgnoreModifiers = false;
-
-		//sets a key as unpressed for the binding system
-		public void BindUnpress(System.Windows.Forms.Keys key)
-		{
-			//only validated for Return
-			string keystr = key.ToString();
-			UnpressState[keystr] = true;
-			LastState[keystr] = true;
-		}
-
+		public volatile bool EnableIgnoreModifiers = false;
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/Input/Keyboard.cs b/BizHawk.Client.EmuHawk/Input/Keyboard.cs
index d42f5e6b6a..b7cda338cf 100644
--- a/BizHawk.Client.EmuHawk/Input/Keyboard.cs
+++ b/BizHawk.Client.EmuHawk/Input/Keyboard.cs
@@ -60,9 +60,9 @@ namespace BizHawk.Client.EmuHawk
 					foreach (var e in events)
 					{
 						foreach (var k in e.PressedKeys)
-							_eventList.Add(new KeyEvent { Key = k, Pressed = true });
+							_eventList.Add(new KeyEvent { Key = KeyboardMapping.Handle(k), Pressed = true });
 						foreach (var k in e.ReleasedKeys)
-							_eventList.Add(new KeyEvent { Key = k, Pressed = false });
+							_eventList.Add(new KeyEvent { Key = KeyboardMapping.Handle(k), Pressed = false });
 					}
 				}
 
diff --git a/BizHawk.Client.EmuHawk/Input/KeyboardMapping.cs b/BizHawk.Client.EmuHawk/Input/KeyboardMapping.cs
new file mode 100644
index 0000000000..4e73b5450f
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/Input/KeyboardMapping.cs
@@ -0,0 +1,416 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using BizHawk.Client.Common;
+using SlimDX.DirectInput;
+
+namespace BizHawk.Client.EmuHawk
+{
+	internal static class KeyboardMapping
+	{
+		[DllImport("user32.dll", CharSet = CharSet.Auto)]
+		private static extern uint MapVirtualKey(uint uCode, uint uMapType);
+
+		private const uint MAPVK_VSC_TO_VK_EX = 0x03;
+
+		public static Key Handle(Key key)
+		{
+			if (!Global.Config.HandleAlternateKeyboardLayouts) return key;
+			ScanCode inputScanCode = SlimDXScanCodeMap[(int)key];
+			Keys virtualKey = (Keys)MapVirtualKey((uint)inputScanCode, MAPVK_VSC_TO_VK_EX);
+			ScanCode standardScanCode = GetStandardScanCode(virtualKey);
+			if (standardScanCode == 0)
+				standardScanCode = inputScanCode;
+			return ScanCodeToSlimDXKey[standardScanCode];
+		}
+
+		private static ScanCode GetStandardScanCode(Keys virtualKey)
+		{
+			switch (virtualKey)
+			{
+				case Keys.Escape: return ScanCode.Escape;
+				case Keys.D1: return ScanCode.D1;
+				case Keys.D2: return ScanCode.D2;
+				case Keys.D3: return ScanCode.D3;
+				case Keys.D4: return ScanCode.D4;
+				case Keys.D5: return ScanCode.D5;
+				case Keys.D6: return ScanCode.D6;
+				case Keys.D7: return ScanCode.D7;
+				case Keys.D8: return ScanCode.D8;
+				case Keys.D9: return ScanCode.D9;
+				case Keys.D0: return ScanCode.D0;
+				case Keys.OemMinus: return ScanCode.Minus;
+				case Keys.Oemplus: return ScanCode.Equals;
+				case Keys.Back: return ScanCode.Back;
+				case Keys.Tab: return ScanCode.Tab;
+				case Keys.Q: return ScanCode.Q;
+				case Keys.W: return ScanCode.W;
+				case Keys.E: return ScanCode.E;
+				case Keys.R: return ScanCode.R;
+				case Keys.T: return ScanCode.T;
+				case Keys.Y: return ScanCode.Y;
+				case Keys.U: return ScanCode.U;
+				case Keys.I: return ScanCode.I;
+				case Keys.O: return ScanCode.O;
+				case Keys.P: return ScanCode.P;
+				case Keys.OemOpenBrackets: return ScanCode.LBracket;
+				case Keys.OemCloseBrackets: return ScanCode.RBracket;
+				case Keys.Return: return ScanCode.Return;
+				case Keys.LControlKey: return ScanCode.LControl;
+				case Keys.A: return ScanCode.A;
+				case Keys.S: return ScanCode.S;
+				case Keys.D: return ScanCode.D;
+				case Keys.F: return ScanCode.F;
+				case Keys.G: return ScanCode.G;
+				case Keys.H: return ScanCode.H;
+				case Keys.J: return ScanCode.J;
+				case Keys.K: return ScanCode.K;
+				case Keys.L: return ScanCode.L;
+				case Keys.OemSemicolon: return ScanCode.Semicolon;
+				case Keys.OemQuotes: return ScanCode.Apostrophe;
+				case Keys.Oemtilde: return ScanCode.Grave;
+				case Keys.LShiftKey: return ScanCode.LShift;
+				case Keys.OemPipe: return ScanCode.Backslash;
+				case Keys.Z: return ScanCode.Z;
+				case Keys.X: return ScanCode.X;
+				case Keys.C: return ScanCode.C;
+				case Keys.V: return ScanCode.V;
+				case Keys.B: return ScanCode.B;
+				case Keys.N: return ScanCode.N;
+				case Keys.M: return ScanCode.M;
+				case Keys.Oemcomma: return ScanCode.Comma;
+				case Keys.OemPeriod: return ScanCode.Period;
+				case Keys.OemQuestion: return ScanCode.Slash;
+				case Keys.RShiftKey: return ScanCode.RShift;
+				case Keys.Multiply: return ScanCode.Multiply;
+				case Keys.LMenu: return ScanCode.LMenu;
+				case Keys.Space: return ScanCode.Space;
+				case Keys.Capital: return ScanCode.Capital;
+				case Keys.F1: return ScanCode.F1;
+				case Keys.F2: return ScanCode.F2;
+				case Keys.F3: return ScanCode.F3;
+				case Keys.F4: return ScanCode.F4;
+				case Keys.F5: return ScanCode.F5;
+				case Keys.F6: return ScanCode.F6;
+				case Keys.F7: return ScanCode.F7;
+				case Keys.F8: return ScanCode.F8;
+				case Keys.F9: return ScanCode.F9;
+				case Keys.F10: return ScanCode.F10;
+				case Keys.NumLock: return ScanCode.NumLock;
+				case Keys.Scroll: return ScanCode.Scroll;
+				case Keys.Subtract: return ScanCode.Subtract;
+				case Keys.Add: return ScanCode.Add;
+				case Keys.OemBackslash: return ScanCode.Oem_102;
+				case Keys.F11: return ScanCode.F11;
+				case Keys.F12: return ScanCode.F12;
+				case Keys.F13: return ScanCode.F13;
+				case Keys.F14: return ScanCode.F14;
+				case Keys.F15: return ScanCode.F15;
+			}
+			return 0;
+		}
+
+		private enum ScanCode
+		{
+			Escape = 0x01,
+			D1 = 0x02,
+			D2 = 0x03,
+			D3 = 0x04,
+			D4 = 0x05,
+			D5 = 0x06,
+			D6 = 0x07,
+			D7 = 0x08,
+			D8 = 0x09,
+			D9 = 0x0A,
+			D0 = 0x0B,
+			Minus = 0x0C,
+			Equals = 0x0D,
+			Back = 0x0E,
+			Tab = 0x0F,
+			Q = 0x10,
+			W = 0x11,
+			E = 0x12,
+			R = 0x13,
+			T = 0x14,
+			Y = 0x15,
+			U = 0x16,
+			I = 0x17,
+			O = 0x18,
+			P = 0x19,
+			LBracket = 0x1A,
+			RBracket = 0x1B,
+			Return = 0x1C,
+			LControl = 0x1D,
+			A = 0x1E,
+			S = 0x1F,
+			D = 0x20,
+			F = 0x21,
+			G = 0x22,
+			H = 0x23,
+			J = 0x24,
+			K = 0x25,
+			L = 0x26,
+			Semicolon = 0x27,
+			Apostrophe = 0x28,
+			Grave = 0x29,
+			LShift = 0x2A,
+			Backslash = 0x2B,
+			Z = 0x2C,
+			X = 0x2D,
+			C = 0x2E,
+			V = 0x2F,
+			B = 0x30,
+			N = 0x31,
+			M = 0x32,
+			Comma = 0x33,
+			Period = 0x34,
+			Slash = 0x35,
+			RShift = 0x36,
+			Multiply = 0x37,
+			LMenu = 0x38,
+			Space = 0x39,
+			Capital = 0x3A,
+			F1 = 0x3B,
+			F2 = 0x3C,
+			F3 = 0x3D,
+			F4 = 0x3E,
+			F5 = 0x3F,
+			F6 = 0x40,
+			F7 = 0x41,
+			F8 = 0x42,
+			F9 = 0x43,
+			F10 = 0x44,
+			NumLock = 0x45,
+			Scroll = 0x46,
+			NumPad7 = 0x47,
+			NumPad8 = 0x48,
+			NumPad9 = 0x49,
+			Subtract = 0x4A,
+			NumPad4 = 0x4B,
+			NumPad5 = 0x4C,
+			NumPad6 = 0x4D,
+			Add = 0x4E,
+			NumPad1 = 0x4F,
+			NumPad2 = 0x50,
+			NumPad3 = 0x51,
+			NumPad0 = 0x52,
+			Decimal = 0x53,
+			Oem_102 = 0x56,
+			F11 = 0x57,
+			F12 = 0x58,
+			F13 = 0x64,
+			F14 = 0x65,
+			F15 = 0x66,
+			Kana = 0x70,
+			Abnt_C1 = 0x73,
+			Convert = 0x79,
+			NoConvert = 0x7B,
+			Yen = 0x7D,
+			Abnt_C2 = 0x7E,
+			NumPadEquals = 0x8D,
+			PrevTrack = 0x90,
+			AT = 0x91,
+			Colon = 0x92,
+			Underline = 0x93,
+			Kanji = 0x94,
+			Stop = 0x95,
+			AX = 0x96,
+			Unlabeled = 0x97,
+			NextTrack = 0x99,
+			NumPadEnter = 0x9C,
+			RControl = 0x9D,
+			Mute = 0xA0,
+			Calculator = 0xA1,
+			PlayPause = 0xA2,
+			MediaStop = 0xA4,
+			VolumeDown = 0xAE,
+			VolumeUp = 0xB0,
+			WebHome = 0xB2,
+			NumPadComma = 0xB3,
+			Divide = 0xB5,
+			SysRq = 0xB7,
+			RMenu = 0xB8,
+			Pause = 0xC5,
+			Home = 0xC7,
+			Up = 0xC8,
+			Prior = 0xC9,
+			Left = 0xCB,
+			Right = 0xCD,
+			End = 0xCF,
+			Down = 0xD0,
+			Next = 0xD1,
+			Insert = 0xD2,
+			Delete = 0xD3,
+			LWin = 0xDB,
+			RWin = 0xDC,
+			Apps = 0xDD,
+			Power = 0xDE,
+			Sleep = 0xDF,
+			Wake = 0xE3,
+			WebSearch = 0xE5,
+			WebFavorites = 0xE6,
+			WebRefresh = 0xE7,
+			WebStop = 0xE8,
+			WebForward = 0xE9,
+			WebBack = 0xEA,
+			MyComputer = 0xEB,
+			Mail = 0xEC,
+			MediaSelect = 0xED
+		}
+
+		private static readonly ScanCode[] SlimDXScanCodeMap = new ScanCode[]
+		{
+			ScanCode.D0, // 0
+			ScanCode.D1, // 1
+			ScanCode.D2, // 2
+			ScanCode.D3, // 3
+			ScanCode.D4, // 4
+			ScanCode.D5, // 5
+			ScanCode.D6, // 6
+			ScanCode.D7, // 7
+			ScanCode.D8, // 8
+			ScanCode.D9, // 9
+			ScanCode.A, // 10
+			ScanCode.B, // 11
+			ScanCode.C, // 12
+			ScanCode.D, // 13
+			ScanCode.E, // 14
+			ScanCode.F, // 15
+			ScanCode.G, // 16
+			ScanCode.H, // 17
+			ScanCode.I, // 18
+			ScanCode.J, // 19
+			ScanCode.K, // 20
+			ScanCode.L, // 21
+			ScanCode.M, // 22
+			ScanCode.N, // 23
+			ScanCode.O, // 24
+			ScanCode.P, // 25
+			ScanCode.Q, // 26
+			ScanCode.R, // 27
+			ScanCode.S, // 28
+			ScanCode.T, // 29
+			ScanCode.U, // 30
+			ScanCode.V, // 31
+			ScanCode.W, // 32
+			ScanCode.X, // 33
+			ScanCode.Y, // 34
+			ScanCode.Z, // 35
+			ScanCode.Abnt_C1, // 36
+			ScanCode.Abnt_C2, // 37
+			ScanCode.Apostrophe, // 38
+			ScanCode.Apps, // 39
+			ScanCode.AT, // 40
+			ScanCode.AX, // 41
+			ScanCode.Back, // 42
+			ScanCode.Backslash, // 43
+			ScanCode.Calculator, // 44
+			ScanCode.Capital, // 45
+			ScanCode.Colon, // 46
+			ScanCode.Comma, // 47
+			ScanCode.Convert, // 48
+			ScanCode.Delete, // 49
+			ScanCode.Down, // 50
+			ScanCode.End, // 51
+			ScanCode.Equals, // 52
+			ScanCode.Escape, // 53
+			ScanCode.F1, // 54
+			ScanCode.F2, // 55
+			ScanCode.F3, // 56
+			ScanCode.F4, // 57
+			ScanCode.F5, // 58
+			ScanCode.F6, // 59
+			ScanCode.F7, // 60
+			ScanCode.F8, // 61
+			ScanCode.F9, // 62
+			ScanCode.F10, // 63
+			ScanCode.F11, // 64
+			ScanCode.F12, // 65
+			ScanCode.F13, // 66
+			ScanCode.F14, // 67
+			ScanCode.F15, // 68
+			ScanCode.Grave, // 69
+			ScanCode.Home, // 70
+			ScanCode.Insert, // 71
+			ScanCode.Kana, // 72
+			ScanCode.Kanji, // 73
+			ScanCode.LBracket, // 74
+			ScanCode.LControl, // 75
+			ScanCode.Left, // 76
+			ScanCode.LMenu, // 77
+			ScanCode.LShift, // 78
+			ScanCode.LWin, // 79
+			ScanCode.Mail, // 80
+			ScanCode.MediaSelect, // 81
+			ScanCode.MediaStop, // 82
+			ScanCode.Minus, // 83
+			ScanCode.Mute, // 84
+			ScanCode.MyComputer, // 85
+			ScanCode.NextTrack, // 86
+			ScanCode.NoConvert, // 87
+			ScanCode.NumLock, // 88
+			ScanCode.NumPad0, // 89
+			ScanCode.NumPad1, // 90
+			ScanCode.NumPad2, // 91
+			ScanCode.NumPad3, // 92
+			ScanCode.NumPad4, // 93
+			ScanCode.NumPad5, // 94
+			ScanCode.NumPad6, // 95
+			ScanCode.NumPad7, // 96
+			ScanCode.NumPad8, // 97
+			ScanCode.NumPad9, // 98
+			ScanCode.NumPadComma, // 99
+			ScanCode.NumPadEnter, // 100
+			ScanCode.NumPadEquals, // 101
+			ScanCode.Subtract, // 102
+			ScanCode.Decimal, // 103
+			ScanCode.Add, // 104
+			ScanCode.Divide, // 105
+			ScanCode.Multiply, // 106
+			ScanCode.Oem_102, // 107
+			ScanCode.Next, // 108
+			ScanCode.Prior, // 109
+			ScanCode.Pause, // 110
+			ScanCode.Period, // 111
+			ScanCode.PlayPause, // 112
+			ScanCode.Power, // 113
+			ScanCode.PrevTrack, // 114
+			ScanCode.RBracket, // 115
+			ScanCode.RControl, // 116
+			ScanCode.Return, // 117
+			ScanCode.Right, // 118
+			ScanCode.RMenu, // 119
+			ScanCode.RShift, // 120
+			ScanCode.RWin, // 121
+			ScanCode.Scroll, // 122
+			ScanCode.Semicolon, // 123
+			ScanCode.Slash, // 124
+			ScanCode.Sleep, // 125
+			ScanCode.Space, // 126
+			ScanCode.Stop, // 127
+			ScanCode.SysRq, // 128
+			ScanCode.Tab, // 129
+			ScanCode.Underline, // 130
+			ScanCode.Unlabeled, // 131
+			ScanCode.Up, // 132
+			ScanCode.VolumeDown, // 133
+			ScanCode.VolumeUp, // 134
+			ScanCode.Wake, // 135
+			ScanCode.WebBack, // 136
+			ScanCode.WebFavorites, // 137
+			ScanCode.WebForward, // 138
+			ScanCode.WebHome, // 139
+			ScanCode.WebRefresh, // 140
+			ScanCode.WebSearch, // 141
+			ScanCode.WebStop, // 142
+			ScanCode.Yen, // 143
+			0 // 144
+		};
+
+		private static readonly Dictionary<ScanCode, Key> ScanCodeToSlimDXKey =
+			SlimDXScanCodeMap
+				.Select((n, i) => new { Value = n, Index = i })
+				.ToDictionary(n => n.Value, n => (Key)n.Index);
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/LogWindow.Designer.cs b/BizHawk.Client.EmuHawk/LogWindow.Designer.cs
index fe03b76c7a..1b681d0bf9 100644
--- a/BizHawk.Client.EmuHawk/LogWindow.Designer.cs
+++ b/BizHawk.Client.EmuHawk/LogWindow.Designer.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Client.EmuHawk
+using System.Windows.Forms;
+
+namespace BizHawk.Client.EmuHawk
 {
 	partial class LogWindow
 	{
@@ -34,7 +36,7 @@
 			this.buttonCopy = new System.Windows.Forms.Button();
 			this.buttonCopyAll = new System.Windows.Forms.Button();
 			this.AddToGameDbBtn = new System.Windows.Forms.Button();
-			this.virtualListView1 = new BizHawk.Client.EmuHawk.VirtualListView();
+			this.virtualListView1 = new System.Windows.Forms.ListView();
 			this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.tableLayoutPanel1.SuspendLayout();
 			this.SuspendLayout();
@@ -118,23 +120,20 @@
 			// 
 			// virtualListView1
 			// 
-			this.virtualListView1.BlazingFast = false;
 			this.virtualListView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader1});
 			this.virtualListView1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.virtualListView1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.virtualListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
-			this.virtualListView1.ItemCount = 0;
+			this.virtualListView1.VirtualListSize = 0;
 			this.virtualListView1.Location = new System.Drawing.Point(0, 0);
 			this.virtualListView1.Name = "virtualListView1";
-			this.virtualListView1.SelectAllInProgress = false;
-			this.virtualListView1.selectedItem = -1;
 			this.virtualListView1.Size = new System.Drawing.Size(675, 367);
 			this.virtualListView1.TabIndex = 8;
 			this.virtualListView1.UseCompatibleStateImageBehavior = false;
 			this.virtualListView1.View = System.Windows.Forms.View.Details;
 			this.virtualListView1.VirtualMode = true;
-			this.virtualListView1.QueryItemText += new BizHawk.Client.EmuHawk.QueryItemTextHandler(this.virtualListView1_QueryItemText);
+			this.virtualListView1.RetrieveVirtualItem += new RetrieveVirtualItemEventHandler(this.virtualListView1_QueryItemText);
 			this.virtualListView1.ClientSizeChanged += new System.EventHandler(this.virtualListView1_ClientSizeChanged);
 			this.virtualListView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.virtualListView1_KeyDown);
 			// 
@@ -163,7 +162,7 @@
 		private System.Windows.Forms.Button btnClose;
 		private System.Windows.Forms.Button btnClear;
 		private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-		private VirtualListView virtualListView1;
+		private System.Windows.Forms.ListView virtualListView1;
 		private System.Windows.Forms.ColumnHeader columnHeader1;
 		private System.Windows.Forms.Button buttonCopy;
 		private System.Windows.Forms.Button buttonCopyAll;
diff --git a/BizHawk.Client.EmuHawk/LogWindow.cs b/BizHawk.Client.EmuHawk/LogWindow.cs
index af5d0d8968..212ec849d2 100644
--- a/BizHawk.Client.EmuHawk/LogWindow.cs
+++ b/BizHawk.Client.EmuHawk/LogWindow.cs
@@ -5,7 +5,6 @@ using System.IO;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Common.ReflectionExtensions;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.IEmulatorExtensions;
 using BizHawk.Client.Common;
@@ -40,7 +39,7 @@ namespace BizHawk.Client.EmuHawk
 				var ss = report.Split('\n');
 				foreach (var s in ss)
 					dlg.Lines.Add(s.TrimEnd('\r'));
-				dlg.virtualListView1.ItemCount = ss.Length;
+				dlg.virtualListView1.VirtualListSize = ss.Length;
 				dlg.Text = title;
 				dlg.btnClear.Visible = false;
 				dlg.ShowDialog(parent);
@@ -55,7 +54,7 @@ namespace BizHawk.Client.EmuHawk
 				if (!string.IsNullOrWhiteSpace(s))
 				{
 					Lines.Add(s.TrimEnd('\r'));
-					virtualListView1.ItemCount++;
+					virtualListView1.VirtualListSize++;
 				}
 			}
 		}
@@ -63,7 +62,7 @@ namespace BizHawk.Client.EmuHawk
 		private void btnClear_Click(object sender, EventArgs e)
 		{
 			Lines.Clear();
-			virtualListView1.ItemCount = 0;
+			virtualListView1.VirtualListSize = 0;
 			virtualListView1.SelectedIndices.Clear();
 		}
 
@@ -99,9 +98,9 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void virtualListView1_QueryItemText(int item, int subItem, out string text)
+		private void virtualListView1_QueryItemText(object sender, RetrieveVirtualItemEventArgs e)
 		{
-			text = Lines[item];
+			e.Item = new ListViewItem(Lines[e.ItemIndex]);
 		}
 
 		private void virtualListView1_ClientSizeChanged(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index 83c8c0544a..af23e02304 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -234,7 +234,6 @@
 			this.dummyExternalTool = new System.Windows.Forms.ToolStripMenuItem();
 			this.batchRunnerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.ExperimentalToolsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.AutoHawkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.NewHexEditorMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.NESSubMenu = new System.Windows.Forms.ToolStripMenuItem();
 			this.coreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -496,42 +495,42 @@
 			// 
 			this.MainformMenu.ClickThrough = true;
 			this.MainformMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FileSubMenu,
-            this.EmulationSubMenu,
-            this.ViewSubMenu,
-            this.ConfigSubMenu,
-            this.ToolsSubMenu,
-            this.NESSubMenu,
-            this.PCESubMenu,
-            this.SMSSubMenu,
-            this.TI83SubMenu,
-            this.AtariSubMenu,
-            this.A7800SubMenu,
-            this.GBSubMenu,
-            this.GBASubMenu,
-            this.PSXSubMenu,
-            this.SNESSubMenu,
-            this.ColecoSubMenu,
-            this.N64SubMenu,
-            this.SaturnSubMenu,
-            this.DGBSubMenu,
-            this.DGBHawkSubMenu,
+			this.FileSubMenu,
+			this.EmulationSubMenu,
+			this.ViewSubMenu,
+			this.ConfigSubMenu,
+			this.ToolsSubMenu,
+			this.NESSubMenu,
+			this.PCESubMenu,
+			this.SMSSubMenu,
+			this.TI83SubMenu,
+			this.AtariSubMenu,
+			this.A7800SubMenu,
+			this.GBSubMenu,
+			this.GBASubMenu,
+			this.PSXSubMenu,
+			this.SNESSubMenu,
+			this.ColecoSubMenu,
+			this.N64SubMenu,
+			this.SaturnSubMenu,
+			this.DGBSubMenu,
+			this.DGBHawkSubMenu,
 			this.GB3xSubMenu,
 			this.GB4xSubMenu,
 			this.GGLSubMenu,
-            this.GenesisSubMenu,
-            this.wonderSwanToolStripMenuItem,
-            this.AppleSubMenu,
-            this.C64SubMenu,
-            this.IntvSubMenu,
-            this.sNESToolStripMenuItem,
-            this.pCFXToolStripMenuItem,
-            this.virtualBoyToolStripMenuItem,
-            this.neoGeoPocketToolStripMenuItem,
-            this.zXSpectrumToolStripMenuItem,
+			this.GenesisSubMenu,
+			this.wonderSwanToolStripMenuItem,
+			this.AppleSubMenu,
+			this.C64SubMenu,
+			this.IntvSubMenu,
+			this.sNESToolStripMenuItem,
+			this.pCFXToolStripMenuItem,
+			this.virtualBoyToolStripMenuItem,
+			this.neoGeoPocketToolStripMenuItem,
+			this.zXSpectrumToolStripMenuItem,
 			this.VectrexSubMenu,
-            this.HelpSubMenu,
-            this.amstradCPCToolStripMenuItem});
+			this.HelpSubMenu,
+			this.amstradCPCToolStripMenuItem});
 			this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
 			this.MainformMenu.Location = new System.Drawing.Point(0, 0);
 			this.MainformMenu.Name = "MainformMenu";
@@ -545,21 +544,21 @@
 			// FileSubMenu
 			// 
 			this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.OpenRomMenuItem,
-            this.RecentRomSubMenu,
-            this.OpenAdvancedMenuItem,
-            this.CloseRomMenuItem,
-            this.toolStripMenuItem1,
-            this.SaveStateSubMenu,
-            this.LoadStateSubMenu,
-            this.SaveSlotSubMenu,
-            this.SaveRAMSubMenu,
-            this.toolStripMenuItem2,
-            this.MovieSubMenu,
-            this.AVSubMenu,
-            this.ScreenshotSubMenu,
-            this.toolStripSeparator4,
-            this.ExitMenuItem});
+			this.OpenRomMenuItem,
+			this.RecentRomSubMenu,
+			this.OpenAdvancedMenuItem,
+			this.CloseRomMenuItem,
+			this.toolStripMenuItem1,
+			this.SaveStateSubMenu,
+			this.LoadStateSubMenu,
+			this.SaveSlotSubMenu,
+			this.SaveRAMSubMenu,
+			this.toolStripMenuItem2,
+			this.MovieSubMenu,
+			this.AVSubMenu,
+			this.ScreenshotSubMenu,
+			this.toolStripSeparator4,
+			this.ExitMenuItem});
 			this.FileSubMenu.Name = "FileSubMenu";
 			this.FileSubMenu.Size = new System.Drawing.Size(37, 19);
 			this.FileSubMenu.Text = "&File";
@@ -576,7 +575,7 @@
 			// RecentRomSubMenu
 			// 
 			this.RecentRomSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripSeparator3});
+			this.toolStripSeparator3});
 			this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
 			this.RecentRomSubMenu.Name = "RecentRomSubMenu";
 			this.RecentRomSubMenu.Size = new System.Drawing.Size(159, 22);
@@ -611,18 +610,18 @@
 			// SaveStateSubMenu
 			// 
 			this.SaveStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SaveState1MenuItem,
-            this.SaveState2MenuItem,
-            this.SaveState3MenuItem,
-            this.SaveState4MenuItem,
-            this.SaveState5MenuItem,
-            this.SaveState6MenuItem,
-            this.SaveState7MenuItem,
-            this.SaveState8MenuItem,
-            this.SaveState9MenuItem,
-            this.SaveState0MenuItem,
-            this.toolStripSeparator6,
-            this.SaveNamedStateMenuItem});
+			this.SaveState1MenuItem,
+			this.SaveState2MenuItem,
+			this.SaveState3MenuItem,
+			this.SaveState4MenuItem,
+			this.SaveState5MenuItem,
+			this.SaveState6MenuItem,
+			this.SaveState7MenuItem,
+			this.SaveState8MenuItem,
+			this.SaveState9MenuItem,
+			this.SaveState0MenuItem,
+			this.toolStripSeparator6,
+			this.SaveNamedStateMenuItem});
 			this.SaveStateSubMenu.Name = "SaveStateSubMenu";
 			this.SaveStateSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.SaveStateSubMenu.Text = "&Save State";
@@ -713,20 +712,20 @@
 			// LoadStateSubMenu
 			// 
 			this.LoadStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.LoadState1MenuItem,
-            this.LoadState2MenuItem,
-            this.LoadState3MenuItem,
-            this.LoadState4MenuItem,
-            this.LoadState5MenuItem,
-            this.LoadState6MenuItem,
-            this.LoadState7MenuItem,
-            this.LoadState8MenuItem,
-            this.LoadState9MenuItem,
-            this.LoadState0MenuItem,
-            this.toolStripSeparator7,
-            this.LoadNamedStateMenuItem,
-            this.toolStripSeparator21,
-            this.AutoloadLastSlotMenuItem});
+			this.LoadState1MenuItem,
+			this.LoadState2MenuItem,
+			this.LoadState3MenuItem,
+			this.LoadState4MenuItem,
+			this.LoadState5MenuItem,
+			this.LoadState6MenuItem,
+			this.LoadState7MenuItem,
+			this.LoadState8MenuItem,
+			this.LoadState9MenuItem,
+			this.LoadState0MenuItem,
+			this.toolStripSeparator7,
+			this.LoadNamedStateMenuItem,
+			this.toolStripSeparator21,
+			this.AutoloadLastSlotMenuItem});
 			this.LoadStateSubMenu.Name = "LoadStateSubMenu";
 			this.LoadStateSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.LoadStateSubMenu.Text = "&Load State";
@@ -829,21 +828,21 @@
 			// SaveSlotSubMenu
 			// 
 			this.SaveSlotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SelectSlot0MenuItem,
-            this.SelectSlot1MenuItem,
-            this.SelectSlot2MenuItem,
-            this.SelectSlot3MenuItem,
-            this.SelectSlot4MenuItem,
-            this.SelectSlot5MenuItem,
-            this.SelectSlot6MenuItem,
-            this.SelectSlot7MenuItem,
-            this.SelectSlot8MenuItem,
-            this.SelectSlot9MenuItem,
-            this.PreviousSlotMenuItem,
-            this.NextSlotMenuItem,
-            this.toolStripSeparator5,
-            this.SaveToCurrentSlotMenuItem,
-            this.LoadCurrentSlotMenuItem});
+			this.SelectSlot0MenuItem,
+			this.SelectSlot1MenuItem,
+			this.SelectSlot2MenuItem,
+			this.SelectSlot3MenuItem,
+			this.SelectSlot4MenuItem,
+			this.SelectSlot5MenuItem,
+			this.SelectSlot6MenuItem,
+			this.SelectSlot7MenuItem,
+			this.SelectSlot8MenuItem,
+			this.SelectSlot9MenuItem,
+			this.PreviousSlotMenuItem,
+			this.NextSlotMenuItem,
+			this.toolStripSeparator5,
+			this.SaveToCurrentSlotMenuItem,
+			this.LoadCurrentSlotMenuItem});
 			this.SaveSlotSubMenu.Name = "SaveSlotSubMenu";
 			this.SaveSlotSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.SaveSlotSubMenu.Text = "Save S&lot";
@@ -957,7 +956,7 @@
 			// SaveRAMSubMenu
 			// 
 			this.SaveRAMSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FlushSaveRAMMenuItem});
+			this.FlushSaveRAMMenuItem});
 			this.SaveRAMSubMenu.Name = "SaveRAMSubMenu";
 			this.SaveRAMSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.SaveRAMSubMenu.Text = "Save &RAM";
@@ -978,21 +977,21 @@
 			// MovieSubMenu
 			// 
 			this.MovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ReadonlyMenuItem,
-            this.toolStripSeparator15,
-            this.RecentMovieSubMenu,
-            this.RecordMovieMenuItem,
-            this.PlayMovieMenuItem,
-            this.StopMovieMenuItem,
-            this.PlayFromBeginningMenuItem,
-            this.ImportMoviesMenuItem,
-            this.SaveMovieMenuItem,
-            this.SaveMovieAsMenuItem,
-            this.StopMovieWithoutSavingMenuItem,
-            this.toolStripSeparator14,
-            this.AutomaticallyBackupMoviesMenuItem,
-            this.FullMovieLoadstatesMenuItem,
-            this.MovieEndSubMenu});
+			this.ReadonlyMenuItem,
+			this.toolStripSeparator15,
+			this.RecentMovieSubMenu,
+			this.RecordMovieMenuItem,
+			this.PlayMovieMenuItem,
+			this.StopMovieMenuItem,
+			this.PlayFromBeginningMenuItem,
+			this.ImportMoviesMenuItem,
+			this.SaveMovieMenuItem,
+			this.SaveMovieAsMenuItem,
+			this.StopMovieWithoutSavingMenuItem,
+			this.toolStripSeparator14,
+			this.AutomaticallyBackupMoviesMenuItem,
+			this.FullMovieLoadstatesMenuItem,
+			this.MovieEndSubMenu});
 			this.MovieSubMenu.Name = "MovieSubMenu";
 			this.MovieSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.MovieSubMenu.Text = "&Movie";
@@ -1014,7 +1013,7 @@
 			// RecentMovieSubMenu
 			// 
 			this.RecentMovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripSeparator16});
+			this.toolStripSeparator16});
 			this.RecentMovieSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
 			this.RecentMovieSubMenu.Name = "RecentMovieSubMenu";
 			this.RecentMovieSubMenu.Size = new System.Drawing.Size(231, 22);
@@ -1112,10 +1111,10 @@
 			// MovieEndSubMenu
 			// 
 			this.MovieEndSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.MovieEndFinishMenuItem,
-            this.MovieEndRecordMenuItem,
-            this.MovieEndStopMenuItem,
-            this.MovieEndPauseMenuItem});
+			this.MovieEndFinishMenuItem,
+			this.MovieEndRecordMenuItem,
+			this.MovieEndStopMenuItem,
+			this.MovieEndPauseMenuItem});
 			this.MovieEndSubMenu.Name = "MovieEndSubMenu";
 			this.MovieEndSubMenu.Size = new System.Drawing.Size(231, 22);
 			this.MovieEndSubMenu.Text = "On Movie End";
@@ -1152,12 +1151,12 @@
 			// AVSubMenu
 			// 
 			this.AVSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.RecordAVMenuItem,
-            this.ConfigAndRecordAVMenuItem,
-            this.StopAVIMenuItem,
-            this.toolStripSeparator19,
-            this.CaptureOSDMenuItem,
-            this.SynclessRecordingMenuItem});
+			this.RecordAVMenuItem,
+			this.ConfigAndRecordAVMenuItem,
+			this.StopAVIMenuItem,
+			this.toolStripSeparator19,
+			this.CaptureOSDMenuItem,
+			this.SynclessRecordingMenuItem});
 			this.AVSubMenu.Name = "AVSubMenu";
 			this.AVSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.AVSubMenu.Text = "&AVI/WAV";
@@ -1209,12 +1208,12 @@
 			// ScreenshotSubMenu
 			// 
 			this.ScreenshotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ScreenshotMenuItem,
-            this.ScreenshotAsMenuItem,
-            this.ScreenshotClipboardMenuItem,
-            this.ScreenshotClientClipboardMenuItem,
-            this.toolStripSeparator20,
-            this.ScreenshotCaptureOSDMenuItem1});
+			this.ScreenshotMenuItem,
+			this.ScreenshotAsMenuItem,
+			this.ScreenshotClipboardMenuItem,
+			this.ScreenshotClientClipboardMenuItem,
+			this.toolStripSeparator20,
+			this.ScreenshotCaptureOSDMenuItem1});
 			this.ScreenshotSubMenu.Name = "ScreenshotSubMenu";
 			this.ScreenshotSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.ScreenshotSubMenu.Text = "Scree&nshot";
@@ -1277,11 +1276,11 @@
 			// EmulationSubMenu
 			// 
 			this.EmulationSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.PauseMenuItem,
-            this.RebootCoreMenuItem,
-            this.toolStripSeparator1,
-            this.SoftResetMenuItem,
-            this.HardResetMenuItem});
+			this.PauseMenuItem,
+			this.RebootCoreMenuItem,
+			this.toolStripSeparator1,
+			this.SoftResetMenuItem,
+			this.HardResetMenuItem});
 			this.EmulationSubMenu.Name = "EmulationSubMenu";
 			this.EmulationSubMenu.Size = new System.Drawing.Size(73, 19);
 			this.EmulationSubMenu.Text = "&Emulation";
@@ -1325,19 +1324,19 @@
 			// ViewSubMenu
 			// 
 			this.ViewSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.WindowSizeSubMenu,
-            this.SwitchToFullscreenMenuItem,
-            this.toolStripSeparator2,
-            this.DisplayFPSMenuItem,
-            this.DisplayFrameCounterMenuItem,
-            this.DisplayLagCounterMenuItem,
-            this.DisplayInputMenuItem,
-            this.DisplayRerecordCountMenuItem,
-            this.DisplaySubtitlesMenuItem,
-            this.toolStripMenuItem4,
-            this.DisplayStatusBarMenuItem,
-            this.DisplayMessagesMenuItem,
-            this.DisplayLogWindowMenuItem});
+			this.WindowSizeSubMenu,
+			this.SwitchToFullscreenMenuItem,
+			this.toolStripSeparator2,
+			this.DisplayFPSMenuItem,
+			this.DisplayFrameCounterMenuItem,
+			this.DisplayLagCounterMenuItem,
+			this.DisplayInputMenuItem,
+			this.DisplayRerecordCountMenuItem,
+			this.DisplaySubtitlesMenuItem,
+			this.toolStripMenuItem4,
+			this.DisplayStatusBarMenuItem,
+			this.DisplayMessagesMenuItem,
+			this.DisplayLogWindowMenuItem});
 			this.ViewSubMenu.Name = "ViewSubMenu";
 			this.ViewSubMenu.Size = new System.Drawing.Size(44, 19);
 			this.ViewSubMenu.Text = "&View";
@@ -1346,12 +1345,12 @@
 			// WindowSizeSubMenu
 			// 
 			this.WindowSizeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.x1MenuItem,
-            this.x2MenuItem,
-            this.x3MenuItem,
-            this.x4MenuItem,
-            this.x5MenuItem,
-            this.mzMenuItem});
+			this.x1MenuItem,
+			this.x2MenuItem,
+			this.x3MenuItem,
+			this.x4MenuItem,
+			this.x5MenuItem,
+			this.mzMenuItem});
 			this.WindowSizeSubMenu.Name = "WindowSizeSubMenu";
 			this.WindowSizeSubMenu.Size = new System.Drawing.Size(198, 22);
 			this.WindowSizeSubMenu.Text = "&Window Size";
@@ -1483,27 +1482,27 @@
 			// ConfigSubMenu
 			// 
 			this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ControllersMenuItem,
-            this.HotkeysMenuItem,
-            this.DisplayConfigMenuItem,
-            this.SoundMenuItem,
-            this.PathsMenuItem,
-            this.FirmwaresMenuItem,
-            this.MessagesMenuItem,
-            this.AutofireMenuItem,
-            this.RewindOptionsMenuItem,
-            this.extensionsToolStripMenuItem,
-            this.ClientOptionsMenuItem,
-            this.ProfilesMenuItem,
-            this.toolStripSeparator9,
-            this.SpeedSkipSubMenu,
-            this.KeyPrioritySubMenu,
-            this.CoresSubMenu,
-            this.toolStripSeparator10,
-            this.SaveConfigMenuItem,
-            this.SaveConfigAsMenuItem,
-            this.LoadConfigMenuItem,
-            this.LoadConfigFromMenuItem});
+			this.ControllersMenuItem,
+			this.HotkeysMenuItem,
+			this.DisplayConfigMenuItem,
+			this.SoundMenuItem,
+			this.PathsMenuItem,
+			this.FirmwaresMenuItem,
+			this.MessagesMenuItem,
+			this.AutofireMenuItem,
+			this.RewindOptionsMenuItem,
+			this.extensionsToolStripMenuItem,
+			this.ClientOptionsMenuItem,
+			this.ProfilesMenuItem,
+			this.toolStripSeparator9,
+			this.SpeedSkipSubMenu,
+			this.KeyPrioritySubMenu,
+			this.CoresSubMenu,
+			this.toolStripSeparator10,
+			this.SaveConfigMenuItem,
+			this.SaveConfigAsMenuItem,
+			this.LoadConfigMenuItem,
+			this.LoadConfigFromMenuItem});
 			this.ConfigSubMenu.Name = "ConfigSubMenu";
 			this.ConfigSubMenu.Size = new System.Drawing.Size(55, 19);
 			this.ConfigSubMenu.Text = "&Config";
@@ -1611,23 +1610,23 @@
 			// SpeedSkipSubMenu
 			// 
 			this.SpeedSkipSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ClockThrottleMenuItem,
-            this.AudioThrottleMenuItem,
-            this.VsyncThrottleMenuItem,
-            this.toolStripSeparator27,
-            this.VsyncEnabledMenuItem,
-            this.toolStripMenuItem3,
-            this.miUnthrottled,
-            this.MinimizeSkippingMenuItem,
-            this.NeverSkipMenuItem,
-            this.toolStripMenuItem17,
-            this.toolStripMenuItem5,
-            this.Speed50MenuItem,
-            this.Speed75MenuItem,
-            this.Speed100MenuItem,
-            this.Speed150MenuItem,
-            this.Speed200MenuItem,
-            this.Speed400MenuItem});
+			this.ClockThrottleMenuItem,
+			this.AudioThrottleMenuItem,
+			this.VsyncThrottleMenuItem,
+			this.toolStripSeparator27,
+			this.VsyncEnabledMenuItem,
+			this.toolStripMenuItem3,
+			this.miUnthrottled,
+			this.MinimizeSkippingMenuItem,
+			this.NeverSkipMenuItem,
+			this.toolStripMenuItem17,
+			this.toolStripMenuItem5,
+			this.Speed50MenuItem,
+			this.Speed75MenuItem,
+			this.Speed100MenuItem,
+			this.Speed150MenuItem,
+			this.Speed200MenuItem,
+			this.Speed400MenuItem});
 			this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu";
 			this.SpeedSkipSubMenu.Size = new System.Drawing.Size(180, 22);
 			this.SpeedSkipSubMenu.Text = "Speed/Skip";
@@ -1695,15 +1694,15 @@
 			// toolStripMenuItem17
 			// 
 			this.toolStripMenuItem17.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.Frameskip1MenuItem,
-            this.Frameskip2MenuItem,
-            this.Frameskip3MenuItem,
-            this.Frameskip4MenuItem,
-            this.Frameskip5MenuItem,
-            this.Frameskip6MenuItem,
-            this.Frameskip7MenuItem,
-            this.Frameskip8MenuItem,
-            this.Frameskip9MenuItem});
+			this.Frameskip1MenuItem,
+			this.Frameskip2MenuItem,
+			this.Frameskip3MenuItem,
+			this.Frameskip4MenuItem,
+			this.Frameskip5MenuItem,
+			this.Frameskip6MenuItem,
+			this.Frameskip7MenuItem,
+			this.Frameskip8MenuItem,
+			this.Frameskip9MenuItem});
 			this.toolStripMenuItem17.Name = "toolStripMenuItem17";
 			this.toolStripMenuItem17.Size = new System.Drawing.Size(202, 22);
 			this.toolStripMenuItem17.Text = "Skip 1..9";
@@ -1821,9 +1820,9 @@
 			// KeyPrioritySubMenu
 			// 
 			this.KeyPrioritySubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.BothHkAndControllerMenuItem,
-            this.InputOverHkMenuItem,
-            this.HkOverInputMenuItem});
+			this.BothHkAndControllerMenuItem,
+			this.InputOverHkMenuItem,
+			this.HkOverInputMenuItem});
 			this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu";
 			this.KeyPrioritySubMenu.Size = new System.Drawing.Size(180, 22);
 			this.KeyPrioritySubMenu.Text = "Key Priority";
@@ -1853,17 +1852,17 @@
 			// CoresSubMenu
 			// 
 			this.CoresSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.NesCoreSubMenu,
-            this.CoreSNESSubMenu,
-            this.GbaCoreSubMenu,
-            this.SGBCoreSubmenu,
-            this.GBCoreSubmenu,
-            this.GBInSGBMenuItem,
-            this.toolStripMenuItem16,
-            this.allowGameDBCoreOverridesToolStripMenuItem,
-            this.toolStripSeparator8,
-            this.N64VideoPluginSettingsMenuItem,
-            this.setLibretroCoreToolStripMenuItem});
+			this.NesCoreSubMenu,
+			this.CoreSNESSubMenu,
+			this.GbaCoreSubMenu,
+			this.SGBCoreSubmenu,
+			this.GBCoreSubmenu,
+			this.GBInSGBMenuItem,
+			this.toolStripMenuItem16,
+			this.allowGameDBCoreOverridesToolStripMenuItem,
+			this.toolStripSeparator8,
+			this.N64VideoPluginSettingsMenuItem,
+			this.setLibretroCoreToolStripMenuItem});
 			this.CoresSubMenu.Name = "CoresSubMenu";
 			this.CoresSubMenu.Size = new System.Drawing.Size(180, 22);
 			this.CoresSubMenu.Text = "Cores";
@@ -1872,10 +1871,10 @@
 			// NesCoreSubMenu
 			// 
 			this.NesCoreSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.QuicknesCoreMenuItem,
-            this.NesCoreMenuItem,
-            this.toolStripSeparator38,
-            this.SubNesHawkMenuItem});
+			this.QuicknesCoreMenuItem,
+			this.NesCoreMenuItem,
+			this.toolStripSeparator38,
+			this.SubNesHawkMenuItem});
 			this.NesCoreSubMenu.Name = "NesCoreSubMenu";
 			this.NesCoreSubMenu.Size = new System.Drawing.Size(239, 22);
 			this.NesCoreSubMenu.Text = "NES";
@@ -1910,8 +1909,8 @@
 			// CoreSNESSubMenu
 			// 
 			this.CoreSNESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.Coresnes9xMenuItem,
-            this.CorebsnesMenuItem});
+			this.Coresnes9xMenuItem,
+			this.CorebsnesMenuItem});
 			this.CoreSNESSubMenu.Name = "CoreSNESSubMenu";
 			this.CoreSNESSubMenu.Size = new System.Drawing.Size(239, 22);
 			this.CoreSNESSubMenu.Text = "SNES";
@@ -1934,8 +1933,8 @@
 			// GbaCoreSubMenu
 			// 
 			this.GbaCoreSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.VbaNextCoreMenuItem,
-            this.MgbaCoreMenuItem});
+			this.VbaNextCoreMenuItem,
+			this.MgbaCoreMenuItem});
 			this.GbaCoreSubMenu.Name = "GbaCoreSubMenu";
 			this.GbaCoreSubMenu.Size = new System.Drawing.Size(239, 22);
 			this.GbaCoreSubMenu.Text = "GBA";
@@ -1958,8 +1957,8 @@
 			// SGBCoreSubmenu
 			// 
 			this.SGBCoreSubmenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SgbBsnesMenuItem,
-            this.SgbSameBoyMenuItem});
+			this.SgbBsnesMenuItem,
+			this.SgbSameBoyMenuItem});
 			this.SGBCoreSubmenu.Name = "SGBCoreSubmenu";
 			this.SGBCoreSubmenu.Size = new System.Drawing.Size(239, 22);
 			this.SGBCoreSubmenu.Text = "SGB";
@@ -1982,8 +1981,8 @@
 			// GBCoreSubmenu
 			// 
 			this.GBCoreSubmenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.GBGambatteMenuItem,
-            this.GBGBHawkMenuItem});
+			this.GBGambatteMenuItem,
+			this.GBGBHawkMenuItem});
 			this.GBCoreSubmenu.Name = "GBCoreSubmenu";
 			this.GBCoreSubmenu.Size = new System.Drawing.Size(239, 22);
 			this.GBCoreSubmenu.Text = "GB";
@@ -2080,27 +2079,27 @@
 			// ToolsSubMenu
 			// 
 			this.ToolsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ToolBoxMenuItem,
-            this.toolStripSeparator12,
-            this.RamWatchMenuItem,
-            this.RamSearchMenuItem,
-            this.LuaConsoleMenuItem,
-            this.TAStudioMenuItem,
-            this.HexEditorMenuItem,
-            this.TraceLoggerMenuItem,
-            this.DebuggerMenuItem,
-            this.CodeDataLoggerMenuItem,
-            this.MacroToolMenuItem,
-            this.VirtualPadMenuItem,
-            this.BasicBotMenuItem,
-            this.toolStripSeparator11,
-            this.CheatsMenuItem,
-            this.gameSharkConverterToolStripMenuItem,
-            this.toolStripSeparator29,
-            this.MultiDiskBundlerFileMenuItem,
-            this.externalToolToolStripMenuItem,
-            this.batchRunnerToolStripMenuItem,
-            this.ExperimentalToolsSubMenu});
+			this.ToolBoxMenuItem,
+			this.toolStripSeparator12,
+			this.RamWatchMenuItem,
+			this.RamSearchMenuItem,
+			this.LuaConsoleMenuItem,
+			this.TAStudioMenuItem,
+			this.HexEditorMenuItem,
+			this.TraceLoggerMenuItem,
+			this.DebuggerMenuItem,
+			this.CodeDataLoggerMenuItem,
+			this.MacroToolMenuItem,
+			this.VirtualPadMenuItem,
+			this.BasicBotMenuItem,
+			this.toolStripSeparator11,
+			this.CheatsMenuItem,
+			this.gameSharkConverterToolStripMenuItem,
+			this.toolStripSeparator29,
+			this.MultiDiskBundlerFileMenuItem,
+			this.externalToolToolStripMenuItem,
+			this.batchRunnerToolStripMenuItem,
+			this.ExperimentalToolsSubMenu});
 			this.ToolsSubMenu.Name = "ToolsSubMenu";
 			this.ToolsSubMenu.Size = new System.Drawing.Size(47, 19);
 			this.ToolsSubMenu.Text = "&Tools";
@@ -2242,7 +2241,7 @@
 			// externalToolToolStripMenuItem
 			// 
 			this.externalToolToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.dummyExternalTool});
+			this.dummyExternalTool});
 			this.externalToolToolStripMenuItem.Name = "externalToolToolStripMenuItem";
 			this.externalToolToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
 			this.externalToolToolStripMenuItem.Text = "External Tool";
@@ -2265,20 +2264,12 @@
 			// ExperimentalToolsSubMenu
 			// 
 			this.ExperimentalToolsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.AutoHawkMenuItem,
-            this.NewHexEditorMenuItem});
+			this.NewHexEditorMenuItem});
 			this.ExperimentalToolsSubMenu.Name = "ExperimentalToolsSubMenu";
 			this.ExperimentalToolsSubMenu.Size = new System.Drawing.Size(191, 22);
 			this.ExperimentalToolsSubMenu.Text = "Experimental Tools";
 			this.ExperimentalToolsSubMenu.DropDownOpened += new System.EventHandler(this.ExperimentalToolsSubMenu_DropDownOpened);
 			// 
-			// AutoHawkMenuItem
-			// 
-			this.AutoHawkMenuItem.Name = "AutoHawkMenuItem";
-			this.AutoHawkMenuItem.Size = new System.Drawing.Size(155, 22);
-			this.AutoHawkMenuItem.Text = "AutoHawk";
-			this.AutoHawkMenuItem.Click += new System.EventHandler(this.AutoHawkMenuItem_Click);
-			// 
 			// NewHexEditorMenuItem
 			// 
 			this.NewHexEditorMenuItem.Name = "NewHexEditorMenuItem";
@@ -2289,22 +2280,22 @@
 			// NESSubMenu
 			// 
 			this.NESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.coreToolStripMenuItem,
-            this.toolStripSeparator34,
-            this.NESPPUViewerMenuItem,
-            this.NESNametableViewerMenuItem,
-            this.NESGameGenieCodesMenuItem,
-            this.musicRipperToolStripMenuItem,
-            this.toolStripSeparator17,
-            this.NesControllerSettingsMenuItem,
-            this.NESGraphicSettingsMenuItem,
-            this.NESSoundChannelsMenuItem,
-            this.VSSettingsMenuItem,
-            this.MovieSettingsMenuItem,
-            this.toolStripSeparator22,
-            this.FDSControlsMenuItem,
-            this.VSControlsMenuItem,
-            this.barcodeReaderToolStripMenuItem});
+			this.coreToolStripMenuItem,
+			this.toolStripSeparator34,
+			this.NESPPUViewerMenuItem,
+			this.NESNametableViewerMenuItem,
+			this.NESGameGenieCodesMenuItem,
+			this.musicRipperToolStripMenuItem,
+			this.toolStripSeparator17,
+			this.NesControllerSettingsMenuItem,
+			this.NESGraphicSettingsMenuItem,
+			this.NESSoundChannelsMenuItem,
+			this.VSSettingsMenuItem,
+			this.MovieSettingsMenuItem,
+			this.toolStripSeparator22,
+			this.FDSControlsMenuItem,
+			this.VSControlsMenuItem,
+			this.barcodeReaderToolStripMenuItem});
 			this.NESSubMenu.Name = "NESSubMenu";
 			this.NESSubMenu.Size = new System.Drawing.Size(40, 19);
 			this.NESSubMenu.Text = "&NES";
@@ -2313,8 +2304,8 @@
 			// coreToolStripMenuItem
 			// 
 			this.coreToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.quickNESToolStripMenuItem,
-            this.nesHawkToolStripMenuItem});
+			this.quickNESToolStripMenuItem,
+			this.nesHawkToolStripMenuItem});
 			this.coreToolStripMenuItem.Name = "coreToolStripMenuItem";
 			this.coreToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
 			this.coreToolStripMenuItem.Text = "&Core";
@@ -2418,7 +2409,7 @@
 			// FDSControlsMenuItem
 			// 
 			this.FDSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FdsEjectDiskMenuItem});
+			this.FdsEjectDiskMenuItem});
 			this.FDSControlsMenuItem.Name = "FDSControlsMenuItem";
 			this.FDSControlsMenuItem.Size = new System.Drawing.Size(233, 22);
 			this.FDSControlsMenuItem.Text = "FDS Controls";
@@ -2434,9 +2425,9 @@
 			// VSControlsMenuItem
 			// 
 			this.VSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.VSInsertCoinP1MenuItem,
-            this.VSInsertCoinP2MenuItem,
-            this.VSServiceSwitchMenuItem});
+			this.VSInsertCoinP1MenuItem,
+			this.VSInsertCoinP2MenuItem,
+			this.VSServiceSwitchMenuItem});
 			this.VSControlsMenuItem.Name = "VSControlsMenuItem";
 			this.VSControlsMenuItem.Size = new System.Drawing.Size(233, 22);
 			this.VSControlsMenuItem.Text = "VS Controls";
@@ -2472,16 +2463,16 @@
 			// PCESubMenu
 			// 
 			this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.PceControllerSettingsMenuItem,
-            this.PCEGraphicsSettingsMenuItem,
-            this.toolStripSeparator32,
-            this.PCEBGViewerMenuItem,
-            this.PCEtileViewerToolStripMenuItem,
-            this.PceSoundDebuggerToolStripMenuItem,
-            this.toolStripSeparator25,
-            this.PCEAlwaysPerformSpriteLimitMenuItem,
-            this.PCEAlwaysEqualizeVolumesMenuItem,
-            this.PCEArcadeCardRewindEnableMenuItem});
+			this.PceControllerSettingsMenuItem,
+			this.PCEGraphicsSettingsMenuItem,
+			this.toolStripSeparator32,
+			this.PCEBGViewerMenuItem,
+			this.PCEtileViewerToolStripMenuItem,
+			this.PceSoundDebuggerToolStripMenuItem,
+			this.toolStripSeparator25,
+			this.PCEAlwaysPerformSpriteLimitMenuItem,
+			this.PCEAlwaysEqualizeVolumesMenuItem,
+			this.PCEArcadeCardRewindEnableMenuItem});
 			this.PCESubMenu.Name = "PCESubMenu";
 			this.PCESubMenu.Size = new System.Drawing.Size(40, 19);
 			this.PCESubMenu.Text = "&PCE";
@@ -2558,23 +2549,23 @@
 			// SMSSubMenu
 			// 
 			this.SMSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SMSregionToolStripMenuItem,
-            this.SMSdisplayToolStripMenuItem,
-            this.SMSControllerToolStripMenuItem,
-            this.SMStoolStripMenuItem2,
-            this.SMSenableBIOSToolStripMenuItem,
-            this.SMSEnableFMChipMenuItem,
-            this.SMSOverclockMenuItem,
-            this.SMSForceStereoMenuItem,
-            this.SMSSpriteLimitMenuItem,
-            this.SMSDisplayOverscanMenuItem,
-            this.SMSFix3DGameDisplayToolStripMenuItem,
-            this.ShowClippedRegionsMenuItem,
-            this.HighlightActiveDisplayRegionMenuItem,
-            this.SMSGraphicsSettingsMenuItem,
-            this.toolStripSeparator24,
-            this.SMSVDPViewerToolStripMenuItem,
-            this.GGGameGenieMenuItem});
+			this.SMSregionToolStripMenuItem,
+			this.SMSdisplayToolStripMenuItem,
+			this.SMSControllerToolStripMenuItem,
+			this.SMStoolStripMenuItem2,
+			this.SMSenableBIOSToolStripMenuItem,
+			this.SMSEnableFMChipMenuItem,
+			this.SMSOverclockMenuItem,
+			this.SMSForceStereoMenuItem,
+			this.SMSSpriteLimitMenuItem,
+			this.SMSDisplayOverscanMenuItem,
+			this.SMSFix3DGameDisplayToolStripMenuItem,
+			this.ShowClippedRegionsMenuItem,
+			this.HighlightActiveDisplayRegionMenuItem,
+			this.SMSGraphicsSettingsMenuItem,
+			this.toolStripSeparator24,
+			this.SMSVDPViewerToolStripMenuItem,
+			this.GGGameGenieMenuItem});
 			this.SMSSubMenu.Name = "SMSSubMenu";
 			this.SMSSubMenu.Size = new System.Drawing.Size(42, 19);
 			this.SMSSubMenu.Text = "&SMS";
@@ -2583,10 +2574,10 @@
 			// SMSregionToolStripMenuItem
 			// 
 			this.SMSregionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SMSregionExportToolStripMenuItem,
-            this.SMSregionJapanToolStripMenuItem,
-            this.SMSregionKoreaToolStripMenuItem,
-            this.SMSregionAutoToolStripMenuItem});
+			this.SMSregionExportToolStripMenuItem,
+			this.SMSregionJapanToolStripMenuItem,
+			this.SMSregionKoreaToolStripMenuItem,
+			this.SMSregionAutoToolStripMenuItem});
 			this.SMSregionToolStripMenuItem.Name = "SMSregionToolStripMenuItem";
 			this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(277, 22);
 			this.SMSregionToolStripMenuItem.Text = "Region";
@@ -2622,9 +2613,9 @@
 			// SMSdisplayToolStripMenuItem
 			// 
 			this.SMSdisplayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SMSdisplayNtscToolStripMenuItem,
-            this.SMSdisplayPalToolStripMenuItem,
-            this.SMSdisplayAutoToolStripMenuItem});
+			this.SMSdisplayNtscToolStripMenuItem,
+			this.SMSdisplayPalToolStripMenuItem,
+			this.SMSdisplayAutoToolStripMenuItem});
 			this.SMSdisplayToolStripMenuItem.Name = "SMSdisplayToolStripMenuItem";
 			this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(277, 22);
 			this.SMSdisplayToolStripMenuItem.Text = "Display Type";
@@ -2653,11 +2644,11 @@
 			// SMSControllerToolStripMenuItem
 			// 
 			this.SMSControllerToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SMSControllerStandardToolStripMenuItem,
-            this.SMSControllerPaddleToolStripMenuItem,
-            this.SMSControllerLightPhaserToolStripMenuItem,
-            this.SMSControllerSportsPadToolStripMenuItem,
-            this.SMSControllerKeyboardToolStripMenuItem});
+			this.SMSControllerStandardToolStripMenuItem,
+			this.SMSControllerPaddleToolStripMenuItem,
+			this.SMSControllerLightPhaserToolStripMenuItem,
+			this.SMSControllerSportsPadToolStripMenuItem,
+			this.SMSControllerKeyboardToolStripMenuItem});
 			this.SMSControllerToolStripMenuItem.Name = "SMSControllerToolStripMenuItem";
 			this.SMSControllerToolStripMenuItem.Size = new System.Drawing.Size(277, 22);
 			this.SMSControllerToolStripMenuItem.Text = "&Controller Type";
@@ -2794,11 +2785,11 @@
 			// TI83SubMenu
 			// 
 			this.TI83SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.KeypadMenuItem,
-            this.LoadTIFileMenuItem,
-            this.toolStripSeparator13,
-            this.AutoloadKeypadMenuItem,
-            this.paletteToolStripMenuItem});
+			this.KeypadMenuItem,
+			this.LoadTIFileMenuItem,
+			this.toolStripSeparator13,
+			this.AutoloadKeypadMenuItem,
+			this.paletteToolStripMenuItem});
 			this.TI83SubMenu.Name = "TI83SubMenu";
 			this.TI83SubMenu.Size = new System.Drawing.Size(41, 19);
 			this.TI83SubMenu.Text = "TI83";
@@ -2843,7 +2834,7 @@
 			// AtariSubMenu
 			// 
 			this.AtariSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.AtariSettingsToolStripMenuItem});
+			this.AtariSettingsToolStripMenuItem});
 			this.AtariSubMenu.Name = "AtariSubMenu";
 			this.AtariSubMenu.Size = new System.Drawing.Size(44, 19);
 			this.AtariSubMenu.Text = "&Atari";
@@ -2858,8 +2849,8 @@
 			// A7800SubMenu
 			// 
 			this.A7800SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.A7800ControllerSettingsMenuItem,
-            this.A7800FilterSettingsMenuItem});
+			this.A7800ControllerSettingsMenuItem,
+			this.A7800FilterSettingsMenuItem});
 			this.A7800SubMenu.Name = "A7800SubMenu";
 			this.A7800SubMenu.Size = new System.Drawing.Size(51, 19);
 			this.A7800SubMenu.Text = "&A7800";
@@ -2882,12 +2873,12 @@
 			// GBSubMenu
 			// 
 			this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.GBcoreSettingsToolStripMenuItem,
-            this.LoadGBInSGBMenuItem,
-            this.toolStripSeparator28,
-            this.GBGPUViewerMenuItem,
-            this.GBGameGenieMenuItem,
-            this.GBPrinterViewerMenuItem});
+			this.GBcoreSettingsToolStripMenuItem,
+			this.LoadGBInSGBMenuItem,
+			this.toolStripSeparator28,
+			this.GBGPUViewerMenuItem,
+			this.GBGameGenieMenuItem,
+			this.GBPrinterViewerMenuItem});
 			this.GBSubMenu.Name = "GBSubMenu";
 			this.GBSubMenu.Size = new System.Drawing.Size(34, 19);
 			this.GBSubMenu.Text = "&GB";
@@ -2936,10 +2927,10 @@
 			// GBASubMenu
 			// 
 			this.GBASubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.GBACoreSelectionSubMenu,
-            this.GBAcoresettingsToolStripMenuItem1,
-            this.toolStripSeparator33,
-            this.GbaGpuViewerMenuItem});
+			this.GBACoreSelectionSubMenu,
+			this.GBAcoresettingsToolStripMenuItem1,
+			this.toolStripSeparator33,
+			this.GbaGpuViewerMenuItem});
 			this.GBASubMenu.Name = "GBASubMenu";
 			this.GBASubMenu.Size = new System.Drawing.Size(42, 19);
 			this.GBASubMenu.Text = "GBA";
@@ -2947,8 +2938,8 @@
 			// GBACoreSelectionSubMenu
 			// 
 			this.GBACoreSelectionSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.GBAmGBAMenuItem,
-            this.GBAVBANextMenuItem});
+			this.GBAmGBAMenuItem,
+			this.GBAVBANextMenuItem});
 			this.GBACoreSelectionSubMenu.Name = "GBACoreSelectionSubMenu";
 			this.GBACoreSelectionSubMenu.Size = new System.Drawing.Size(135, 22);
 			this.GBACoreSelectionSubMenu.Text = "&Core";
@@ -2973,7 +2964,7 @@
 			this.GBAcoresettingsToolStripMenuItem1.Name = "GBAcoresettingsToolStripMenuItem1";
 			this.GBAcoresettingsToolStripMenuItem1.Size = new System.Drawing.Size(135, 22);
 			this.GBAcoresettingsToolStripMenuItem1.Text = "&Settings...";
-			this.GBAcoresettingsToolStripMenuItem1.Click += new System.EventHandler(this.GBAcoresettingsToolStripMenuItem1_Click);
+			this.GBAcoresettingsToolStripMenuItem1.Click += new System.EventHandler(this.GBACoreSettingsToolStripMenuItem_Click);
 			// 
 			// toolStripSeparator33
 			// 
@@ -2990,10 +2981,10 @@
 			// PSXSubMenu
 			// 
 			this.PSXSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.PSXControllerSettingsMenuItem,
-            this.PSXOptionsMenuItem,
-            this.PSXDiscControlsMenuItem,
-            this.PSXHashDiscsToolStripMenuItem});
+			this.PSXControllerSettingsMenuItem,
+			this.PSXOptionsMenuItem,
+			this.PSXDiscControlsMenuItem,
+			this.PSXHashDiscsToolStripMenuItem});
 			this.PSXSubMenu.Name = "PSXSubMenu";
 			this.PSXSubMenu.Size = new System.Drawing.Size(39, 19);
 			this.PSXSubMenu.Text = "PSX";
@@ -3031,12 +3022,12 @@
 			// SNESSubMenu
 			// 
 			this.SNESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SNESControllerConfigurationMenuItem,
-            this.toolStripSeparator18,
-            this.SnesGfxDebuggerMenuItem,
-            this.SnesGBInSGBMenuItem,
-            this.SnesGameGenieMenuItem,
-            this.SnesOptionsMenuItem});
+			this.SNESControllerConfigurationMenuItem,
+			this.toolStripSeparator18,
+			this.SnesGfxDebuggerMenuItem,
+			this.SnesGBInSGBMenuItem,
+			this.SnesGameGenieMenuItem,
+			this.SnesOptionsMenuItem});
 			this.SNESSubMenu.Name = "SNESSubMenu";
 			this.SNESSubMenu.Size = new System.Drawing.Size(46, 19);
 			this.SNESSubMenu.Text = "&SNES";
@@ -3087,10 +3078,10 @@
 			// ColecoSubMenu
 			// 
 			this.ColecoSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ColecoControllerSettingsMenuItem,
-            this.toolStripSeparator35,
-            this.ColecoSkipBiosMenuItem,
-            this.ColecoUseSGMMenuItem});
+			this.ColecoControllerSettingsMenuItem,
+			this.toolStripSeparator35,
+			this.ColecoSkipBiosMenuItem,
+			this.ColecoUseSGMMenuItem});
 			this.ColecoSubMenu.Name = "ColecoSubMenu";
 			this.ColecoSubMenu.Size = new System.Drawing.Size(56, 19);
 			this.ColecoSubMenu.Text = "&Coleco";
@@ -3126,12 +3117,12 @@
 			// N64SubMenu
 			// 
 			this.N64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.N64PluginSettingsMenuItem,
-            this.N64ControllerSettingsMenuItem,
-            this.toolStripSeparator23,
-            this.N64CircularAnalogRangeMenuItem,
-            this.MupenStyleLagMenuItem,
-            this.N64ExpansionSlotMenuItem});
+			this.N64PluginSettingsMenuItem,
+			this.N64ControllerSettingsMenuItem,
+			this.toolStripSeparator23,
+			this.N64CircularAnalogRangeMenuItem,
+			this.MupenStyleLagMenuItem,
+			this.N64ExpansionSlotMenuItem});
 			this.N64SubMenu.Name = "N64SubMenu";
 			this.N64SubMenu.Size = new System.Drawing.Size(40, 19);
 			this.N64SubMenu.Text = "N64";
@@ -3182,7 +3173,7 @@
 			// SaturnSubMenu
 			// 
 			this.SaturnSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SaturnPreferencesMenuItem});
+			this.SaturnPreferencesMenuItem});
 			this.SaturnSubMenu.Name = "SaturnSubMenu";
 			this.SaturnSubMenu.Size = new System.Drawing.Size(53, 19);
 			this.SaturnSubMenu.Text = "&Saturn";
@@ -3197,7 +3188,7 @@
 			// DGBSubMenu
 			// 
 			this.DGBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.DGBsettingsToolStripMenuItem});
+			this.DGBsettingsToolStripMenuItem});
 			this.DGBSubMenu.Name = "DGBSubMenu";
 			this.DGBSubMenu.Size = new System.Drawing.Size(59, 19);
 			this.DGBSubMenu.Text = "&GB Link";
@@ -3212,7 +3203,7 @@
 			// DGBHawkSubMenu
 			// 
 			this.DGBHawkSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.DGBHawksettingsToolStripMenuItem});
+			this.DGBHawksettingsToolStripMenuItem});
 			this.DGBHawkSubMenu.Name = "DGBHawkSubMenu";
 			this.DGBHawkSubMenu.Size = new System.Drawing.Size(59, 19);
 			this.DGBHawkSubMenu.Text = "&GB Link";
@@ -3257,7 +3248,7 @@
 			// GGLSubMenu
 			// 
 			this.GGLSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.GGLsettingsToolStripMenuItem});
+			this.GGLsettingsToolStripMenuItem});
 			this.GGLSubMenu.Name = "GGLSubMenu";
 			this.GGLSubMenu.Size = new System.Drawing.Size(60, 19);
 			this.GGLSubMenu.Text = "&GG Link";
@@ -3287,10 +3278,10 @@
 			// GenesisSubMenu
 			// 
 			this.GenesisSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.vDPViewerToolStripMenuItem,
-            this.GenesisGameGenieECDC,
-            this.toolStripSeparator26,
-            this.GenesisSettingsToolStripMenuItem});
+			this.vDPViewerToolStripMenuItem,
+			this.GenesisGameGenieECDC,
+			this.toolStripSeparator26,
+			this.GenesisSettingsToolStripMenuItem});
 			this.GenesisSubMenu.Name = "GenesisSubMenu";
 			this.GenesisSubMenu.Size = new System.Drawing.Size(59, 19);
 			this.GenesisSubMenu.Text = "&Genesis";
@@ -3324,7 +3315,7 @@
 			// wonderSwanToolStripMenuItem
 			// 
 			this.wonderSwanToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.settingsToolStripMenuItem});
+			this.settingsToolStripMenuItem});
 			this.wonderSwanToolStripMenuItem.Name = "wonderSwanToolStripMenuItem";
 			this.wonderSwanToolStripMenuItem.Size = new System.Drawing.Size(89, 19);
 			this.wonderSwanToolStripMenuItem.Text = "&WonderSwan";
@@ -3334,13 +3325,13 @@
 			this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
 			this.settingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
 			this.settingsToolStripMenuItem.Text = "&Settings...";
-			this.settingsToolStripMenuItem.Click += new System.EventHandler(this.WondersawnSettingsMenuItem_Click);
+			this.settingsToolStripMenuItem.Click += new System.EventHandler(this.WonderSwanSettingsMenuItem_Click);
 			// 
 			// AppleSubMenu
 			// 
 			this.AppleSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.AppleDisksSubMenu,
-            this.settingsToolStripMenuItem1});
+			this.AppleDisksSubMenu,
+			this.settingsToolStripMenuItem1});
 			this.AppleSubMenu.Name = "AppleSubMenu";
 			this.AppleSubMenu.Size = new System.Drawing.Size(50, 19);
 			this.AppleSubMenu.Text = "Apple";
@@ -3349,7 +3340,7 @@
 			// AppleDisksSubMenu
 			// 
 			this.AppleDisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripSeparator31});
+			this.toolStripSeparator31});
 			this.AppleDisksSubMenu.Name = "AppleDisksSubMenu";
 			this.AppleDisksSubMenu.Size = new System.Drawing.Size(125, 22);
 			this.AppleDisksSubMenu.Text = "Disks";
@@ -3370,8 +3361,8 @@
 			// C64SubMenu
 			// 
 			this.C64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.C64DisksSubMenu,
-            this.C64SettingsMenuItem});
+			this.C64DisksSubMenu,
+			this.C64SettingsMenuItem});
 			this.C64SubMenu.Name = "C64SubMenu";
 			this.C64SubMenu.Size = new System.Drawing.Size(39, 19);
 			this.C64SubMenu.Text = "&C64";
@@ -3380,7 +3371,7 @@
 			// C64DisksSubMenu
 			// 
 			this.C64DisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripSeparator36});
+			this.toolStripSeparator36});
 			this.C64DisksSubMenu.Name = "C64DisksSubMenu";
 			this.C64DisksSubMenu.Size = new System.Drawing.Size(125, 22);
 			this.C64DisksSubMenu.Text = "Disks";
@@ -3401,11 +3392,11 @@
 			// IntvSubMenu
 			// 
 			this.IntvSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.IntVControllerSettingsMenuItem});
+			this.IntVControllerSettingsMenuItem});
 			this.IntvSubMenu.Name = "IntvSubMenu";
 			this.IntvSubMenu.Size = new System.Drawing.Size(39, 19);
 			this.IntvSubMenu.Text = "&Intv";
-			this.IntvSubMenu.DropDownOpened += new System.EventHandler(this.IntvSubMenu_DropDownOpened);
+			this.IntvSubMenu.DropDownOpened += new System.EventHandler(this.IntVSubMenu_DropDownOpened);
 			// 
 			// IntVControllerSettingsMenuItem
 			// 
@@ -3418,7 +3409,7 @@
 			// sNESToolStripMenuItem
 			// 
 			this.sNESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.preferencesToolStripMenuItem});
+			this.preferencesToolStripMenuItem});
 			this.sNESToolStripMenuItem.Name = "sNESToolStripMenuItem";
 			this.sNESToolStripMenuItem.Size = new System.Drawing.Size(46, 19);
 			this.sNESToolStripMenuItem.Text = "&SNES";
@@ -3428,12 +3419,12 @@
 			this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem";
 			this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
 			this.preferencesToolStripMenuItem.Text = "Preferences...";
-			this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.preferencesToolStripMenuItem_Click);
+			this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.Snes9xSettingsMenuItem_Click);
 			// 
 			// pCFXToolStripMenuItem
 			// 
 			this.pCFXToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.preferencesToolStripMenuItem3});
+			this.preferencesToolStripMenuItem3});
 			this.pCFXToolStripMenuItem.Name = "pCFXToolStripMenuItem";
 			this.pCFXToolStripMenuItem.Size = new System.Drawing.Size(52, 19);
 			this.pCFXToolStripMenuItem.Text = "&PC-FX";
@@ -3443,12 +3434,12 @@
 			this.preferencesToolStripMenuItem3.Name = "preferencesToolStripMenuItem3";
 			this.preferencesToolStripMenuItem3.Size = new System.Drawing.Size(144, 22);
 			this.preferencesToolStripMenuItem3.Text = "Preferences...";
-			this.preferencesToolStripMenuItem3.Click += new System.EventHandler(this.preferencesToolStripMenuItem3_Click);
+			this.preferencesToolStripMenuItem3.Click += new System.EventHandler(this.PCFXSettingsMenuItem_Click);
 			// 
 			// virtualBoyToolStripMenuItem
 			// 
 			this.virtualBoyToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.preferencesToolStripMenuItem1});
+			this.preferencesToolStripMenuItem1});
 			this.virtualBoyToolStripMenuItem.Name = "virtualBoyToolStripMenuItem";
 			this.virtualBoyToolStripMenuItem.Size = new System.Drawing.Size(73, 19);
 			this.virtualBoyToolStripMenuItem.Text = "&VirtualBoy";
@@ -3458,12 +3449,12 @@
 			this.preferencesToolStripMenuItem1.Name = "preferencesToolStripMenuItem1";
 			this.preferencesToolStripMenuItem1.Size = new System.Drawing.Size(144, 22);
 			this.preferencesToolStripMenuItem1.Text = "Preferences...";
-			this.preferencesToolStripMenuItem1.Click += new System.EventHandler(this.preferencesToolStripMenuItem1_Click);
+			this.preferencesToolStripMenuItem1.Click += new System.EventHandler(this.VirtualBoySettingsMenuItem_Click);
 			// 
 			// neoGeoPocketToolStripMenuItem
 			// 
 			this.neoGeoPocketToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.preferencesToolStripMenuItem2});
+			this.preferencesToolStripMenuItem2});
 			this.neoGeoPocketToolStripMenuItem.Name = "neoGeoPocketToolStripMenuItem";
 			this.neoGeoPocketToolStripMenuItem.Size = new System.Drawing.Size(101, 19);
 			this.neoGeoPocketToolStripMenuItem.Text = "&NeoGeo Pocket";
@@ -3473,21 +3464,20 @@
 			this.preferencesToolStripMenuItem2.Name = "preferencesToolStripMenuItem2";
 			this.preferencesToolStripMenuItem2.Size = new System.Drawing.Size(144, 22);
 			this.preferencesToolStripMenuItem2.Text = "Preferences...";
-			this.preferencesToolStripMenuItem2.Click += new System.EventHandler(this.preferencesToolStripMenuItem2_Click);
+			this.preferencesToolStripMenuItem2.Click += new System.EventHandler(this.NeoGeoSettingsMenuItem_Click);
 			// 
 			// zXSpectrumToolStripMenuItem
 			// 
 			this.zXSpectrumToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ZXSpectrumCoreEmulationSettingsMenuItem,
-            this.ZXSpectrumControllerConfigurationMenuItem,
-            this.ZXSpectrumAudioSettingsMenuItem,
-            this.ZXSpectrumNonSyncSettingsMenuItem,
-            this.ZXSpectrumPokeMemoryMenuItem,
-            this.ZXSpectrumMediaMenuItem});
+			this.ZXSpectrumCoreEmulationSettingsMenuItem,
+			this.ZXSpectrumControllerConfigurationMenuItem,
+			this.ZXSpectrumAudioSettingsMenuItem,
+			this.ZXSpectrumNonSyncSettingsMenuItem,
+			this.ZXSpectrumPokeMemoryMenuItem,
+			this.ZXSpectrumMediaMenuItem});
 			this.zXSpectrumToolStripMenuItem.Name = "zXSpectrumToolStripMenuItem";
 			this.zXSpectrumToolStripMenuItem.Size = new System.Drawing.Size(87, 19);
 			this.zXSpectrumToolStripMenuItem.Text = "ZX Spectrum";
-			this.zXSpectrumToolStripMenuItem.DropDownOpened += new System.EventHandler(this.zXSpectrumToolStripMenuItem_DropDownOpened);
 			// 
 			// ZXSpectrumCoreEmulationSettingsMenuItem
 			// 
@@ -3527,9 +3517,9 @@
 			// ZXSpectrumMediaMenuItem
 			// 
 			this.ZXSpectrumMediaMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ZXSpectrumTapesSubMenu,
-            this.ZXSpectrumDisksSubMenu,
-            this.ZXSpectrumExportSnapshotMenuItemMenuItem});
+			this.ZXSpectrumTapesSubMenu,
+			this.ZXSpectrumDisksSubMenu,
+			this.ZXSpectrumExportSnapshotMenuItemMenuItem});
 			this.ZXSpectrumMediaMenuItem.Name = "ZXSpectrumMediaMenuItem";
 			this.ZXSpectrumMediaMenuItem.Size = new System.Drawing.Size(201, 22);
 			this.ZXSpectrumMediaMenuItem.Text = "Media";
@@ -3538,7 +3528,7 @@
 			// ZXSpectrumTapesSubMenu
 			// 
 			this.ZXSpectrumTapesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.zxt1ToolStripMenuItem});
+			this.zxt1ToolStripMenuItem});
 			this.ZXSpectrumTapesSubMenu.Name = "ZXSpectrumTapesSubMenu";
 			this.ZXSpectrumTapesSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.ZXSpectrumTapesSubMenu.Text = "Tapes";
@@ -3553,7 +3543,7 @@
 			// ZXSpectrumDisksSubMenu
 			// 
 			this.ZXSpectrumDisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.zxt2ToolStripMenuItem});
+			this.zxt2ToolStripMenuItem});
 			this.ZXSpectrumDisksSubMenu.Name = "ZXSpectrumDisksSubMenu";
 			this.ZXSpectrumDisksSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.ZXSpectrumDisksSubMenu.Text = "Disks";
@@ -3575,10 +3565,10 @@
 			// HelpSubMenu
 			// 
 			this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.OnlineHelpMenuItem,
-            this.ForumsMenuItem,
-            this.FeaturesMenuItem,
-            this.AboutMenuItem});
+			this.OnlineHelpMenuItem,
+			this.ForumsMenuItem,
+			this.FeaturesMenuItem,
+			this.AboutMenuItem});
 			this.HelpSubMenu.Name = "HelpSubMenu";
 			this.HelpSubMenu.Size = new System.Drawing.Size(44, 19);
 			this.HelpSubMenu.Text = "&Help";
@@ -3619,11 +3609,11 @@
 			// amstradCPCToolStripMenuItem
 			// 
 			this.amstradCPCToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.amstradCPCCoreEmulationSettingsToolStripMenuItem,
-            this.AmstradCPCAudioSettingsToolStripMenuItem,
-            this.AmstradCPCNonSyncSettingsToolStripMenuItem,
-            this.AmstradCPCPokeMemoryToolStripMenuItem,
-            this.AmstradCPCMediaToolStripMenuItem});
+			this.amstradCPCCoreEmulationSettingsToolStripMenuItem,
+			this.AmstradCPCAudioSettingsToolStripMenuItem,
+			this.AmstradCPCNonSyncSettingsToolStripMenuItem,
+			this.AmstradCPCPokeMemoryToolStripMenuItem,
+			this.AmstradCPCMediaToolStripMenuItem});
 			this.amstradCPCToolStripMenuItem.Name = "amstradCPCToolStripMenuItem";
 			this.amstradCPCToolStripMenuItem.Size = new System.Drawing.Size(90, 19);
 			this.amstradCPCToolStripMenuItem.Text = "Amstrad CPC";
@@ -3659,8 +3649,8 @@
 			// AmstradCPCMediaToolStripMenuItem
 			// 
 			this.AmstradCPCMediaToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.AmstradCPCTapesSubMenu,
-            this.AmstradCPCDisksSubMenu});
+			this.AmstradCPCTapesSubMenu,
+			this.AmstradCPCDisksSubMenu});
 			this.AmstradCPCMediaToolStripMenuItem.Name = "AmstradCPCMediaToolStripMenuItem";
 			this.AmstradCPCMediaToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
 			this.AmstradCPCMediaToolStripMenuItem.Text = "Media";
@@ -3669,7 +3659,7 @@
 			// AmstradCPCTapesSubMenu
 			// 
 			this.AmstradCPCTapesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.cpct1ToolStripMenuItem});
+			this.cpct1ToolStripMenuItem});
 			this.AmstradCPCTapesSubMenu.Name = "AmstradCPCTapesSubMenu";
 			this.AmstradCPCTapesSubMenu.Size = new System.Drawing.Size(104, 22);
 			this.AmstradCPCTapesSubMenu.Text = "Tapes";
@@ -3684,7 +3674,7 @@
 			// AmstradCPCDisksSubMenu
 			// 
 			this.AmstradCPCDisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.cpcd1ToolStripMenuItem});
+			this.cpcd1ToolStripMenuItem});
 			this.AmstradCPCDisksSubMenu.Name = "AmstradCPCDisksSubMenu";
 			this.AmstradCPCDisksSubMenu.Size = new System.Drawing.Size(104, 22);
 			this.AmstradCPCDisksSubMenu.Text = "Disks";
@@ -3706,30 +3696,30 @@
 			// 
 			this.MainStatusBar.ClickThrough = true;
 			this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.DumpStatusButton,
-            this.EmuStatus,
-            this.PlayRecordStatusButton,
-            this.PauseStatusButton,
-            this.RebootStatusBarIcon,
-            this.AVIStatusLabel,
-            this.LedLightStatusLabel,
-            this.SaveSlotsStatusLabel,
-            this.Slot1StatusButton,
-            this.Slot2StatusButton,
-            this.Slot3StatusButton,
-            this.Slot4StatusButton,
-            this.Slot5StatusButton,
-            this.Slot6StatusButton,
-            this.Slot7StatusButton,
-            this.Slot8StatusButton,
-            this.Slot9StatusButton,
-            this.Slot0StatusButton,
-            this.CheatStatusButton,
-            this.KeyPriorityStatusLabel,
-            this.CoreNameStatusBarButton,
-            this.ProfileFirstBootLabel,
-            this.LinkConnectStatusBarButton,
-            this.UpdateNotification});
+			this.DumpStatusButton,
+			this.EmuStatus,
+			this.PlayRecordStatusButton,
+			this.PauseStatusButton,
+			this.RebootStatusBarIcon,
+			this.AVIStatusLabel,
+			this.LedLightStatusLabel,
+			this.SaveSlotsStatusLabel,
+			this.Slot1StatusButton,
+			this.Slot2StatusButton,
+			this.Slot3StatusButton,
+			this.Slot4StatusButton,
+			this.Slot5StatusButton,
+			this.Slot6StatusButton,
+			this.Slot7StatusButton,
+			this.Slot8StatusButton,
+			this.Slot9StatusButton,
+			this.Slot0StatusButton,
+			this.CheatStatusButton,
+			this.KeyPriorityStatusLabel,
+			this.CoreNameStatusBarButton,
+			this.ProfileFirstBootLabel,
+			this.LinkConnectStatusBarButton,
+			this.UpdateNotification});
 			this.MainStatusBar.Location = new System.Drawing.Point(0, 386);
 			this.MainStatusBar.Name = "MainStatusBar";
 			this.MainStatusBar.ShowItemToolTips = true;
@@ -3949,31 +3939,31 @@
 			// MainFormContextMenu
 			// 
 			this.MainFormContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.OpenRomContextMenuItem,
-            this.LoadLastRomContextMenuItem,
-            this.StopAVContextMenuItem,
-            this.ContextSeparator_AfterROM,
-            this.RecordMovieContextMenuItem,
-            this.PlayMovieContextMenuItem,
-            this.RestartMovieContextMenuItem,
-            this.StopMovieContextMenuItem,
-            this.LoadLastMovieContextMenuItem,
-            this.BackupMovieContextMenuItem,
-            this.StopNoSaveContextMenuItem,
-            this.ViewSubtitlesContextMenuItem,
-            this.AddSubtitleContextMenuItem,
-            this.ViewCommentsContextMenuItem,
-            this.SaveMovieContextMenuItem,
-            this.SaveMovieAsContextMenuItem,
-            this.ContextSeparator_AfterMovie,
-            this.UndoSavestateContextMenuItem,
-            this.ContextSeparator_AfterUndo,
-            this.ConfigContextMenuItem,
-            this.ScreenshotContextMenuItem,
-            this.CloseRomContextMenuItem,
-            this.ClearSRAMContextMenuItem,
-            this.ShowMenuContextMenuSeparator,
-            this.ShowMenuContextMenuItem});
+			this.OpenRomContextMenuItem,
+			this.LoadLastRomContextMenuItem,
+			this.StopAVContextMenuItem,
+			this.ContextSeparator_AfterROM,
+			this.RecordMovieContextMenuItem,
+			this.PlayMovieContextMenuItem,
+			this.RestartMovieContextMenuItem,
+			this.StopMovieContextMenuItem,
+			this.LoadLastMovieContextMenuItem,
+			this.BackupMovieContextMenuItem,
+			this.StopNoSaveContextMenuItem,
+			this.ViewSubtitlesContextMenuItem,
+			this.AddSubtitleContextMenuItem,
+			this.ViewCommentsContextMenuItem,
+			this.SaveMovieContextMenuItem,
+			this.SaveMovieAsContextMenuItem,
+			this.ContextSeparator_AfterMovie,
+			this.UndoSavestateContextMenuItem,
+			this.ContextSeparator_AfterUndo,
+			this.ConfigContextMenuItem,
+			this.ScreenshotContextMenuItem,
+			this.CloseRomContextMenuItem,
+			this.ClearSRAMContextMenuItem,
+			this.ShowMenuContextMenuSeparator,
+			this.ShowMenuContextMenuItem});
 			this.MainFormContextMenu.Name = "contextMenuStrip1";
 			this.MainFormContextMenu.Size = new System.Drawing.Size(217, 490);
 			this.MainFormContextMenu.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.MainFormContextMenu_Closing);
@@ -4121,22 +4111,22 @@
 			// ConfigContextMenuItem
 			// 
 			this.ConfigContextMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItem6,
-            this.toolStripMenuItem7,
-            this.toolStripMenuItem8,
-            this.toolStripMenuItem9,
-            this.toolStripMenuItem10,
-            this.toolStripMenuItem11,
-            this.toolStripMenuItem12,
-            this.toolStripMenuItem13,
-            this.toolStripMenuItem14,
-            this.toolStripMenuItem15,
-            this.customizeToolStripMenuItem,
-            this.toolStripSeparator30,
-            this.SavestateTypeContextSubMenu,
-            this.toolStripSeparator37,
-            this.toolStripMenuItem66,
-            this.toolStripMenuItem67});
+			this.toolStripMenuItem6,
+			this.toolStripMenuItem7,
+			this.toolStripMenuItem8,
+			this.toolStripMenuItem9,
+			this.toolStripMenuItem10,
+			this.toolStripMenuItem11,
+			this.toolStripMenuItem12,
+			this.toolStripMenuItem13,
+			this.toolStripMenuItem14,
+			this.toolStripMenuItem15,
+			this.customizeToolStripMenuItem,
+			this.toolStripSeparator30,
+			this.SavestateTypeContextSubMenu,
+			this.toolStripSeparator37,
+			this.toolStripMenuItem66,
+			this.toolStripMenuItem67});
 			this.ConfigContextMenuItem.Name = "ConfigContextMenuItem";
 			this.ConfigContextMenuItem.Size = new System.Drawing.Size(216, 22);
 			this.ConfigContextMenuItem.Text = "Config";
@@ -4235,9 +4225,9 @@
 			// SavestateTypeContextSubMenu
 			// 
 			this.SavestateTypeContextSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SavestateTypeDefaultContextMenuItem,
-            this.SavestateBinaryContextMenuItem,
-            this.SavestateTextContextMenuItem});
+			this.SavestateTypeDefaultContextMenuItem,
+			this.SavestateBinaryContextMenuItem,
+			this.SavestateTextContextMenuItem});
 			this.SavestateTypeContextSubMenu.Name = "SavestateTypeContextSubMenu";
 			this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(159, 22);
 			this.SavestateTypeContextSubMenu.Text = "Savestate Type";
@@ -4749,7 +4739,6 @@
 		private System.Windows.Forms.ToolStripMenuItem dummyExternalTool;
 		private System.Windows.Forms.ToolStripMenuItem RecordAVMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem ExperimentalToolsSubMenu;
-		private System.Windows.Forms.ToolStripMenuItem AutoHawkMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem NewHexEditorMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem SaveConfigAsMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem LoadConfigFromMenuItem;
@@ -4797,28 +4786,28 @@
 		private System.Windows.Forms.ToolStripMenuItem SMSControllerLightPhaserToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem SMSControllerSportsPadToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem SMSControllerKeyboardToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem zXSpectrumToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem ZXSpectrumControllerConfigurationMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem ZXSpectrumCoreEmulationSettingsMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem ZXSpectrumNonSyncSettingsMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem ZXSpectrumAudioSettingsMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem ZXSpectrumPokeMemoryMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem ZXSpectrumMediaMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem ZXSpectrumTapesSubMenu;
-    private System.Windows.Forms.ToolStripMenuItem ZXSpectrumDisksSubMenu;
-    private System.Windows.Forms.ToolStripMenuItem zxt1ToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem zxt2ToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem ZXSpectrumExportSnapshotMenuItemMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem amstradCPCToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem amstradCPCCoreEmulationSettingsToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem AmstradCPCAudioSettingsToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem AmstradCPCPokeMemoryToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem AmstradCPCMediaToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem AmstradCPCTapesSubMenu;
-    private System.Windows.Forms.ToolStripMenuItem cpct1ToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem AmstradCPCDisksSubMenu;
-    private System.Windows.Forms.ToolStripMenuItem cpcd1ToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem AmstradCPCNonSyncSettingsToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem zXSpectrumToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem ZXSpectrumControllerConfigurationMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem ZXSpectrumCoreEmulationSettingsMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem ZXSpectrumNonSyncSettingsMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem ZXSpectrumAudioSettingsMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem ZXSpectrumPokeMemoryMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem ZXSpectrumMediaMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem ZXSpectrumTapesSubMenu;
+		private System.Windows.Forms.ToolStripMenuItem ZXSpectrumDisksSubMenu;
+		private System.Windows.Forms.ToolStripMenuItem zxt1ToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem zxt2ToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem ZXSpectrumExportSnapshotMenuItemMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem amstradCPCToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem amstradCPCCoreEmulationSettingsToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem AmstradCPCAudioSettingsToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem AmstradCPCPokeMemoryToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem AmstradCPCMediaToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem AmstradCPCTapesSubMenu;
+		private System.Windows.Forms.ToolStripMenuItem cpct1ToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem AmstradCPCDisksSubMenu;
+		private System.Windows.Forms.ToolStripMenuItem cpcd1ToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem AmstradCPCNonSyncSettingsToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem SubNesHawkMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator38;
 	}
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 362f9ee24f..6ac855a1ee 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -6,21 +6,18 @@ using System.Collections.Generic;
 
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.IEmulatorExtensions;
-using BizHawk.Emulation.Cores.Atari.A7800Hawk;
 using BizHawk.Emulation.Cores.Calculators;
 using BizHawk.Emulation.Cores.ColecoVision;
 using BizHawk.Emulation.Cores.Nintendo.NES;
 using BizHawk.Emulation.Cores.Nintendo.SubNESHawk;
 using BizHawk.Emulation.Cores.Nintendo.N64;
 using BizHawk.Emulation.Cores.Nintendo.SNES;
-using BizHawk.Emulation.Cores.Nintendo.SNES9X;
 using BizHawk.Emulation.Cores.PCEngine;
 using BizHawk.Emulation.Cores.Sega.MasterSystem;
 using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
 
 using BizHawk.Client.Common;
 
-using BizHawk.Client.EmuHawk.CustomControls;
 using BizHawk.Client.EmuHawk.WinFormExtensions;
 using BizHawk.Client.EmuHawk.ToolExtensions;
 using BizHawk.Emulation.Cores.Computers.AppleII;
@@ -309,6 +306,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void OpenRomMenuItem_Click(object sender, EventArgs e)
 		{
+			AdvancedLoader = AdvancedRomLoaderType.None;
 			OpenRom();
 		}
 
@@ -320,7 +318,9 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			if (oac.Result == OpenAdvancedChooser.Command.RetroLaunchNoGame)
+			AdvancedLoader = oac.Result;
+
+			if (AdvancedLoader == AdvancedRomLoaderType.LibretroLaunchNoGame)
 			{
 				var argsNoGame = new LoadRomArgs
 				{
@@ -334,15 +334,20 @@ namespace BizHawk.Client.EmuHawk
 
 			var filter = RomFilter;
 
-			if (oac.Result == OpenAdvancedChooser.Command.RetroLaunchGame)
+			if (AdvancedLoader == AdvancedRomLoaderType.LibretroLaunchGame)
 			{
 				args.OpenAdvanced = new OpenAdvanced_Libretro();
 				filter = oac.SuggestedExtensionFilter;
 			}
-			else if (oac.Result == OpenAdvancedChooser.Command.ClassicLaunchGame)
+			else if (AdvancedLoader == AdvancedRomLoaderType.ClassicLaunchGame)
 			{
 				args.OpenAdvanced = new OpenAdvanced_OpenRom();
 			}
+			else if (AdvancedLoader == AdvancedRomLoaderType.MAMELaunchGame)
+			{
+				args.OpenAdvanced = new OpenAdvanced_MAME();
+				filter = "MAME Arcade ROMs (*.zip)|*.zip";
+			}
 			else
 			{
 				throw new InvalidOperationException("Automatic Alpha Sanitizer");
@@ -468,8 +473,8 @@ namespace BizHawk.Client.EmuHawk
 			{
 				var result = MessageBox.Show(
 					this,
-					"Thanks for using Bizhawk!  The emulation core you have selected " +
-					"is currently BETA-status.  We appreciate your help in testing Bizhawk. " +
+					"Thanks for using BizHawk!  The emulation core you have selected " +
+					"is currently BETA-status.  We appreciate your help in testing BizHawk. " +
 					"You can record a movie on this core if you'd like to, but expect to " +
 					"encounter bugs and sync problems.  Continue?", "BizHawk", MessageBoxButtons.YesNo);
 
@@ -478,55 +483,10 @@ namespace BizHawk.Client.EmuHawk
 					return;
 				}
 			}
-			else if (Emulator is Snes9x)
+
+			if (!EmuHawkUtil.EnsureCoreIsAccurate(Emulator))
 			{
-				var box = new MsgBox(
-					"While the Snes9x core is faster, it is not nearly as accurate as bsnes. \nIt is recommended that you switch to the bsnes core for movie recording\nSwitch to bsnes?",
-					"Accuracy Warning",
-					MessageBoxIcon.Warning);
-
-				box.SetButtons(
-					new[] { "Switch", "Continue" },
-					new[] { DialogResult.Yes, DialogResult.Cancel });
-
-				box.MaximumSize = new Size(475, 350);
-				box.SetMessageToAutoSize();
-				var result = box.ShowDialog();
-
-				if (result == DialogResult.Yes)
-				{
-					Global.Config.SNES_InSnes9x = false;
-					RebootCore();
-				}
-				else if (result == DialogResult.Cancel)
-				{
-					// Do nothing and allow the user to continue to record the movie
-				}
-			}
-			else if (Emulator is QuickNES) // This is unsustainable :( But mixing the logic together is even worse, this needs to be rethought
-			{
-				var box = new MsgBox(
-					"While the QuickNes core is faster, it is not nearly as accurate as NesHawk. \nIt is recommended that you switch to the NesHawk core for movie recording\nSwitch to NesHawk?",
-					"Accuracy Warning",
-					MessageBoxIcon.Warning);
-
-				box.SetButtons(
-					new[] { "Switch", "Continue" },
-					new[] { DialogResult.Yes, DialogResult.Cancel });
-
-				box.MaximumSize = new Size(475, 350);
-				box.SetMessageToAutoSize();
-				var result = box.ShowDialog();
-
-				if (result == DialogResult.Yes)
-				{
-					Global.Config.NES_InQuickNES = false;
-					RebootCore();
-				}
-				else if (result == DialogResult.Cancel)
-				{
-					// Do nothing and allow the user to continue to record the movie
-				}
+				// Inaccurate core but allow the user to continue anyway
 			}
 
 			new RecordMovie(Emulator).ShowDialog();
@@ -659,7 +619,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void RecordAVMenuItem_Click(object sender, EventArgs e)
 		{
-			RecordAv(null, null); // force unattended, but allow tradtional setup
+			RecordAv(null, null); // force unattended, but allow traditional setup
 		}
 
 		private void StopAVMenuItem_Click(object sender, EventArgs e)
@@ -1024,9 +984,8 @@ namespace BizHawk.Client.EmuHawk
 
 		private void FirmwaresMenuItem_Click(object sender, EventArgs e)
 		{
-			if (e is RomLoader.RomErrorArgs)
+			if (e is RomLoader.RomErrorArgs args)
 			{
-				var args = (RomLoader.RomErrorArgs)e;
 				var result = new FirmwaresConfig(true, args.RomPath).ShowDialog();
 				args.Retry = result == DialogResult.Retry;
 			}
@@ -1446,7 +1405,7 @@ namespace BizHawk.Client.EmuHawk
 
 				externalToolToolStripMenuItem.DropDownItems.Add(item);
 			}
-			
+
 			if (externalToolToolStripMenuItem.DropDownItems.Count == 0)
 			{
 				externalToolToolStripMenuItem.DropDownItems.Add("None");
@@ -1455,7 +1414,6 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ExperimentalToolsSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
-			AutoHawkMenuItem.Enabled = GlobalWin.Tools.IsAvailable<AutoHawk>();
 			NewHexEditorMenuItem.Enabled = GlobalWin.Tools.IsAvailable<NewHexEditor>();
 		}
 
@@ -1475,7 +1433,7 @@ namespace BizHawk.Client.EmuHawk
 			if (OSTailoredCode.CurrentOS != OSTailoredCode.DistinctOS.Windows)
 			{
 				// this is apparently needed for weird mono-forms-on-different-thread issues
-				// dont do .Show() within Load<T>() for RamSearch - instead put an instance of it here on MainForm, then show here
+				// don't do .Show() within Load<T>() for RamSearch - instead put an instance of it here on MainForm, then show here
 				// the mono winforms implementation is.... weird and buggy
 				ramSearch.Show();
 			}
@@ -1552,11 +1510,6 @@ namespace BizHawk.Client.EmuHawk
 			new BatchRun().ShowDialog();
 		}
 
-		private void AutoHawkMenuItem_Click(object sender, EventArgs e)
-		{
-			GlobalWin.Tools.Load<AutoHawk>();
-		}
-
 		private void NewHexEditorMenuItem_Click(object sender, EventArgs e)
 		{
 			GlobalWin.Tools.Load<NewHexEditor>();
@@ -1585,7 +1538,7 @@ namespace BizHawk.Client.EmuHawk
 
 			VSControlsMenuItem.Enabled =
 			VSSettingsMenuItem.Enabled =
-				Emulator is NES && ((NES)Emulator).IsVS;
+				Emulator is NES nes && nes.IsVS;
 
 			NESSoundChannelsMenuItem.Enabled = GlobalWin.Tools.IsAvailable<NESSoundConfig>();
 			MovieSettingsMenuItem.Enabled = Emulator is NES && !Global.MovieSession.Movie.IsActive;
@@ -1661,7 +1614,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void VsSettingsMenuItem_Click(object sender, EventArgs e)
 		{
-			if (Emulator is NES && ((NES)Emulator).IsVS)
+			if (Emulator is NES nes && nes.IsVS)
 			{
 				new NesVsSettings().ShowHawkDialog();
 			}
@@ -1678,7 +1631,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void VsInsertCoinP1MenuItem_Click(object sender, EventArgs e)
 		{
-			if (Emulator is NES && ((NES)Emulator).IsVS)
+			if (Emulator is NES nes && nes.IsVS)
 			{
 				if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
 				{
@@ -1690,7 +1643,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void VsInsertCoinP2MenuItem_Click(object sender, EventArgs e)
 		{
-			if (Emulator is NES && ((NES)Emulator).IsVS)
+			if (Emulator is NES nes && nes.IsVS)
 			{
 				if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
 				{
@@ -1702,7 +1655,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void VsServiceSwitchMenuItem_Click(object sender, EventArgs e)
 		{
-			if (Emulator is NES && ((NES)Emulator).IsVS)
+			if (Emulator is NES nes && nes.IsVS)
 			{
 				if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
 				{
@@ -1842,7 +1795,7 @@ namespace BizHawk.Client.EmuHawk
 
 			SMSDisplayOverscanMenuItem.Visible =
 				Global.Game.System == "SMS" || Global.Game.System == "SG";
-			
+
 			SMSOverclockMenuItem.Visible =
 				SMSForceStereoMenuItem.Visible =
 				SMSdisplayToolStripMenuItem.Visible =
@@ -2013,7 +1966,7 @@ namespace BizHawk.Client.EmuHawk
 			s.ControllerType = "Sports Pad";
 			PutCoreSyncSettings(s);
 		}
-		
+
 		private void SMSControllerKeyboardToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			var s = ((SMS)Emulator).GetSyncSettings();
@@ -2119,7 +2072,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				GBPrefs.DoGBPrefsDialog(this);
 			}
-			else // sameboy
+			else // SameBoy
 			{
 				GenericCoreConfig.DoDialog(this, "Gameboy Settings");
 			}
@@ -2149,6 +2102,11 @@ namespace BizHawk.Client.EmuHawk
 
 		#region GBA
 
+		private void GBACoreSettingsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			GenericCoreConfig.DoDialog(this, "Gameboy Advance Settings");
+		}
+
 		private void GbaGpuViewerMenuItem_Click(object sender, EventArgs e)
 		{
 			GlobalWin.Tools.Load<GBAGPUView>();
@@ -2168,14 +2126,8 @@ namespace BizHawk.Client.EmuHawk
 
 		private void GBACoreSelectionSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
-			GBAmGBAMenuItem.Checked = Global.Config.GBA_UsemGBA == true;
-			GBAVBANextMenuItem.Checked = Global.Config.GBA_UsemGBA == false;
-		}
-
-		private void GbaWithmGBAMenuItem_Click(object sender, EventArgs e)
-		{
-			Global.Config.GBA_UsemGBA ^= true;
-			FlagNeedsReboot();
+			GBAmGBAMenuItem.Checked = Global.Config.GBA_UsemGBA;
+			GBAVBANextMenuItem.Checked = !Global.Config.GBA_UsemGBA;
 		}
 
 		#endregion
@@ -2256,6 +2208,11 @@ namespace BizHawk.Client.EmuHawk
 			SNESOptions.DoSettingsDialog(this);
 		}
 
+		private void Snes9xSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			GenericCoreConfig.DoDialog(this, "Snes9x Settings");
+		}
+
 		#endregion
 
 		#region Coleco
@@ -2317,7 +2274,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					// Do nothing, Reboot is being flagged already if they chaned anything
+					// Do nothing, Reboot is being flagged already if they changed anything
 				}
 			}
 			else
@@ -2443,7 +2400,7 @@ namespace BizHawk.Client.EmuHawk
 
 		#region Wondersawn
 
-		private void WondersawnSettingsMenuItem_Click(object sender, EventArgs e)
+		private void WonderSwanSettingsMenuItem_Click(object sender, EventArgs e)
 		{
 			GenericCoreConfig.DoDialog(this, "WonderSwan Settings");
 		}
@@ -2469,9 +2426,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			AppleDisksSubMenu.DropDownItems.Clear();
 
-			if (Emulator is AppleII)
+			if (Emulator is AppleII appleII)
 			{
-				var appleII = (AppleII)Emulator;
 				for (int i = 0; i < appleII.DiskCount; i++)
 				{
 					var menuItem = new ToolStripMenuItem
@@ -2508,9 +2464,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			C64DisksSubMenu.DropDownItems.Clear();
 
-			if (Emulator is C64)
+			if (Emulator is C64 c64)
 			{
-				var c64 = (C64)Emulator;
 				for (int i = 0; i < c64.DiskCount; i++)
 				{
 					var menuItem = new ToolStripMenuItem
@@ -2540,7 +2495,7 @@ namespace BizHawk.Client.EmuHawk
 
 		#region Intv
 
-		private void IntvSubMenu_DropDownOpened(object sender, EventArgs e)
+		private void IntVSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
 			IntVControllerSettingsMenuItem.Enabled = !Global.MovieSession.Movie.IsActive;
 		}
@@ -2550,260 +2505,271 @@ namespace BizHawk.Client.EmuHawk
 			new IntvControllerSettings().ShowDialog();
 		}
 
-        #endregion
+		#endregion
 
-        #region ZXSpectrum
+		#region VirtualBoy
+		private void VirtualBoySettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			GenericCoreConfig.DoDialog(this, "VirtualBoy Settings");
+		}
 
-        private void zXSpectrumToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
-        {
+		#endregion
 
-        }
+		#region NeoGeoPocket
 
-        
-        private void preferencesToolStripMenuItem4_Click(object sender, EventArgs e)
-        {
-            GenericCoreConfig.DoDialog(this, "ZXSpectrum Settings");
-        }
-        
+		private void NeoGeoSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			GenericCoreConfig.DoDialog(this, "NeoPop Settings");
+		}
 
-        private void ZXSpectrumControllerConfigurationMenuItem_Click(object sender, EventArgs e)
-        {
-            new ZXSpectrumJoystickSettings().ShowDialog();
-        }
+		#endregion
 
-        private void ZXSpectrumCoreEmulationSettingsMenuItem_Click(object sender, EventArgs e)
-        {
-            new ZXSpectrumCoreEmulationSettings().ShowDialog();
-        }
+		#region PC-FX
 
-        private void ZXSpectrumNonSyncSettingsMenuItem_Click(object sender, EventArgs e)
-        {
-            new ZXSpectrumNonSyncSettings().ShowDialog();
-        }
+		private void PCFXSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			GenericCoreConfig.DoDialog(this, "PC-FX Settings");
+		}
 
-        private void ZXSpectrumAudioSettingsMenuItem_Click(object sender, EventArgs e)
-        {
-            new ZXSpectrumAudioSettings().ShowDialog();
-        }
+		#endregion
 
-        private void ZXSpectrumPokeMemoryMenuItem_Click(object sender, EventArgs e)
-        {
-            new ZXSpectrumPokeMemory().ShowDialog();
-        }
+		#region ZXSpectrum
 
-        private void ZXSpectrumMediaMenuItem_DropDownOpened(object sender, EventArgs e)
-        {
-            if (Emulator is ZXSpectrum)
-            {
-                ZXSpectrumTapesSubMenu.Enabled = ((ZXSpectrum)Emulator)._tapeInfo.Count > 0;
-                ZXSpectrumDisksSubMenu.Enabled = ((ZXSpectrum)Emulator)._diskInfo.Count > 0;
-            }
-        }
+		private void ZXSpectrumControllerConfigurationMenuItem_Click(object sender, EventArgs e)
+		{
+			new ZXSpectrumJoystickSettings().ShowDialog();
+		}
 
-        private void ZXSpectrumTapesSubMenu_DropDownOpened(object sender, EventArgs e)
-        {
-            ZXSpectrumTapesSubMenu.DropDownItems.Clear();
+		private void ZXSpectrumCoreEmulationSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			new ZXSpectrumCoreEmulationSettings().ShowDialog();
+		}
 
-            List<ToolStripMenuItem> items = new List<ToolStripMenuItem>();
+		private void ZXSpectrumNonSyncSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			new ZXSpectrumNonSyncSettings().ShowDialog();
+		}
 
-            if (Emulator is ZXSpectrum)
-            {
-                var speccy = (ZXSpectrum)Emulator;
-                var currSel = speccy._machine.TapeMediaIndex;
+		private void ZXSpectrumAudioSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			new ZXSpectrumAudioSettings().ShowDialog();
+		}
 
-                for (int i = 0; i < speccy._tapeInfo.Count; i++)
-                {
-                    string name = speccy._tapeInfo[i].Name;
+		private void ZXSpectrumPokeMemoryMenuItem_Click(object sender, EventArgs e)
+		{
+			new ZXSpectrumPokeMemory().ShowDialog();
+		}
 
-                    var menuItem = new ToolStripMenuItem
-                    {
-                        Name = $"{i}_{name}",
-                        Text = $"{i}: {name}",
-                        Checked = currSel == i
-                    };
+		private void ZXSpectrumMediaMenuItem_DropDownOpened(object sender, EventArgs e)
+		{
+			if (Emulator is ZXSpectrum)
+			{
+				ZXSpectrumTapesSubMenu.Enabled = ((ZXSpectrum)Emulator)._tapeInfo.Count > 0;
+				ZXSpectrumDisksSubMenu.Enabled = ((ZXSpectrum)Emulator)._diskInfo.Count > 0;
+			}
+		}
 
-                    int dummy = i;
-                    menuItem.Click += (o, ev) =>
-                    {
-                        speccy._machine.TapeMediaIndex = dummy;
-                    };
-
-                    items.Add(menuItem);
-                }
-            }
-
-            ZXSpectrumTapesSubMenu.DropDownItems.AddRange(items.ToArray());
-        }
-
-        private void ZXSpectrumDisksSubMenu_DropDownOpened(object sender, EventArgs e)
-        {
-            ZXSpectrumDisksSubMenu.DropDownItems.Clear();
-
-            List<ToolStripMenuItem> items = new List<ToolStripMenuItem>();
-
-            if (Emulator is ZXSpectrum)
-            {
-                var speccy = (ZXSpectrum)Emulator;
-                var currSel = speccy._machine.DiskMediaIndex;
-
-                for (int i = 0; i < speccy._diskInfo.Count; i++)
-                {
-                    string name = speccy._diskInfo[i].Name;
-
-                    var menuItem = new ToolStripMenuItem
-                    {
-                        Name = $"{i}_{name}",
-                        Text = $"{i}: {name}",
-                        Checked = currSel == i
-                    };
-
-                    int dummy = i;
-                    menuItem.Click += (o, ev) =>
-                    {
-                        speccy._machine.DiskMediaIndex = dummy;
-                    };
-
-                    items.Add(menuItem);
-                }
-            }
-
-            ZXSpectrumDisksSubMenu.DropDownItems.AddRange(items.ToArray());
-        }
-
-        private void ZXSpectrumExportSnapshotMenuItemMenuItem_Click(object sender, EventArgs e)
-        {
-            SaveFileDialog zxSnapExpDialog = new SaveFileDialog();
-            zxSnapExpDialog.RestoreDirectory = true;
-            zxSnapExpDialog.Title = "EXPERIMENTAL - Export 3rd party snapshot formats";
-            zxSnapExpDialog.DefaultExt = "szx";
-            zxSnapExpDialog.Filter = "ZX-State files (*.szx)|*.szx";
-            zxSnapExpDialog.SupportMultiDottedExtensions = true;
-
-            try
-            {
-                var res = zxSnapExpDialog.ShowDialog();
-                if (res == DialogResult.OK)
-                {
-                    var speccy = (ZXSpectrum)Emulator;
-                    var snap = speccy.GetSZXSnapshot();
-                    File.WriteAllBytes(zxSnapExpDialog.FileName, snap);
-                    //File.WriteAllText(zxSnapExpDialog.FileName, snap);
-                }
-            }
-            catch (Exception ex)
-            {
-                var ee = ex;
-            }
-        }
-
-        #endregion
-
-        #region AmstradCPC
-
-        private void amstradCPCCoreEmulationSettingsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            new AmstradCPCCoreEmulationSettings().ShowDialog();
-        }
-
-        private void AmstradCPCAudioSettingsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            new AmstradCPCAudioSettings().ShowDialog();
-        }
-
-        private void AmstradCPCPokeMemoryToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            new AmstradCPCPokeMemory().ShowDialog();
-        }
-
-        private void AmstradCPCMediaToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
-        {
-            if (Emulator is AmstradCPC)
-            {
-                AmstradCPCTapesSubMenu.Enabled = ((AmstradCPC)Emulator)._tapeInfo.Count > 0;
-                AmstradCPCDisksSubMenu.Enabled = ((AmstradCPC)Emulator)._diskInfo.Count > 0;
-            }
-        }
-
-        private void AmstradCPCTapesSubMenu_DropDownOpened(object sender, EventArgs e)
-        {
-            AmstradCPCTapesSubMenu.DropDownItems.Clear();
+		private void ZXSpectrumTapesSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
+			ZXSpectrumTapesSubMenu.DropDownItems.Clear();
 
 			List<ToolStripMenuItem> items = new List<ToolStripMenuItem>();
 
-			if (Emulator is AmstradCPC)
-            {
-                var ams = (AmstradCPC)Emulator;
-                var currSel = ams._machine.TapeMediaIndex;
+			if (Emulator is ZXSpectrum speccy)
+			{
+				var tapeMediaIndex = speccy._machine.TapeMediaIndex;
 
-                for (int i = 0; i < ams._tapeInfo.Count; i++)
-                {
-                    string name = ams._tapeInfo[i].Name;
+				for (int i = 0; i < speccy._tapeInfo.Count; i++)
+				{
+					string name = speccy._tapeInfo[i].Name;
 
-                    var menuItem = new ToolStripMenuItem
-                    {
-                        Name = $"{i}_{name}",
-                        Text = $"{i}: {name}",
-                        Checked = currSel == i
-                    };
+					var menuItem = new ToolStripMenuItem
+					{
+						Name = $"{i}_{name}",
+						Text = $"{i}: {name}",
+						Checked = tapeMediaIndex == i
+					};
 
-                    int dummy = i;
-                    menuItem.Click += (o, ev) =>
-                    {
-                        ams._machine.TapeMediaIndex = dummy;
-                    };
+					int dummy = i;
+					menuItem.Click += (o, ev) =>
+					{
+						speccy._machine.TapeMediaIndex = dummy;
+					};
 
 					items.Add(menuItem);
 				}
-            }
+			}
+
+			ZXSpectrumTapesSubMenu.DropDownItems.AddRange(items.ToArray());
+		}
+
+		private void ZXSpectrumDisksSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
+			ZXSpectrumDisksSubMenu.DropDownItems.Clear();
+
+			var items = new List<ToolStripMenuItem>();
+
+			if (Emulator is ZXSpectrum speccy)
+			{
+				var diskMediaIndex = speccy._machine.DiskMediaIndex;
+
+				for (int i = 0; i < speccy._diskInfo.Count; i++)
+				{
+					string name = speccy._diskInfo[i].Name;
+
+					var menuItem = new ToolStripMenuItem
+					{
+						Name = $"{i}_{name}",
+						Text = $"{i}: {name}",
+						Checked = diskMediaIndex == i
+					};
+
+					int dummy = i;
+					menuItem.Click += (o, ev) =>
+					{
+						speccy._machine.DiskMediaIndex = dummy;
+					};
+
+					items.Add(menuItem);
+				}
+			}
+
+			ZXSpectrumDisksSubMenu.DropDownItems.AddRange(items.ToArray());
+		}
+
+		private void ZXSpectrumExportSnapshotMenuItemMenuItem_Click(object sender, EventArgs e)
+		{
+			var zxSnapExpDialog = new SaveFileDialog
+			{
+				RestoreDirectory = true
+				, Title = "EXPERIMENTAL - Export 3rd party snapshot formats"
+				, DefaultExt = "szx"
+				, Filter = "ZX-State files (*.szx)|*.szx"
+				, SupportMultiDottedExtensions = true
+			};
+
+			try
+			{
+				var res = zxSnapExpDialog.ShowDialog();
+				if (res == DialogResult.OK)
+				{
+					var speccy = (ZXSpectrum)Emulator;
+					var snap = speccy.GetSZXSnapshot();
+					File.WriteAllBytes(zxSnapExpDialog.FileName, snap);
+				}
+			}
+			catch (Exception ex)
+			{
+				var ee = ex;
+			}
+		}
+
+		#endregion
+
+		#region AmstradCPC
+
+		private void amstradCPCCoreEmulationSettingsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			new AmstradCPCCoreEmulationSettings().ShowDialog();
+		}
+
+		private void AmstradCPCAudioSettingsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			new AmstradCPCAudioSettings().ShowDialog();
+		}
+
+		private void AmstradCPCPokeMemoryToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			new AmstradCPCPokeMemory().ShowDialog();
+		}
+
+		private void AmstradCPCMediaToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+		{
+			if (Emulator is AmstradCPC)
+			{
+				AmstradCPCTapesSubMenu.Enabled = ((AmstradCPC)Emulator)._tapeInfo.Count > 0;
+				AmstradCPCDisksSubMenu.Enabled = ((AmstradCPC)Emulator)._diskInfo.Count > 0;
+			}
+		}
+
+		private void AmstradCPCTapesSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
+			AmstradCPCTapesSubMenu.DropDownItems.Clear();
+
+			var items = new List<ToolStripMenuItem>();
+
+			if (Emulator is AmstradCPC ams)
+			{
+				var tapeMediaIndex = ams._machine.TapeMediaIndex;
+
+				for (int i = 0; i < ams._tapeInfo.Count; i++)
+				{
+					string name = ams._tapeInfo[i].Name;
+
+					var menuItem = new ToolStripMenuItem
+					{
+						Name = $"{i}_{name}",
+						Text = $"{i}: {name}",
+						Checked = tapeMediaIndex == i
+					};
+
+					int dummy = i;
+					menuItem.Click += (o, ev) =>
+					{
+						ams._machine.TapeMediaIndex = dummy;
+					};
+
+					items.Add(menuItem);
+				}
+			}
 
 			AmstradCPCTapesSubMenu.DropDownItems.AddRange(items.ToArray());
 		}
 
-        private void AmstradCPCDisksSubMenu_DropDownOpened(object sender, EventArgs e)
-        {
+		private void AmstradCPCDisksSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
 			AmstradCPCDisksSubMenu.DropDownItems.Clear();
 
-			List<ToolStripMenuItem> items = new List<ToolStripMenuItem>();
+			var items = new List<ToolStripMenuItem>();
 
-			if (Emulator is AmstradCPC)
-            {
-                var ams = (AmstradCPC)Emulator;
-                var currSel = ams._machine.DiskMediaIndex;
+			if (Emulator is AmstradCPC ams)
+			{
+				var diskMediaIndex = ams._machine.DiskMediaIndex;
 
-                for (int i = 0; i < ams._diskInfo.Count; i++)
-                {
-                    string name = ams._diskInfo[i].Name;
+				for (int i = 0; i < ams._diskInfo.Count; i++)
+				{
+					string name = ams._diskInfo[i].Name;
 
-                    var menuItem = new ToolStripMenuItem
-                    {
-                        Name = $"{i}_{name}",
-                        Text = $"{i}: {name}",
-                        Checked = currSel == i
-                    };
+					var menuItem = new ToolStripMenuItem
+					{
+						Name = $"{i}_{name}",
+						Text = $"{i}: {name}",
+						Checked = diskMediaIndex == i
+					};
 
-                    int dummy = i;
-                    menuItem.Click += (o, ev) =>
-                    {
-                        ams._machine.DiskMediaIndex = dummy;
-                    };
+					int dummy = i;
+					menuItem.Click += (o, ev) =>
+					{
+						ams._machine.DiskMediaIndex = dummy;
+					};
 
 					items.Add(menuItem);
 				}
-            }
+			}
 
 			AmstradCPCDisksSubMenu.DropDownItems.AddRange(items.ToArray());
 		}
 
-        private void AmstradCPCNonSyncSettingsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            new AmstradCPCNonSyncSettings().ShowDialog();
-        }
+		private void AmstradCPCNonSyncSettingsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			new AmstradCPCNonSyncSettings().ShowDialog();
+		}
 
-        #endregion
+		#endregion
 
-        #region Help
+		#region Help
 
-        private void HelpSubMenu_DropDownOpened(object sender, EventArgs e)
+		private void HelpSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
 			FeaturesMenuItem.Visible = VersionInfo.DeveloperBuild;
 		}
@@ -2853,9 +2819,9 @@ namespace BizHawk.Client.EmuHawk
 				showMenuVisible = true; // need to always be able to restore this as an emergency measure
 			}
 
-			if (argParser._chromeless)
+			if (_argParser._chromeless)
 			{
-				showMenuVisible = true; // I decided this was always possible in chromeless mode, we'll see what they think
+				showMenuVisible = true; // I decided this was always possible in chrome-less mode, we'll see what they think
 			}
 
 			ShowMenuContextMenuItem.Visible =
@@ -3297,7 +3263,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			try
 			{
-				FormDragDrop_Internal(sender, e);
+				_FormDragDrop_internal(sender, e);
 			}
 			catch (Exception ex)
 			{
@@ -3305,113 +3271,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void FormDragDrop_Internal(object sender, DragEventArgs e)
-		{
-			_FormDragDrop_internal(sender, e);
-/*
-			var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
-			var isLua = false;
-			foreach (var path in filePaths)
-			{
-				var extension = Path.GetExtension(path);
-				if (extension != null && extension.ToUpper() == ".LUA")
-				{
-					OpenLuaConsole();
-					if (GlobalWin.Tools.Has<LuaConsole>())
-					{
-						GlobalWin.Tools.LuaConsole.LoadLuaFile(path);
-					}
-					isLua = true;
-				}
-			}
-			if (isLua)
-			{
-				return;
-			}
-
-			var ext = Path.GetExtension(filePaths[0]) ?? "";
-			if (ext.ToUpper() == ".LUASES")
-			{
-				OpenLuaConsole();
-				if (GlobalWin.Tools.Has<LuaConsole>())
-				{
-					GlobalWin.Tools.LuaConsole.LoadLuaSession(filePaths[0]);
-				}
-			}
-			else if (MovieService.IsValidMovieExtension(ext))
-			{
-				if (Emulator.IsNull())
-				{
-					OpenRom();
-				}
-
-				if (Emulator.IsNull())
-				{
-					return;
-				}
-
-				StartNewMovie(MovieService.Get(filePaths[0]), false);
-			}
-			else if (ext.ToUpper() == ".STATE")
-			{
-				LoadState(filePaths[0], Path.GetFileName(filePaths[0]));
-			}
-			else if (ext.ToUpper() == ".CHT")
-			{
-				Global.CheatList.Load(filePaths[0], false);
-				GlobalWin.Tools.Load<Cheats>();
-			}
-			else if (ext.ToUpper() == ".WCH")
-			{
-				GlobalWin.Tools.LoadRamWatch(true);
-				(GlobalWin.Tools.Get<RamWatch>() as RamWatch).LoadWatchFile(new FileInfo(filePaths[0]), false);
-			}
-
-			else if (ext.ToUpper() == ".CDL" && Emulator is PCEngine)
-			{
-				GlobalWin.Tools.Load<CDL>();
-				(GlobalWin.Tools.Get<CDL>() as CDL).LoadFile(filePaths[0]);
-			}
-
-			else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0])))
-			{
-				if (Emulator.IsNull())
-				{
-					OpenRom();
-				}
-
-				if (Emulator.IsNull())
-				{
-					return;
-				}
-
-				// tries to open a legacy movie format by importing it
-				string errorMsg;
-				string warningMsg;
-				var movie = MovieImport.ImportFile(filePaths[0], out errorMsg, out warningMsg);
-				if (!string.IsNullOrEmpty(errorMsg))
-				{
-					MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-				else
-				{
-					// fix movie extension to something palatable for these purposes. 
-					// for instance, something which doesnt clobber movies you already may have had.
-					// i'm evenly torn between this, and a file in %TEMP%, but since we dont really have a way to clean up this tempfile, i choose this:
-					StartNewMovie(movie, false);
-				}
-
-				GlobalWin.OSD.AddMessage(warningMsg);
-			}
-			else
-			{
-				var args = new LoadRomArgs();
-				args.OpenAdvanced = new OpenAdvanced_OpenRom { Path = filePaths[0] };
-				LoadRom(filePaths[0], args);
-			}
- */
-		}
-
 		#endregion
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index 130d640a0f..464ea13f66 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -347,7 +347,10 @@ namespace BizHawk.Client.EmuHawk
 							type = " (on)";
 						}
 
-						Global.CheatList.ToList().ForEach(x => x.Toggle());
+						foreach (var x in Global.CheatList)
+						{
+							x.Toggle();
+						}
 						GlobalWin.OSD.AddMessage($"Cheats toggled{type}");
 					}
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 444e73cc3d..1661e2eca6 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -25,7 +25,6 @@ using BizHawk.Emulation.Cores.Nintendo.NES;
 using BizHawk.Emulation.Cores.Nintendo.SNES;
 using BizHawk.Emulation.Cores.Nintendo.N64;
 using BizHawk.Emulation.Cores.Nintendo.GBHawkLink;
-using BizHawk.Emulation.Cores.Sega.GGHawkLink;
 
 using BizHawk.Client.EmuHawk.WinFormExtensions;
 using BizHawk.Client.EmuHawk.ToolExtensions;
@@ -34,7 +33,6 @@ using BizHawk.Client.ApiHawk;
 using BizHawk.Emulation.Common.Base_Implementations;
 using BizHawk.Emulation.Cores.Nintendo.SNES9X;
 using BizHawk.Emulation.Cores.Consoles.SNK;
-using BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive;
 using BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy;
 
 namespace BizHawk.Client.EmuHawk
@@ -47,11 +45,11 @@ namespace BizHawk.Client.EmuHawk
 		{
 			SetWindowText();
 
-			// Hide Status bar icons and general statusbar prep
+			// Hide Status bar icons and general StatusBar prep
 			MainStatusBar.Padding = new Padding(MainStatusBar.Padding.Left, MainStatusBar.Padding.Top, MainStatusBar.Padding.Left, MainStatusBar.Padding.Bottom); // Workaround to remove extra padding on right
 			PlayRecordStatusButton.Visible = false;
 			AVIStatusLabel.Visible = false;
-			SetPauseStatusbarIcon();
+			SetPauseStatusBarIcon();
 			ToolFormBase.UpdateCheatRelatedTools(null, null);
 			RebootStatusBarIcon.Visible = false;
 			UpdateNotification.Visible = false;
@@ -83,20 +81,19 @@ namespace BizHawk.Client.EmuHawk
 
 		static MainForm()
 		{
-			// If this isnt here, then our assemblyresolving hacks wont work due to the check for MainForm.INTERIM
-			// its.. weird. dont ask.
+			// If this isn't here, then our assembly resolving hacks wont work due to the check for MainForm.INTERIM
+			// its.. weird. don't ask.
 		}
 
 		private CoreComm CreateCoreComm()
 		{
-			CoreComm ret = new CoreComm(ShowMessageCoreComm, NotifyCoreComm)
+			return new CoreComm(ShowMessageCoreComm, NotifyCoreComm)
 			{
 				ReleaseGLContext = o => GlobalWin.GLManager.ReleaseGLContext(o),
 				RequestGLContext = (major, minor, forward) => GlobalWin.GLManager.CreateGLContext(major, minor, forward),
 				ActivateGLContext = gl => GlobalWin.GLManager.Activate((GLManager.ContextRef)gl),
 				DeactivateGLContext = () => GlobalWin.GLManager.Deactivate()
 			};
-			return ret;
 		}
 
 		public MainForm(string[] args)
@@ -157,13 +154,13 @@ namespace BizHawk.Client.EmuHawk
 			};
 			try
 			{
-				argParser.ParseArguments(args);
+				_argParser.ParseArguments(args);
 			}
 			catch (ArgParserException e)
 			{
 				MessageBox.Show(e.Message);
 			}
-			
+
 
 			Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb.txt"));
 
@@ -281,14 +278,14 @@ namespace BizHawk.Client.EmuHawk
 				Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy);
 			}
 
-			if (argParser.cmdRom != null)
+			if (_argParser.cmdRom != null)
 			{
 				// Commandline should always override auto-load
-				var ioa = OpenAdvancedSerializer.ParseWithLegacy(argParser.cmdRom);
-				LoadRom(argParser.cmdRom, new LoadRomArgs { OpenAdvanced = ioa });
+				var ioa = OpenAdvancedSerializer.ParseWithLegacy(_argParser.cmdRom);
+				LoadRom(_argParser.cmdRom, new LoadRomArgs { OpenAdvanced = ioa });
 				if (Global.Game == null)
 				{
-					MessageBox.Show($"Failed to load {argParser.cmdRom} specified on commandline");
+					MessageBox.Show($"Failed to load {_argParser.cmdRom} specified on commandline");
 				}
 			}
 			else if (Global.Config.RecentRoms.AutoLoad && !Global.Config.RecentRoms.Empty)
@@ -296,14 +293,14 @@ namespace BizHawk.Client.EmuHawk
 				LoadRomFromRecent(Global.Config.RecentRoms.MostRecent);
 			}
 
-			if (argParser.audiosync.HasValue)
+			if (_argParser.audiosync.HasValue)
 			{
-				Global.Config.VideoWriterAudioSync = argParser.audiosync.Value;
+				Global.Config.VideoWriterAudioSync = _argParser.audiosync.Value;
 			}
 
-			if (argParser.cmdMovie != null)
+			if (_argParser.cmdMovie != null)
 			{
-				_supressSyncSettingsWarning = true; // We dont' want to be nagged if we are attempting to automate
+				_suppressSyncSettingsWarning = true; // We don't want to be nagged if we are attempting to automate
 				if (Global.Game == null)
 				{
 					OpenRom();
@@ -312,21 +309,19 @@ namespace BizHawk.Client.EmuHawk
 				// If user picked a game, then do the commandline logic
 				if (!Global.Game.IsNullInstance)
 				{
-					var movie = MovieService.Get(argParser.cmdMovie);
+					var movie = MovieService.Get(_argParser.cmdMovie);
 					Global.MovieSession.ReadOnly = true;
 
-					// if user is dumping and didnt supply dump length, make it as long as the loaded movie
-					if (argParser._autoDumpLength == 0)
+					// if user is dumping and didn't supply dump length, make it as long as the loaded movie
+					if (_argParser._autoDumpLength == 0)
 					{
-						argParser._autoDumpLength = movie.InputLogLength;
+						_argParser._autoDumpLength = movie.InputLogLength;
 					}
 
 					// Copy pasta from drag & drop
-					if (MovieImport.IsValidMovieExtension(Path.GetExtension(argParser.cmdMovie)))
+					if (MovieImport.IsValidMovieExtension(Path.GetExtension(_argParser.cmdMovie)))
 					{
-						string errorMsg;
-						string warningMsg;
-						var imported = MovieImport.ImportFile(argParser.cmdMovie, out errorMsg, out warningMsg);
+						var imported = MovieImport.ImportFile(_argParser.cmdMovie, out var errorMsg, out var warningMsg);
 						if (!string.IsNullOrEmpty(errorMsg))
 						{
 							MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -344,10 +339,10 @@ namespace BizHawk.Client.EmuHawk
 					else
 					{
 						StartNewMovie(movie, false);
-						Global.Config.RecentMovies.Add(argParser.cmdMovie);
+						Global.Config.RecentMovies.Add(_argParser.cmdMovie);
 					}
 
-					_supressSyncSettingsWarning = false;
+					_suppressSyncSettingsWarning = false;
 				}
 			}
 			else if (Global.Config.RecentMovies.AutoLoad && !Global.Config.RecentMovies.Empty)
@@ -371,20 +366,20 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			if (argParser.startFullscreen || Global.Config.StartFullscreen)
+			if (_argParser.startFullscreen || Global.Config.StartFullscreen)
 			{
 				_needsFullscreenOnLoad = true;
 			}
 
 			if (!Global.Game.IsNullInstance)
 			{
-				if (argParser.cmdLoadState != null)
+				if (_argParser.cmdLoadState != null)
 				{
-					LoadState(argParser.cmdLoadState, Path.GetFileName(argParser.cmdLoadState));
+					LoadState(_argParser.cmdLoadState, Path.GetFileName(_argParser.cmdLoadState));
 				}
-				else if (argParser.cmdLoadSlot != null)
+				else if (_argParser.cmdLoadSlot != null)
 				{
-					LoadQuickSave($"QuickSave{argParser.cmdLoadSlot}");
+					LoadQuickSave($"QuickSave{_argParser.cmdLoadSlot}");
 				}
 				else if (Global.Config.AutoLoadLastSaveSlot)
 				{
@@ -393,14 +388,14 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			//start Lua Console if requested in the command line arguments
-			if (argParser.luaConsole)
+			if (_argParser.luaConsole)
 			{
 				GlobalWin.Tools.Load<LuaConsole>();
 			}
 			//load Lua Script if requested in the command line arguments
-			if (argParser.luaScript != null)
+			if (_argParser.luaScript != null)
 			{
-				GlobalWin.Tools.LuaConsole.LoadLuaFile(argParser.luaScript);
+				GlobalWin.Tools.LuaConsole.LoadLuaFile(_argParser.luaScript);
 			}
 
 			GlobalWin.Tools.AutoLoad();
@@ -421,11 +416,11 @@ namespace BizHawk.Client.EmuHawk
 			{
 				PauseEmulator();
 			}
-		
+
 			// start dumping, if appropriate
-			if (argParser.cmdDumpType != null && argParser.cmdDumpName != null)
+			if (_argParser.cmdDumpType != null && _argParser.cmdDumpName != null)
 			{
-				RecordAv(argParser.cmdDumpType, argParser.cmdDumpName);
+				RecordAv(_argParser.cmdDumpType, _argParser.cmdDumpName);
 			}
 
 			SetMainformMovieInfo();
@@ -438,7 +433,7 @@ namespace BizHawk.Client.EmuHawk
 			};
 		}
 
-		private readonly bool _supressSyncSettingsWarning;
+		private readonly bool _suppressSyncSettingsWarning;
 
 		public int ProgramRunLoop()
 		{
@@ -461,7 +456,7 @@ namespace BizHawk.Client.EmuHawk
 
 			InitializeFpsData();
 
-			for (;;)
+			for (; ; )
 			{
 				Input.Instance.Update();
 
@@ -551,10 +546,7 @@ namespace BizHawk.Client.EmuHawk
 		private bool _emulatorPaused;
 		public bool EmulatorPaused
 		{
-			get
-			{
-				return _emulatorPaused;
-			}
+			get => _emulatorPaused;
 
 			private set
 			{
@@ -578,7 +570,7 @@ namespace BizHawk.Client.EmuHawk
 				Paused = paused;
 			}
 
-			public bool Paused { get; private set; }
+			public bool Paused { get; }
 		}
 
 		#endregion
@@ -596,20 +588,19 @@ namespace BizHawk.Client.EmuHawk
 		// runloop won't exec lua
 		public bool SuppressLua { get; set; }
 
+		public AdvancedRomLoaderType AdvancedLoader { get; set; }
+
 		public long MouseWheelTracker { get; private set; }
 
 		private int? _pauseOnFrame;
 		public int? PauseOnFrame // If set, upon completion of this frame, the client wil pause
 		{
-			get
-			{
-				return _pauseOnFrame;
-			}
+			get => _pauseOnFrame;
 
 			set
 			{
 				_pauseOnFrame = value;
-				SetPauseStatusbarIcon();
+				SetPauseStatusBarIcon();
 
 				if (value == null) // TODO: make an Event handler instead, but the logic here is that after turbo seeking, tools will want to do a real update when the emulator finally pauses
 				{
@@ -621,9 +612,7 @@ namespace BizHawk.Client.EmuHawk
 		}
 
 		public bool IsSeeking => PauseOnFrame.HasValue;
-
 		private bool IsTurboSeeking => PauseOnFrame.HasValue && Global.Config.TurboSeek;
-
 		public bool IsTurboing => Global.ClientControls["Turbo"] || IsTurboSeeking;
 
 		#endregion
@@ -650,27 +639,21 @@ namespace BizHawk.Client.EmuHawk
 		/// <summary>
 		/// Controls whether the app generates input events. should be turned off for most modal dialogs
 		/// </summary>
-		public bool AllowInput(bool yieldAlt)
+		public Input.AllowInput AllowInput(bool yieldAlt)
 		{
 			// the main form gets input
 			if (ActiveForm == this)
 			{
-				return true;
+				return Input.AllowInput.All;
 			}
 
 			// even more special logic for TAStudio:
 			// TODO - implement by event filter in TAStudio
-			var maybeTAStudio = ActiveForm as TAStudio;
-			if (maybeTAStudio != null)
+			if (ActiveForm is TAStudio maybeTAStudio)
 			{
-				if (yieldAlt)
+				if (yieldAlt || maybeTAStudio.IsInMenuLoop)
 				{
-					return false;
-				}
-
-				if (maybeTAStudio.IsInMenuLoop)
-				{
-					return false;
+					return Input.AllowInput.None;
 				}
 			}
 
@@ -680,26 +663,23 @@ namespace BizHawk.Client.EmuHawk
 				|| ActiveForm is TAStudio
 				|| ActiveForm is VirtualpadTool)
 			{
-				return true;
+				return Input.AllowInput.All;
 			}
 
 			// if no form is active on this process, then the background input setting applies
 			if (ActiveForm == null && Global.Config.AcceptBackgroundInput)
 			{
-				return true;
+				return Global.Config.AcceptBackgroundInputControllerOnly ? Input.AllowInput.OnlyController : Input.AllowInput.All;
 			}
 
-			return false;
+			return Input.AllowInput.None;
 		}
 
 		// TODO: make this an actual property, set it when loading a Rom, and pass it dialogs, etc
 		// This is a quick hack to reduce the dependency on Global.Emulator
 		private IEmulator Emulator
 		{
-			get
-			{
-				return Global.Emulator;
-			}
+			get => Global.Emulator;
 
 			set
 			{
@@ -727,9 +707,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ProcessInput()
 		{
-			ControllerInputCoalescer conInput = (ControllerInputCoalescer)Global.ControllerInputCoalescer;
+			var conInput = (ControllerInputCoalescer)Global.ControllerInputCoalescer;
 
-			for (;;)
+			for (; ; )
 			{
 				// loop through all available events
 				var ie = Input.Instance.DequeueEvent();
@@ -765,11 +745,11 @@ namespace BizHawk.Client.EmuHawk
 						}
 					}
 
-					// ordinarily, an alt release with nothing else would move focus to the menubar. but that is sort of useless, and hard to implement exactly right.
+					// ordinarily, an alt release with nothing else would move focus to the MenuBar. but that is sort of useless, and hard to implement exactly right.
 				}
 
 				// zero 09-sep-2012 - all input is eligible for controller input. not sure why the above was done. 
-				// maybe because it doesnt make sense to me to bind hotkeys and controller inputs to the same keystrokes
+				// maybe because it doesn't make sense to me to bind hotkeys and controller inputs to the same keystrokes
 
 				// adelikat 02-dec-2012 - implemented options for how to handle controller vs hotkey conflicts. This is primarily motivated by computer emulation and thus controller being nearly the entire keyboard
 				bool handled;
@@ -785,14 +765,14 @@ namespace BizHawk.Client.EmuHawk
 							handled = triggers.Aggregate(handled, (current, trigger) => current | CheckHotkey(trigger));
 						}
 
-						// hotkeys which arent handled as actions get coalesced as pollable virtual client buttons
+						// hotkeys which aren't handled as actions get coalesced as pollable virtual client buttons
 						if (!handled)
 						{
 							_hotkeyCoalescer.Receive(ie);
 						}
 
 						break;
-					case 1: // Input overrides Hokeys
+					case 1: // Input overrides Hotkeys
 						conInput.Receive(ie);
 						if (!Global.ActiveController.HasBinding(ie.LogicalButton.ToString()))
 						{
@@ -802,7 +782,7 @@ namespace BizHawk.Client.EmuHawk
 								handled = triggers.Aggregate(handled, (current, trigger) => current | CheckHotkey(trigger));
 							}
 
-							// hotkeys which arent handled as actions get coalesced as pollable virtual client buttons
+							// hotkeys which aren't handled as actions get coalesced as pollable virtual client buttons
 							if (!handled)
 							{
 								_hotkeyCoalescer.Receive(ie);
@@ -817,12 +797,12 @@ namespace BizHawk.Client.EmuHawk
 							handled = triggers.Aggregate(handled, (current, trigger) => current | CheckHotkey(trigger));
 						}
 
-						// hotkeys which arent handled as actions get coalesced as pollable virtual client buttons
+						// hotkeys which aren't handled as actions get coalesced as pollable virtual client buttons
 						if (!handled)
 						{
 							_hotkeyCoalescer.Receive(ie);
 
-							// Check for hotkeys that may not be handled through Checkhotkey() method, reject controller input mapped to these
+							// Check for hotkeys that may not be handled through CheckHotkey() method, reject controller input mapped to these
 							if (!triggers.Any(IsInternalHotkey))
 							{
 								conInput.Receive(ie);
@@ -857,33 +837,26 @@ namespace BizHawk.Client.EmuHawk
 
 		public void RebootCore()
 		{
-			var ioa = OpenAdvancedSerializer.ParseWithLegacy(_currentlyOpenRomPoopForAdvancedLoaderPleaseRefactorMe);
-			if (ioa is OpenAdvanced_LibretroNoGame)
-			{
-				LoadRom("", CurrentlyOpenRomArgs);
-			}
-			else
-			{
-				LoadRom(ioa.SimplePath, CurrentlyOpenRomArgs);
-			}
+			if (CurrentlyOpenRomArgs == null) return;
+			LoadRom(CurrentlyOpenRomArgs.OpenAdvanced.SimplePath, CurrentlyOpenRomArgs);
 		}
 
 		public void PauseEmulator()
 		{
 			EmulatorPaused = true;
-			SetPauseStatusbarIcon();
+			SetPauseStatusBarIcon();
 		}
 
 		public void UnpauseEmulator()
 		{
 			EmulatorPaused = false;
-			SetPauseStatusbarIcon();
+			SetPauseStatusBarIcon();
 		}
 
 		public void TogglePause()
 		{
 			EmulatorPaused ^= true;
-			SetPauseStatusbarIcon();
+			SetPauseStatusBarIcon();
 
 			// TODO: have tastudio set a pause status change callback, or take control over pause
 			if (GlobalWin.Tools.Has<TAStudio>())
@@ -1027,15 +1000,15 @@ namespace BizHawk.Client.EmuHawk
 			{
 				// TODO - maybe apply a hack tracked during fullscreen here to override it
 				FormBorderStyle = FormBorderStyle.None;
-				MainMenuStrip.Visible = Global.Config.DispChrome_MenuFullscreen && !argParser._chromeless;
-				MainStatusBar.Visible = Global.Config.DispChrome_StatusBarFullscreen && !argParser._chromeless;
+				MainMenuStrip.Visible = Global.Config.DispChrome_MenuFullscreen && !_argParser._chromeless;
+				MainStatusBar.Visible = Global.Config.DispChrome_StatusBarFullscreen && !_argParser._chromeless;
 			}
 			else
 			{
-				MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed && !argParser._chromeless;
-				MainMenuStrip.Visible = Global.Config.DispChrome_MenuWindowed && !argParser._chromeless;
-				MaximizeBox = MinimizeBox = Global.Config.DispChrome_CaptionWindowed && !argParser._chromeless;
-				if (Global.Config.DispChrome_FrameWindowed == 0 || argParser._chromeless)
+				MainStatusBar.Visible = Global.Config.DispChrome_StatusBarWindowed && !_argParser._chromeless;
+				MainMenuStrip.Visible = Global.Config.DispChrome_MenuWindowed && !_argParser._chromeless;
+				MaximizeBox = MinimizeBox = Global.Config.DispChrome_CaptionWindowed && !_argParser._chromeless;
+				if (Global.Config.DispChrome_FrameWindowed == 0 || _argParser._chromeless)
 				{
 					FormBorderStyle = FormBorderStyle.None;
 				}
@@ -1070,17 +1043,17 @@ namespace BizHawk.Client.EmuHawk
 				// Work around an AMD driver bug in >= vista:
 				// It seems windows will activate opengl fullscreen mode when a GL control is occupying the exact space of a screen (0,0 and dimensions=screensize)
 				// AMD cards manifest a problem under these circumstances, flickering other monitors. 
-				// It isnt clear whether nvidia cards are failing to employ this optimization, or just not flickering.
-				// (this could be determined with more work; other side affects of the fullscreen mode include: corrupted taskbar, no modal boxes on top of GL control, no screenshots)
+				// It isn't clear whether nvidia cards are failing to employ this optimization, or just not flickering.
+				// (this could be determined with more work; other side affects of the fullscreen mode include: corrupted TaskBar, no modal boxes on top of GL control, no screenshots)
 				// At any rate, we can solve this by adding a 1px black border around the GL control
 				// Please note: It is important to do this before resizing things, otherwise momentarily a GL control without WS_BORDER will be at the magic dimensions and cause the flakeout
 				if (OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows
 					&& Global.Config.DispFullscreenHacks
 					&& Global.Config.DispMethod == Config.EDispMethod.OpenGL)
 				{
-					//ATTENTION: this causes the statusbar to not work well, since the backcolor is now set to black instead of SystemColors.Control.
-					//It seems that some statusbar elements composite with the backcolor. 
-					//Maybe we could add another control under the statusbar. with a different backcolor
+					// ATTENTION: this causes the StatusBar to not work well, since the backcolor is now set to black instead of SystemColors.Control.
+					// It seems that some StatusBar elements composite with the backcolor. 
+					// Maybe we could add another control under the StatusBar. with a different backcolor
 					Padding = new Padding(1);
 					BackColor = Color.Black;
 
@@ -1105,11 +1078,11 @@ namespace BizHawk.Client.EmuHawk
 
 				if (OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows)
 				{
-					// do this even if DispFullscreenHacks arent enabled, to restore it in case it changed underneath us or something
+					// do this even if DispFullscreenHacks aren't enabled, to restore it in case it changed underneath us or something
 					Padding = new Padding(0);
 
-					// it's important that we set the form color back to this, because the statusbar icons blend onto the mainform, not onto the statusbar--
-					// so we need the statusbar and mainform backdrop color to match
+					// it's important that we set the form color back to this, because the StatusBar icons blend onto the mainform, not onto the StatusBar--
+					// so we need the StatusBar and mainform backdrop color to match
 					BackColor = SystemColors.Control;
 				}
 
@@ -1200,8 +1173,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private LibsnesCore AsSNES => Emulator as LibsnesCore;
-
 		private void SNES_ToggleBg(int layer)
 		{
 			if (!(Emulator is LibsnesCore) && !(Emulator is Snes9x))
@@ -1363,7 +1334,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private AutofireController _autofireNullControls;
 
-		// Sound refator TODO: we can enforce async mode here with a property that gets/sets this but does an async check
+		// Sound refactor TODO: we can enforce async mode here with a property that gets/sets this but does an async check
 		private ISoundProvider _aviSoundInputAsync; // Note: This sound provider must be in async mode!
 
 		private SimpleSyncSoundProvider _dumpProxy; // an audio proxy used for dumping
@@ -1404,7 +1375,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private int _lastOpenRomFilter;
 
-		private ArgParser argParser = new ArgParser();
+		private readonly ArgParser _argParser = new ArgParser();
 
 		// Resources
 		private Bitmap _statusBarDiskLightOnImage;
@@ -1419,7 +1390,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public PresentationPanel PresentationPanel { get; }
 
-		//countdown for saveram autoflushing
+		// countdown for saveram autoflushing
 		public int AutoFlushSaveRamIn { get; set; }
 		#endregion
 
@@ -1474,7 +1445,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			if (!Global.Config.DispChrome_CaptionWindowed || argParser._chromeless)
+			if (!Global.Config.DispChrome_CaptionWindowed || _argParser._chromeless)
 			{
 				str = "";
 			}
@@ -1507,11 +1478,7 @@ namespace BizHawk.Client.EmuHawk
 			DumpStatusButton.Image = Properties.Resources.Blank;
 			DumpStatusButton.ToolTipText = "";
 
-			if (Emulator.IsNull())
-			{
-				return;
-			}
-			else if (Global.Game == null)
+			if (Emulator.IsNull() || Global.Game == null)
 			{
 				return;
 			}
@@ -1563,10 +1530,10 @@ namespace BizHawk.Client.EmuHawk
 			{
 				annotation = Emulator.CoreComm.RomStatusAnnotation;
 
-                if (annotation == "Multi-disk bundler")
-                {
-                    DumpStatusButton.Image = Properties.Resources.RetroQuestion;
-                }
+				if (annotation == "Multi-disk bundler")
+				{
+					DumpStatusButton.Image = Properties.Resources.RetroQuestion;
+				}
 			}
 
 			DumpStatusButton.ToolTipText = annotation;
@@ -1598,8 +1565,8 @@ namespace BizHawk.Client.EmuHawk
 					}
 					else
 					{
-						var oldram = Emulator.AsSaveRam().CloneSaveRam();
-						if (oldram == null)
+						var oldRam = Emulator.AsSaveRam().CloneSaveRam();
+						if (oldRam == null)
 						{
 							// we're eating this one now. The possible negative consequence is that a user could lose
 							// their saveram and not know why
@@ -1608,7 +1575,7 @@ namespace BizHawk.Client.EmuHawk
 						}
 
 						// why do we silently truncate\pad here instead of warning\erroring?
-						sram = new byte[oldram.Length];
+						sram = new byte[oldRam.Length];
 						using (var reader = new BinaryReader(
 								new FileStream(PathManager.SaveRamPath(Global.Game), FileMode.Open, FileAccess.Read)))
 						{
@@ -1624,7 +1591,7 @@ namespace BizHawk.Client.EmuHawk
 					GlobalWin.OSD.AddMessage("An error occurred while loading Sram");
 				}
 			}
-		}		
+		}
 
 		public bool FlushSaveRAM(bool autosave = false)
 		{
@@ -1647,15 +1614,15 @@ namespace BizHawk.Client.EmuHawk
 				var backupFile = new FileInfo(backupPath);
 				if (file.Directory != null && !file.Directory.Exists)
 				{
-                    try
-                    {
-                        file.Directory.Create();
-                    }
-                    catch
-                    {
-                        GlobalWin.OSD.AddMessage($"Unable to flush SaveRAM to: {newFile.Directory}");
-                        return false;
-                    }
+					try
+					{
+						file.Directory.Create();
+					}
+					catch
+					{
+						GlobalWin.OSD.AddMessage($"Unable to flush SaveRAM to: {newFile.Directory}");
+						return false;
+					}
 				}
 
 				var writer = new BinaryWriter(new FileStream(newPath, FileMode.Create, FileAccess.Write));
@@ -1687,7 +1654,7 @@ namespace BizHawk.Client.EmuHawk
 				newFile.MoveTo(path);
 			}
 
-            return true;
+			return true;
 		}
 
 		private void RewireSound()
@@ -1741,8 +1708,8 @@ namespace BizHawk.Client.EmuHawk
 			sNESToolStripMenuItem.Visible = false;
 			neoGeoPocketToolStripMenuItem.Visible = false;
 			pCFXToolStripMenuItem.Visible = false;
-            zXSpectrumToolStripMenuItem.Visible = false;
-            amstradCPCToolStripMenuItem.Visible = false;
+			zXSpectrumToolStripMenuItem.Visible = false;
+			amstradCPCToolStripMenuItem.Visible = false;
 			VectrexSubMenu.Visible = false;
 
 			switch (system)
@@ -1822,7 +1789,7 @@ namespace BizHawk.Client.EmuHawk
 					else
 					{
 						DGBSubMenu.Visible = true;
-					}				
+					}
 					break;
 				case "WSWAN":
 					wonderSwanToolStripMenuItem.Visible = true;
@@ -1845,17 +1812,17 @@ namespace BizHawk.Client.EmuHawk
 				case "PCFX":
 					pCFXToolStripMenuItem.Visible = true;
 					break;
-                case "ZXSpectrum":
-                    zXSpectrumToolStripMenuItem.Visible = true;
+				case "ZXSpectrum":
+					zXSpectrumToolStripMenuItem.Visible = true;
 #if DEBUG
-                    ZXSpectrumExportSnapshotMenuItemMenuItem.Visible = true;
+					ZXSpectrumExportSnapshotMenuItemMenuItem.Visible = true;
 #else
-                    ZXSpectrumExportSnapshotMenuItemMenuItem.Visible = false;
+					ZXSpectrumExportSnapshotMenuItemMenuItem.Visible = false;
 #endif
-                    break;
-                case "AmstradCPC":
-                    amstradCPCToolStripMenuItem.Visible = true;
-                    break;
+					break;
+				case "AmstradCPC":
+					amstradCPCToolStripMenuItem.Visible = true;
+					break;
 				case "GGL":
 					GGLSubMenu.Visible = true;
 					break;
@@ -1921,7 +1888,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void SetPauseStatusbarIcon()
+		private void SetPauseStatusBarIcon()
 		{
 			if (EmulatorPaused)
 			{
@@ -2043,8 +2010,8 @@ namespace BizHawk.Client.EmuHawk
 		private void SaveSlotSelectedMessage()
 		{
 			int slot = Global.Config.SaveSlot;
-			string emptypart = _stateSlots.HasSlot(slot) ? "" : " (empty)";
-			string message = $"Slot {slot}{emptypart} selected.";
+			string emptyPart = _stateSlots.HasSlot(slot) ? "" : " (empty)";
+			string message = $"Slot {slot}{emptyPart} selected.";
 			GlobalWin.OSD.AddMessage(message);
 		}
 
@@ -2059,19 +2026,18 @@ namespace BizHawk.Client.EmuHawk
 			Size currVideoSize = new Size(video.BufferWidth, video.BufferHeight);
 			Size currVirtualSize = new Size(video.VirtualWidth, video.VirtualHeight);
 
-			bool resizeFramebuffer = false;
-			if (currVideoSize != _lastVideoSize || currVirtualSize != _lastVirtualSize)
-				resizeFramebuffer = true;
 
-			bool isZero = false;
-			if (currVideoSize.Width == 0 || currVideoSize.Height == 0 || currVirtualSize.Width == 0 || currVirtualSize.Height == 0)
-				isZero = true;
-			
+			bool resizeFramebuffer = currVideoSize != _lastVideoSize || currVirtualSize != _lastVirtualSize;
+
+			bool isZero = currVideoSize.Width == 0 || currVideoSize.Height == 0 || currVirtualSize.Width == 0 || currVirtualSize.Height == 0;
+
 			//don't resize if the new size is 0 somehow; we'll wait until we have a sensible size
-			if(isZero)
+			if (isZero)
+			{
 				resizeFramebuffer = false;
+			}
 
-			if(resizeFramebuffer)
+			if (resizeFramebuffer)
 			{
 				_lastVideoSize = currVideoSize;
 				_lastVirtualSize = currVirtualSize;
@@ -2080,7 +2046,7 @@ namespace BizHawk.Client.EmuHawk
 
 			//rendering flakes out egregiously if we have a zero size
 			//can we fix it later not to?
-			if(isZero)
+			if (isZero)
 				GlobalWin.DisplayManager.Blank();
 			else
 				GlobalWin.DisplayManager.UpdateSource(video);
@@ -2132,79 +2098,67 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			var str = sb.ToString().Replace("%ARCH%", "*.zip;*.rar;*.7z;*.gz");
+			var str = sb.ToString().Replace("%ARCH%", ArchiveFilters);
 			str = str.Replace(";", "; ");
 			return str;
 		}
 
+		public static FileFilterEntry[] RomFilterEntries { get; } =
+		{
+			new FileFilterEntry("Music Files", null, developerFilters: "*.psf;*.minipsf;*.sid;*.nsf"),
+			new FileFilterEntry("Disc Images", "*.cue;*.ccd;*.mds;*.m3u"),
+			new FileFilterEntry("NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%"),
+			new FileFilterEntry("Super NES", "*.smc;*.sfc;*.xml;%ARCH%"),
+			new FileFilterEntry("PlayStation", "*.cue;*.ccd;*.mds;*.m3u"),
+			new FileFilterEntry("PSX Executables (experimental)", null, developerFilters: "*.exe"),
+			new FileFilterEntry("PSF Playstation Sound File", "*.psf;*.minipsf"),
+			new FileFilterEntry("Nintendo 64", "*.z64;*.v64;*.n64"),
+			new FileFilterEntry("Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%"),
+			new FileFilterEntry("Gameboy Advance", "*.gba;%ARCH%"),
+			new FileFilterEntry("Master System", "*.sms;*.gg;*.sg;%ARCH%"),
+			new FileFilterEntry("PC Engine", "*.pce;*.sgx;*.cue;*.ccd;*.mds;%ARCH%"),
+			new FileFilterEntry("Atari 2600", "*.a26;%ARCH%", developerFilters: "*.bin"),
+			new FileFilterEntry("Atari 7800", "*.a78;%ARCH%", developerFilters: "*.bin"),
+			new FileFilterEntry("Atari Lynx", "*.lnx;%ARCH%"),
+			new FileFilterEntry("ColecoVision", "*.col;%ARCH%"),
+			new FileFilterEntry("IntelliVision", "*.int;*.bin;*.rom;%ARCH%"),
+			new FileFilterEntry("TI-83", "*.rom;%ARCH%"),
+			new FileFilterEntry("Archive Files", "%ARCH%"),
+			new FileFilterEntry("Genesis", "*.gen;*.md;*.smd;*.32x;*.bin;*.cue;*.ccd;%ARCH%"),
+			new FileFilterEntry("SID Commodore 64 Music File", null, developerFilters: "*.sid;%ARCH%"),
+			new FileFilterEntry("WonderSwan", "*.ws;*.wsc;%ARCH%"),
+			new FileFilterEntry("Apple II", "*.dsk;*.do;*.po;%ARCH%"),
+			new FileFilterEntry("Virtual Boy", "*.vb;%ARCH%"),
+			new FileFilterEntry("Neo Geo Pocket", "*.ngp;*.ngc;%ARCH%"),
+			new FileFilterEntry("Commodore 64", "*.prg;*.d64;*.g64;*.crt;*.tap;%ARCH%"),
+			new FileFilterEntry("Amstrad CPC", null, developerFilters: "*.cdt;*.dsk;%ARCH%"),
+			new FileFilterEntry("Sinclair ZX Spectrum", "*.tzx;*.tap;*.dsk;*.pzx;*.csw;*.wav;%ARCH%")
+		};
+
+		public const string ArchiveFilters = "*.zip;*.rar;*.7z;*.gz";
+
 		public static string RomFilter
 		{
 			get
 			{
-				if (VersionInfo.DeveloperBuild)
+				string GetRomFilterStrings()
 				{
-					return FormatFilter(
-						"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.a26;*.a78;*.lnx;*.m3u;*.cue;*.ccd;*.mds;*.exe;*.gb;*.gbc;*.gba;*.gen;*.md;*.32x;*.col;*.int;*.smc;*.sfc;*.prg;*.d64;*.g64;*.crt;*.tap;*.sgb;*.xml;*.z64;*.v64;*.n64;*.ws;*.wsc;*.dsk;*.do;*.po;*.vb;*.ngp;*.ngc;*.psf;*.minipsf;*.nsf;*.tzx;*.pzx;*.csw;*.wav;*.cdt;%ARCH%",
-						"Music Files", "*.psf;*.minipsf;*.sid;*.nsf",
-						"Disc Images", "*.cue;*.ccd;*.mds;*.m3u",
-						"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
-						"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
-						"Master System", "*.sms;*.gg;*.sg;%ARCH%",
-						"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;*.mds;%ARCH%",
-						"TI-83", "*.rom;%ARCH%",
-						"Archive Files", "%ARCH%",
-						"Savestate", "*.state",
-						"Atari 2600", "*.a26;*.bin;%ARCH%",
-						"Atari 7800", "*.a78;*.bin;%ARCH%",
-						"Atari Lynx", "*.lnx;%ARCH%",
-						"Genesis", "*.gen;*.smd;*.bin;*.md;*.32x;*.cue;*.ccd;%ARCH%",
-						"Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%",
-						"Gameboy Advance", "*.gba;%ARCH%",
-						"Colecovision", "*.col;%ARCH%",
-						"Intellivision", "*.int;*.bin;*.rom;%ARCH%",
-						"PlayStation", "*.cue;*.ccd;*.mds;*.m3u",
-						"PSX Executables (experimental)", "*.exe",
-						"PSF Playstation Sound File", "*.psf;*.minipsf",
-						"Commodore 64", "*.prg;*.d64;*.g64;*.crt;*.tap;%ARCH%",
-						"SID Commodore 64 Music File", "*.sid;%ARCH%",
-						"Nintendo 64", "*.z64;*.v64;*.n64",
-						"WonderSwan", "*.ws;*.wsc;%ARCH%",
-						"Apple II", "*.dsk;*.do;*.po;%ARCH%",
-						"Virtual Boy", "*.vb;%ARCH%",
-						"Neo Geo Pocket", "*.ngp;*.ngc;%ARCH%",
-						"Sinclair ZX Spectrum", "*.tzx;*.tap;*.dsk;*.pzx;*.csw;*.wav;%ARCH%",
-						"Amstrad CPC", "*.cdt;*.dsk;%ARCH%",
-						"All Files", "*.*");
+					var values = new HashSet<string>(RomFilterEntries.SelectMany(f => f.EffectiveFilters));
+					if (values.Remove("%ARCH%"))
+					{
+						values.UnionWith(ArchiveFilters.Split(';'));
+					}
+					return string.Join(";", values.OrderBy(n => n));
 				}
 
-				return FormatFilter(
-					"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.32x;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.int;*.rom;*.m3u;*.cue;*.ccd;*.mds;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;*.psf;*.ngp;*.ngc;*.prg;*.d64;*.g64;*.minipsf;*.nsf;*.tzx;*.pzx;*.csw;*.wav;%ARCH%",
-					"Disc Images", "*.cue;*.ccd;*.mds;*.m3u",
-					"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
-					"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
-					"PlayStation", "*.cue;*.ccd;*.mds;*.m3u",
-					"PSF Playstation Sound File", "*.psf;*.minipsf",
-					"Nintendo 64", "*.z64;*.v64;*.n64",
-					"Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%",
-					"Gameboy Advance", "*.gba;%ARCH%",
-					"Master System", "*.sms;*.gg;*.sg;%ARCH%",
-					"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;*.mds;%ARCH%",
-					"Atari 2600", "*.a26;%ARCH%",
-					"Atari 7800", "*.a78;%ARCH%",
-					"Atari Lynx", "*.lnx;%ARCH%",
-					"Colecovision", "*.col;%ARCH%",
-					"Intellivision", "*.int;*.bin;*.rom;%ARCH%",
-					"TI-83", "*.rom;%ARCH%",
-					"Archive Files", "%ARCH%",
-					"Savestate", "*.state",
-					"Genesis", "*.gen;*.md;*.smd;*.32x;*.bin;*.cue;*.ccd;%ARCH%",
-					"WonderSwan", "*.ws;*.wsc;%ARCH%",
-					"Apple II", "*.dsk;*.do;*.po;%ARCH%",
-					"Virtual Boy", "*.vb;%ARCH%",
-					"Neo Geo Pocket", "*.ngp;*.ngc;%ARCH%",
-					"Commodore 64", "*.prg;*.d64;*.g64;*.crt;*.tap;%ARCH%",
-					"Sinclair ZX Spectrum", "*.tzx;*.tap;*.dsk;*.pzx;*.csw;*.wav;%ARCH%",
-					"All Files", "*.*");
+				var allFilters = new List<FileFilterEntry>();
+
+				allFilters.Add(new FileFilterEntry("Rom Files", GetRomFilterStrings()));
+				allFilters.AddRange(RomFilterEntries.Where(f => f.EffectiveFilters.Any()));
+				allFilters.Add(new FileFilterEntry("Savestate", "*.state"));
+				allFilters.Add(new FileFilterEntry("All Files", "*.*"));
+
+				return FormatFilter(allFilters.SelectMany(f => new[] { f.Description, string.Join(";", f.EffectiveFilters) }).ToArray());
 			}
 		}
 
@@ -2243,8 +2197,8 @@ namespace BizHawk.Client.EmuHawk
 				{
 					e.Settings = Global.Config.GetCoreSyncSettings(e.Core);
 
-					// adelikat: only show this nag if the core actually has sync settings, not all cores do
-					if (e.Settings != null && !_supressSyncSettingsWarning)
+					// Only show this nag if the core actually has sync settings, not all cores do
+					if (e.Settings != null && !_suppressSyncSettingsWarning)
 					{
 						MessageBox.Show(
 						"No sync settings found, using currently configured settings for this core.",
@@ -2502,6 +2456,8 @@ namespace BizHawk.Client.EmuHawk
 			FrameBufferResized();
 		}
 
+		private static readonly int[] _speedPercents = { 1, 3, 6, 12, 25, 50, 75, 100, 150, 200, 300, 400, 800, 1600, 3200, 6400 };
+
 		private void IncreaseSpeed()
 		{
 			if (!Global.Config.ClockThrottle)
@@ -2513,66 +2469,13 @@ namespace BizHawk.Client.EmuHawk
 			var oldp = Global.Config.SpeedPercent;
 			int newp;
 
-			if (oldp < 3)
+			int i = 0;
+			do
 			{
-				newp = 3;
-			}
-			else if (oldp < 6)
-			{
-				newp = 6;
-			}
-			else if (oldp < 12)
-			{
-				newp = 12;
-			}
-			else if (oldp < 25)
-			{
-				newp = 25;
-			}
-			else if (oldp < 50)
-			{
-				newp = 50;
-			}
-			else if (oldp < 75)
-			{
-				newp = 75;
-			}
-			else if (oldp < 100)
-			{
-				newp = 100;
-			}
-			else if (oldp < 150)
-			{
-				newp = 150;
-			}
-			else if (oldp < 200)
-			{
-				newp = 200;
-			}
-			else if (oldp < 300)
-			{
-				newp = 300;
-			}
-			else if (oldp < 400)
-			{
-				newp = 400;
-			}
-			else if (oldp < 800)
-			{
-				newp = 800;
-			}
-			else if (oldp < 1600)
-			{
-				newp = 1600;
-			}
-			else if (oldp < 3200)
-			{
-				newp = 3200;
-			}
-			else
-			{
-				newp = 6400;
+				i++;
+				newp = _speedPercents[i];
 			}
+			while (newp <= oldp && i < _speedPercents.Length - 1);
 
 			SetSpeedPercent(newp);
 		}
@@ -2588,66 +2491,13 @@ namespace BizHawk.Client.EmuHawk
 			var oldp = Global.Config.SpeedPercent;
 			int newp;
 
-			if (oldp > 3200)
+			int i = _speedPercents.Length - 1;
+			do
 			{
-				newp = 3200;
-			}
-			else if (oldp > 1600)
-			{
-				newp = 1600;
-			}
-			else if (oldp > 800)
-			{
-				newp = 800;
-			}
-			else if (oldp > 400)
-			{
-				newp = 400;
-			}
-			else if (oldp > 300)
-			{
-				newp = 300;
-			}
-			else if (oldp > 200)
-			{
-				newp = 200;
-			}
-			else if (oldp > 150)
-			{
-				newp = 150;
-			}
-			else if (oldp > 100)
-			{
-				newp = 100;
-			}
-			else if (oldp > 75)
-			{
-				newp = 75;
-			}
-			else if (oldp > 50)
-			{
-				newp = 50;
-			}
-			else if (oldp > 25)
-			{
-				newp = 25;
-			}
-			else if (oldp > 12)
-			{
-				newp = 12;
-			}
-			else if (oldp > 6)
-			{
-				newp = 6;
-			}
-			else if (oldp > 3)
-			{
-				newp = 3;
-			}
-			else
-			{
-				newp = 1;
+				i--;
+				newp = _speedPercents[i];
 			}
+			while (newp >= oldp && i > 0);
 
 			SetSpeedPercent(newp);
 		}
@@ -2815,22 +2665,22 @@ namespace BizHawk.Client.EmuHawk
 			var attributes = Emulator.Attributes();
 
 			CoreNameStatusBarButton.Text = Emulator.DisplayName();
-            CoreNameStatusBarButton.Image = Emulator.Icon();
-            CoreNameStatusBarButton.ToolTipText = attributes.Ported ? "(ported) " : "";
+			CoreNameStatusBarButton.Image = Emulator.Icon();
+			CoreNameStatusBarButton.ToolTipText = attributes.Ported ? "(ported) " : "";
 
 
-            if (Emulator.SystemId == "ZXSpectrum")
-            {
-                var core = (Emulation.Cores.Computers.SinclairSpectrum.ZXSpectrum)Emulator as Emulation.Cores.Computers.SinclairSpectrum.ZXSpectrum;
-                CoreNameStatusBarButton.ToolTipText = core.GetMachineType();
-            }
+			if (Emulator.SystemId == "ZXSpectrum")
+			{
+				var core = (Emulation.Cores.Computers.SinclairSpectrum.ZXSpectrum)Emulator;
+				CoreNameStatusBarButton.ToolTipText = core.GetMachineType();
+			}
 
-            if (Emulator.SystemId == "AmstradCPC")
-            {
-                var core = (Emulation.Cores.Computers.AmstradCPC.AmstradCPC)Emulator as Emulation.Cores.Computers.AmstradCPC.AmstradCPC;
-                CoreNameStatusBarButton.ToolTipText = core.GetMachineType();
-            }
-        }
+			if (Emulator.SystemId == "AmstradCPC")
+			{
+				var core = (Emulation.Cores.Computers.AmstradCPC.AmstradCPC)Emulator;
+				CoreNameStatusBarButton.ToolTipText = core.GetMachineType();
+			}
+		}
 
 		private void ToggleKeyPriority()
 		{
@@ -2947,8 +2797,7 @@ namespace BizHawk.Client.EmuHawk
 				runFrame = true;
 			}
 
-			bool returnToRecording;
-			bool isRewinding = Rewind(ref runFrame, currentTimestamp, out returnToRecording);
+			bool isRewinding = Rewind(ref runFrame, currentTimestamp, out var returnToRecording);
 
 			float atten = 0;
 
@@ -3022,7 +2871,7 @@ namespace BizHawk.Client.EmuHawk
 						FlushSaveRAM(true);
 					}
 				}
-				// why not skip audio if the user doesnt want sound
+				// why not skip audio if the user doesn't want sound
 				bool renderSound = (Global.Config.SoundEnabled && !IsTurboing) || (_currAviWriter?.UsesAudio ?? false);
 				if (!renderSound)
 				{
@@ -3174,11 +3023,11 @@ namespace BizHawk.Client.EmuHawk
 		/// <summary>
 		/// start AVI recording, unattended
 		/// </summary>
-		/// <param name="videowritername">match the short name of an <seealso cref="IVideoWriter"/></param>
+		/// <param name="videoWriterName">match the short name of an <seealso cref="IVideoWriter"/></param>
 		/// <param name="filename">filename to save to</param>
-		private void RecordAv(string videowritername, string filename)
+		private void RecordAv(string videoWriterName, string filename)
 		{
-			RecordAvBase(videowritername, filename, true);
+			RecordAvBase(videoWriterName, filename, true);
 		}
 
 		/// <summary>
@@ -3192,7 +3041,7 @@ namespace BizHawk.Client.EmuHawk
 		/// <summary>
 		/// start AV recording
 		/// </summary>
-		private void RecordAvBase(string videowritername, string filename, bool unattended)
+		private void RecordAvBase(string videoWriterName, string filename, bool unattended)
 		{
 			if (_currAviWriter != null)
 			{
@@ -3202,15 +3051,15 @@ namespace BizHawk.Client.EmuHawk
 			// select IVideoWriter to use
 			IVideoWriter aw;
 
-			if (string.IsNullOrEmpty(videowritername) && !string.IsNullOrEmpty(Global.Config.VideoWriter))
+			if (string.IsNullOrEmpty(videoWriterName) && !string.IsNullOrEmpty(Global.Config.VideoWriter))
 			{
-				videowritername = Global.Config.VideoWriter;
+				videoWriterName = Global.Config.VideoWriter;
 			}
 
 			_dumpaudiosync = Global.Config.VideoWriterAudioSync;
-			if (unattended && !string.IsNullOrEmpty(videowritername))
+			if (unattended && !string.IsNullOrEmpty(videoWriterName))
 			{
-				aw = VideoWriterInventory.GetVideoWriter(videowritername);
+				aw = VideoWriterInventory.GetVideoWriter(videoWriterName);
 			}
 			else
 			{
@@ -3221,7 +3070,7 @@ namespace BizHawk.Client.EmuHawk
 			if (aw == null)
 			{
 				GlobalWin.OSD.AddMessage(
-					unattended ? $"Couldn't start video writer \"{videowritername}\"" : "A/V capture canceled.");
+					unattended ? $"Couldn't start video writer \"{videoWriterName}\"" : "A/V capture canceled.");
 
 				return;
 			}
@@ -3304,7 +3153,7 @@ namespace BizHawk.Client.EmuHawk
 						var sfd = new SaveFileDialog();
 						if (Global.Game != null)
 						{
-							sfd.FileName = $"{PathManager.FilesystemSafeName(Global.Game)}.{ext}"; // dont use Path.ChangeExtension, it might wreck game names with dots in them
+							sfd.FileName = $"{PathManager.FilesystemSafeName(Global.Game)}.{ext}"; // don't use Path.ChangeExtension, it might wreck game names with dots in them
 							sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.AvPathFragment, null);
 						}
 						else
@@ -3413,9 +3262,9 @@ namespace BizHawk.Client.EmuHawk
 				try
 				{
 					// is this the best time to handle this? or deeper inside?
-					if (argParser._currAviWriterFrameList != null)
+					if (_argParser._currAviWriterFrameList != null)
 					{
-						if (!argParser._currAviWriterFrameList.Contains(Emulator.Frame))
+						if (!_argParser._currAviWriterFrameList.Contains(Emulator.Frame))
 						{
 							goto HANDLE_AUTODUMP;
 						}
@@ -3497,14 +3346,14 @@ namespace BizHawk.Client.EmuHawk
 					AbortAv();
 				}
 
-				HANDLE_AUTODUMP:
-				if (argParser._autoDumpLength > 0)
+			HANDLE_AUTODUMP:
+				if (_argParser._autoDumpLength > 0)
 				{
-					argParser._autoDumpLength--;
-					if (argParser._autoDumpLength == 0) // finish
+					_argParser._autoDumpLength--;
+					if (_argParser._autoDumpLength == 0) // finish
 					{
 						StopAv();
-						if (argParser._autoCloseOnDump)
+						if (_argParser._autoCloseOnDump)
 						{
 							_exitRequestPending = true;
 						}
@@ -3513,7 +3362,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private int? LoadArhiveChooser(HawkFile file)
+		private int? LoadArchiveChooser(HawkFile file)
 		{
 			var ac = new ArchiveChooser(file);
 			if (ac.ShowDialog(this) == DialogResult.OK)
@@ -3592,29 +3441,28 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool LoadRom(string path, LoadRomArgs args)
 		{
-			bool ret = _LoadRom(path, args);
-			if(!ret) return false;
+			if (!LoadRomInternal(path, args))
+				return false;
 
-			//what's the meaning of the last rom path when opening an archive? based on the archive file location
+			// what's the meaning of the last rom path when opening an archive? based on the archive file location
 			if (args.OpenAdvanced is OpenAdvanced_OpenRom)
 			{
-				var leftpart = path.Split('|')[0];
-				Global.Config.LastRomPath = Path.GetFullPath(Path.GetDirectoryName(leftpart));
+				var leftPart = path.Split('|')[0];
+				Global.Config.LastRomPath = Path.GetFullPath(Path.GetDirectoryName(leftPart));
 			}
 
 			return true;
 		}
 
 		// Still needs a good bit of refactoring
-		public bool _LoadRom(string path, LoadRomArgs args)
+		private bool LoadRomInternal(string path, LoadRomArgs args)
 		{
-			path = HawkFile.Util_ResolveLink(path);
-
-			// default args
+			if (path == null)
+				throw new ArgumentNullException(nameof(path));
 			if (args == null)
-			{
-				args = new LoadRomArgs();
-			}
+				throw new ArgumentNullException(nameof(args));
+
+			path = HawkFile.Util_ResolveLink(path);
 
 			// if this is the first call to LoadRom (they will come in recursively) then stash the args
 			bool firstCall = false;
@@ -3634,21 +3482,19 @@ namespace BizHawk.Client.EmuHawk
 				// if the core is managing its own DE through SyncSettings a 'deterministic' bool can be passed into the core's constructor
 				// it is then up to the core itself to override its own local DeterministicEmulation setting
 				bool deterministic = args.Deterministic ?? Global.MovieSession.QueuedMovie != null;
-				
+
 				if (!GlobalWin.Tools.AskSave())
 				{
 					return false;
 				}
 
-				bool asLibretro = args.OpenAdvanced is OpenAdvanced_Libretro || args.OpenAdvanced is OpenAdvanced_LibretroNoGame;
-
 				var loader = new RomLoader
 				{
-					ChooseArchive = LoadArhiveChooser,
+					ChooseArchive = LoadArchiveChooser,
 					ChoosePlatform = ChoosePlatformForRom,
 					Deterministic = deterministic,
 					MessageCallback = GlobalWin.OSD.AddMessage,
-					AsLibretro = asLibretro
+					AdvancedLoader = AdvancedLoader
 				};
 				Global.FirmwareManager.RecentlyServed.Clear();
 
@@ -3664,31 +3510,32 @@ namespace BizHawk.Client.EmuHawk
 
 				var nextComm = CreateCoreComm();
 
-				// we need to inform LoadRom which Libretro core to use...
 				IOpenAdvanced ioa = args.OpenAdvanced;
-				if (ioa is IOpenAdvancedLibretro)
-				{
-					var ioaretro = (IOpenAdvancedLibretro)ioa;
+				var oa_openrom = ioa as OpenAdvanced_OpenRom;
+				var oa_retro = ioa as OpenAdvanced_Libretro;
+				var ioa_retro = ioa as IOpenAdvancedLibretro;
 
+				// we need to inform LoadRom which Libretro core to use...
+				if (ioa_retro != null)
+				{
 					// prepare a core specification
-					// if it wasnt already specified, use the current default
-					if (ioaretro.CorePath == null)
+					// if it wasn't already specified, use the current default
+					if (ioa_retro.CorePath == null)
 					{
-						ioaretro.CorePath = Global.Config.LibretroCore;
+						ioa_retro.CorePath = Global.Config.LibretroCore;
 					}
 
-					nextComm.LaunchLibretroCore = ioaretro.CorePath;
+					nextComm.LaunchLibretroCore = ioa_retro.CorePath;
 					if (nextComm.LaunchLibretroCore == null)
 					{
 						throw new InvalidOperationException("Can't load a file via Libretro until a core is specified");
 					}
 				}
 
-				if (ioa is OpenAdvanced_OpenRom)
+				if (oa_openrom != null)
 				{
-					var ioa_openrom = (OpenAdvanced_OpenRom)ioa;
 					// path already has the right value, while ioa.Path is null (interestingly, these are swapped below)
-					// I doubt null is meant to be assigned here, and it just prevents gameload
+					// I doubt null is meant to be assigned here, and it just prevents game load
 					//path = ioa_openrom.Path;
 				}
 
@@ -3696,63 +3543,56 @@ namespace BizHawk.Client.EmuHawk
 				var result = loader.LoadRom(path, nextComm);
 
 				// we need to replace the path in the OpenAdvanced with the canonical one the user chose.
-				// It can't be done until loder.LoadRom happens (for CanonicalFullPath)
+				// It can't be done until loader.LoadRom happens (for CanonicalFullPath)
 				// i'm not sure this needs to be more abstractly engineered yet until we have more OpenAdvanced examples
-				if (ioa is OpenAdvanced_Libretro)
+				if (oa_retro != null)
 				{
-					var oaretro = ioa as OpenAdvanced_Libretro;
-					oaretro.token.Path = loader.CanonicalFullPath;
+					oa_retro.token.Path = loader.CanonicalFullPath;
 				}
 
-				if (ioa is OpenAdvanced_OpenRom)
+				if (oa_openrom != null)
 				{
-					((OpenAdvanced_OpenRom)ioa).Path = loader.CanonicalFullPath;
+					oa_openrom.Path = loader.CanonicalFullPath;
 				}
 
 				if (result)
 				{
-
-					string loaderName = $"*{OpenAdvancedSerializer.Serialize(ioa)}";
+					string openAdvancedArgs = $"*{OpenAdvancedSerializer.Serialize(ioa)}";
 					Emulator = loader.LoadedEmulator;
 					Global.Game = loader.Game;
 					CoreFileProvider.SyncCoreCommInputSignals(nextComm);
 					InputManager.SyncControls();
 
-					if (ioa is OpenAdvanced_OpenRom)
+					if (oa_openrom != null && Path.GetExtension(oa_openrom.Path.Replace("|", "")).ToLowerInvariant() == ".xml" && !(Emulator is LibsnesCore))
 					{
-						OpenAdvanced_OpenRom ioa_openRom = ioa as OpenAdvanced_OpenRom;
+						// this is a multi-disk bundler file
+						// determine the xml assets and create RomStatusDetails for all of them
+						var xmlGame = XmlGame.Create(new HawkFile(oa_openrom.Path));
 
-						if (Path.GetExtension(ioa_openRom.Path.Replace("|","")).ToLower() == ".xml")
+						StringWriter xSw = new StringWriter();
+
+						for (int xg = 0; xg < xmlGame.Assets.Count; xg++)
 						{
-							// this is a multi-disk bundler file
-							// determine the xml assets and create RomStatusDetails for all of them
-							var xmlGame = XmlGame.Create(new HawkFile(ioa_openRom.Path));
+							var ext = Path.GetExtension(xmlGame.AssetFullPaths[xg]).ToLowerInvariant();
 
-							StringWriter xSw = new StringWriter();
-
-							for (int xg = 0; xg < xmlGame.Assets.Count; xg++)
+							if (ext == ".cue" || ext == ".ccd" || ext == ".toc" || ext == ".mds")
 							{
-								var ext = Path.GetExtension(xmlGame.AssetFullPaths[xg]).ToLower();
-
-								if (ext == ".cue" || ext == ".ccd" || ext == ".toc" || ext == ".mds")
-								{
-									xSw.WriteLine(Path.GetFileNameWithoutExtension(xmlGame.Assets[xg].Key));
-									xSw.WriteLine("SHA1:N/A");
-									xSw.WriteLine("MD5:N/A");
-									xSw.WriteLine();
-								}
-								else
-								{
-									xSw.WriteLine(xmlGame.Assets[xg].Key);
-									xSw.WriteLine($"SHA1:{xmlGame.Assets[xg].Value.HashSHA1()}");
-									xSw.WriteLine($"MD5:{xmlGame.Assets[xg].Value.HashMD5()}");
-									xSw.WriteLine();
-								}
+								xSw.WriteLine(Path.GetFileNameWithoutExtension(xmlGame.Assets[xg].Key));
+								xSw.WriteLine("SHA1:N/A");
+								xSw.WriteLine("MD5:N/A");
+								xSw.WriteLine();
+							}
+							else
+							{
+								xSw.WriteLine(xmlGame.Assets[xg].Key);
+								xSw.WriteLine($"SHA1:{xmlGame.Assets[xg].Value.HashSHA1()}");
+								xSw.WriteLine($"MD5:{xmlGame.Assets[xg].Value.HashMD5()}");
+								xSw.WriteLine();
 							}
-
-							Emulator.CoreComm.RomStatusDetails = xSw.ToString();
-							Emulator.CoreComm.RomStatusAnnotation = "Multi-disk bundler";
 						}
+
+						Emulator.CoreComm.RomStatusDetails = xSw.ToString();
+						Emulator.CoreComm.RomStatusAnnotation = "Multi-disk bundler";
 					}
 
 					if (Emulator is TI83 && Global.Config.TI83autoloadKeyPad)
@@ -3760,9 +3600,8 @@ namespace BizHawk.Client.EmuHawk
 						GlobalWin.Tools.Load<TI83KeyPad>();
 					}
 
-					if (loader.LoadedEmulator is NES)
+					if (loader.LoadedEmulator is NES nes)
 					{
-						var nes = (NES)loader.LoadedEmulator;
 						if (!string.IsNullOrWhiteSpace(nes.GameName))
 						{
 							Global.Game.Name = nes.GameName;
@@ -3770,9 +3609,8 @@ namespace BizHawk.Client.EmuHawk
 
 						Global.Game.Status = nes.RomStatus;
 					}
-					else if (loader.LoadedEmulator is QuickNES)
+					else if (loader.LoadedEmulator is QuickNES qns)
 					{
-						var qns = (QuickNES)loader.LoadedEmulator;
 						if (!string.IsNullOrWhiteSpace(qns.BootGodName))
 						{
 							Global.Game.Name = qns.BootGodName;
@@ -3801,13 +3639,13 @@ namespace BizHawk.Client.EmuHawk
 
 					// restarts the lua console if a different rom is loaded.
 					// im not really a fan of how this is done..
-					if (Global.Config.RecentRoms.Empty || Global.Config.RecentRoms.MostRecent != loaderName)
+					if (Global.Config.RecentRoms.Empty || Global.Config.RecentRoms.MostRecent != openAdvancedArgs)
 					{
 						GlobalWin.Tools.Restart<LuaConsole>();
 					}
 
-					Global.Config.RecentRoms.Add(loaderName);
-					JumpLists.AddRecentItem(loaderName, ioa.DisplayName);
+					Global.Config.RecentRoms.Add(openAdvancedArgs);
+					JumpLists.AddRecentItem(openAdvancedArgs, ioa.DisplayName);
 
 					// Don't load Save Ram if a movie is being loaded
 					if (!Global.MovieSession.MovieIsQueued)
@@ -3838,15 +3676,9 @@ namespace BizHawk.Client.EmuHawk
 						}
 					}
 
-					SetWindowText();
-					_currentlyOpenRomPoopForAdvancedLoaderPleaseRefactorMe = loaderName;
-					CurrentlyOpenRom = loaderName.Replace("*OpenRom*", ""); // POOP
-					HandlePlatformMenus();
-					_stateSlots.Clear();
-					UpdateCoreStatusBarButton();
-					UpdateDumpIcon();
-					SetMainformMovieInfo();
+					CurrentlyOpenRom = oa_openrom?.Path ?? openAdvancedArgs;
 					CurrentlyOpenRomArgs = args;
+					OnRomChanged();
 					GlobalWin.DisplayManager.Blank();
 
 					Global.Rewinder.Initialize();
@@ -3874,26 +3706,17 @@ namespace BizHawk.Client.EmuHawk
 					ClientApi.OnRomLoaded(Emulator);
 					return true;
 				}
+				else if (!(Emulator is NullEmulator))
+				{
+					// The ROM has been loaded by a recursive invocation of the LoadROM method.
+					ClientApi.OnRomLoaded(Emulator);
+					return true;
+				}
 				else
 				{
 					// This shows up if there's a problem
-					// TODO: put all these in a single method or something
-
-					// The ROM has been loaded by a recursive invocation of the LoadROM method.
-					if (!(Emulator is NullEmulator))
-					{
-						ClientApi.OnRomLoaded(Emulator);
-						return true;
-					}
-
 					ClientApi.UpdateEmulatorAndVP(Emulator);
-					HandlePlatformMenus();
-					_stateSlots.Clear();
-					UpdateStatusSlots();
-					UpdateCoreStatusBarButton();
-					UpdateDumpIcon();
-					SetMainformMovieInfo();
-					SetWindowText();
+					OnRomChanged();
 					return false;
 				}
 			}
@@ -3906,7 +3729,16 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private string _currentlyOpenRomPoopForAdvancedLoaderPleaseRefactorMe = "";
+		private void OnRomChanged()
+		{
+			SetWindowText();
+			HandlePlatformMenus();
+			_stateSlots.ClearRedoList();
+			UpdateStatusSlots();
+			UpdateCoreStatusBarButton();
+			UpdateDumpIcon();
+			SetMainformMovieInfo();
+		}
 
 		private void CommitCoreSettingsToConfig()
 		{
@@ -3945,15 +3777,15 @@ namespace BizHawk.Client.EmuHawk
 			else if (Emulator.HasSaveRam() && Emulator.AsSaveRam().SaveRamModified)
 			{
 				if (!FlushSaveRAM())
-                {
-                    var msgRes = MessageBox.Show("Failed flushing the game's Save RAM to your disk.\nClose without flushing Save RAM?",
-                            "Directory IO Error", MessageBoxButtons.YesNo, MessageBoxIcon.Error);
+				{
+					var msgRes = MessageBox.Show("Failed flushing the game's Save RAM to your disk.\nClose without flushing Save RAM?",
+							"Directory IO Error", MessageBoxButtons.YesNo, MessageBoxIcon.Error);
 
-                    if (msgRes != DialogResult.Yes)
-                    {
-                        return;
-                    }
-                }
+					if (msgRes != DialogResult.Yes)
+					{
+						return;
+					}
+				}
 			}
 
 			StopAv();
@@ -4001,18 +3833,12 @@ namespace BizHawk.Client.EmuHawk
 				GlobalWin.Tools.Restart();
 				ApiManager.Restart(Emulator.ServiceProvider);
 				RewireSound();
-				Text = $"BizHawk{(VersionInfo.DeveloperBuild ? " (interim) " : "")}";
-				HandlePlatformMenus();
-				_stateSlots.Clear();
-				UpdateDumpIcon();
-				UpdateCoreStatusBarButton();
 				ClearHolds();
-				PauseOnFrame = null;
 				ToolFormBase.UpdateCheatRelatedTools(null, null);
-				UpdateStatusSlots();
+				PauseOnFrame = null;
 				CurrentlyOpenRom = null;
 				CurrentlyOpenRomArgs = null;
-				_currentlyOpenRomPoopForAdvancedLoaderPleaseRefactorMe = "";
+				OnRomChanged();
 			}
 		}
 
@@ -4065,7 +3891,7 @@ namespace BizHawk.Client.EmuHawk
 			return int.Parse(slot.Substring(slot.Length - 1, 1));
 		}
 
-		public void LoadState(string path, string userFriendlyStateName, bool fromLua = false, bool supressOSD = false) // Move to client.common
+		public void LoadState(string path, string userFriendlyStateName, bool fromLua = false, bool suppressOSD = false) // Move to client.common
 		{
 			if (!Emulator.HasSavestates())
 			{
@@ -4107,7 +3933,7 @@ namespace BizHawk.Client.EmuHawk
 					ClearRewindData();
 				}
 
-				if (!supressOSD)
+				if (!suppressOSD)
 				{
 					GlobalWin.OSD.AddMessage($"Loaded state: {userFriendlyStateName}");
 				}
@@ -4120,15 +3946,14 @@ namespace BizHawk.Client.EmuHawk
 			Global.MovieSession.Movie.IsCountingRerecords = wasCountingRerecords;
 		}
 
-		public void LoadQuickSave(string quickSlotName, bool fromLua = false, bool supressOSD = false)
+		public void LoadQuickSave(string quickSlotName, bool fromLua = false, bool suppressOSD = false)
 		{
 			if (!Emulator.HasSavestates())
 			{
 				return;
 			}
 
-			bool handled;
-			ClientApi.OnBeforeQuickLoad(this, quickSlotName, out handled);
+			ClientApi.OnBeforeQuickLoad(this, quickSlotName, out var handled);
 			if (handled)
 			{
 				return;
@@ -4148,7 +3973,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			LoadState(path, quickSlotName, fromLua, supressOSD);
+			LoadState(path, quickSlotName, fromLua, suppressOSD);
 		}
 
 		public void SaveState(string path, string userFriendlyStateName, bool fromLua)
@@ -4415,11 +4240,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void GBAcoresettingsToolStripMenuItem1_Click(object sender, EventArgs e)
-		{
-			GenericCoreConfig.DoDialog(this, "Gameboy Advance Settings");
-		}
-
 		private void CaptureRewind(bool suppressCaptureRewind)
 		{
 			if (IsRewindSlave)
@@ -4432,26 +4252,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void preferencesToolStripMenuItem1_Click(object sender, EventArgs e)
-		{
-			GenericCoreConfig.DoDialog(this, "VirtualBoy Settings");
-		}
-
-		private void preferencesToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			GenericCoreConfig.DoDialog(this, "Snes9x Settings");
-		}
-
-		private void preferencesToolStripMenuItem2_Click(object sender, EventArgs e)
-		{
-			GenericCoreConfig.DoDialog(this, "NeoPop Settings");
-		}
-
-		private void preferencesToolStripMenuItem3_Click(object sender, EventArgs e)
-		{
-			GenericCoreConfig.DoDialog(this, "PC-FX Settings");
-		}
-
 		private bool Rewind(ref bool runFrame, long currentTimestamp, out bool returnToRecording)
 		{
 			var isRewinding = false;
@@ -4479,7 +4279,7 @@ namespace BizHawk.Client.EmuHawk
 							_frameRewindWasPaused = false;
 						}
 
-						// if we're freely running, there's no need for reverse frame progress semantics (that may be debateable though)
+						// if we're freely running, there's no need for reverse frame progress semantics (that may be debatable though)
 						if (!EmulatorPaused)
 						{
 							isRewinding = true;
diff --git a/BizHawk.Client.EmuHawk/OpenAdvancedChooser.Designer.cs b/BizHawk.Client.EmuHawk/OpenAdvancedChooser.Designer.cs
index af6c2fcc75..360c49fcd4 100644
--- a/BizHawk.Client.EmuHawk/OpenAdvancedChooser.Designer.cs
+++ b/BizHawk.Client.EmuHawk/OpenAdvancedChooser.Designer.cs
@@ -28,147 +28,184 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.btnLibretroLaunchNoGame = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.txtLibretroCore = new System.Windows.Forms.TextBox();
-            this.btnLibretroLaunchGame = new System.Windows.Forms.Button();
-            this.btnSetLibretroCore = new System.Windows.Forms.Button();
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.btnClassicLaunchGame = new System.Windows.Forms.Button();
-            this.groupBox2.SuspendLayout();
-            this.groupBox3.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // label3
-            // 
-            this.label3.Location = new System.Drawing.Point(6, 25);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(250, 29);
-            this.label3.TabIndex = 5;
-            this.label3.Text = "Load a rom with the classic BizHawk autodetection method. But why not just use Op" +
-    "en Rom?";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(6, 26);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(69, 13);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "Current Core:";
-            // 
-            // btnLibretroLaunchNoGame
-            // 
-            this.btnLibretroLaunchNoGame.Location = new System.Drawing.Point(217, 50);
-            this.btnLibretroLaunchNoGame.Name = "btnLibretroLaunchNoGame";
-            this.btnLibretroLaunchNoGame.Size = new System.Drawing.Size(102, 23);
-            this.btnLibretroLaunchNoGame.TabIndex = 1;
-            this.btnLibretroLaunchNoGame.Text = "Launch No Game";
-            this.btnLibretroLaunchNoGame.UseVisualStyleBackColor = true;
-            this.btnLibretroLaunchNoGame.Click += new System.EventHandler(this.btnLibretroLaunchNoGame_Click);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(370, 176);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(75, 23);
-            this.btnCancel.TabIndex = 2;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.txtLibretroCore);
-            this.groupBox2.Controls.Add(this.btnLibretroLaunchGame);
-            this.groupBox2.Controls.Add(this.btnSetLibretroCore);
-            this.groupBox2.Controls.Add(this.label2);
-            this.groupBox2.Controls.Add(this.btnLibretroLaunchNoGame);
-            this.groupBox2.Location = new System.Drawing.Point(12, 12);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(433, 81);
-            this.groupBox2.TabIndex = 3;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "Libretro";
-            // 
-            // txtLibretroCore
-            // 
-            this.txtLibretroCore.AllowDrop = true;
-            this.txtLibretroCore.Location = new System.Drawing.Point(81, 23);
-            this.txtLibretroCore.Name = "txtLibretroCore";
-            this.txtLibretroCore.ReadOnly = true;
-            this.txtLibretroCore.Size = new System.Drawing.Size(314, 20);
-            this.txtLibretroCore.TabIndex = 6;
-            this.txtLibretroCore.DragDrop += new System.Windows.Forms.DragEventHandler(this.txtLibretroCore_DragDrop);
-            this.txtLibretroCore.DragEnter += new System.Windows.Forms.DragEventHandler(this.txtLibretroCore_DragEnter);
-            // 
-            // btnLibretroLaunchGame
-            // 
-            this.btnLibretroLaunchGame.Location = new System.Drawing.Point(325, 50);
-            this.btnLibretroLaunchGame.Name = "btnLibretroLaunchGame";
-            this.btnLibretroLaunchGame.Size = new System.Drawing.Size(102, 23);
-            this.btnLibretroLaunchGame.TabIndex = 5;
-            this.btnLibretroLaunchGame.Text = "Launch Game";
-            this.btnLibretroLaunchGame.UseVisualStyleBackColor = true;
-            this.btnLibretroLaunchGame.Click += new System.EventHandler(this.btnLibretroLaunchGame_Click);
-            // 
-            // btnSetLibretroCore
-            // 
-            this.btnSetLibretroCore.AutoSize = true;
-            this.btnSetLibretroCore.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnSetLibretroCore.Location = new System.Drawing.Point(401, 21);
-            this.btnSetLibretroCore.Name = "btnSetLibretroCore";
-            this.btnSetLibretroCore.Size = new System.Drawing.Size(26, 23);
-            this.btnSetLibretroCore.TabIndex = 4;
-            this.btnSetLibretroCore.Text = "...";
-            this.btnSetLibretroCore.UseVisualStyleBackColor = true;
-            this.btnSetLibretroCore.Click += new System.EventHandler(this.btnSetLibretroCore_Click);
-            // 
-            // groupBox3
-            // 
-            this.groupBox3.Controls.Add(this.btnClassicLaunchGame);
-            this.groupBox3.Controls.Add(this.label3);
-            this.groupBox3.Location = new System.Drawing.Point(12, 99);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(277, 100);
-            this.groupBox3.TabIndex = 6;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "BizHawk Classic";
-            // 
-            // btnClassicLaunchGame
-            // 
-            this.btnClassicLaunchGame.Location = new System.Drawing.Point(169, 71);
-            this.btnClassicLaunchGame.Name = "btnClassicLaunchGame";
-            this.btnClassicLaunchGame.Size = new System.Drawing.Size(102, 23);
-            this.btnClassicLaunchGame.TabIndex = 6;
-            this.btnClassicLaunchGame.Text = "Launch Game";
-            this.btnClassicLaunchGame.UseVisualStyleBackColor = true;
-            this.btnClassicLaunchGame.Click += new System.EventHandler(this.btnClassicLaunchGame_Click);
-            // 
-            // OpenAdvancedChooser
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(457, 208);
-            this.Controls.Add(this.groupBox3);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.btnCancel);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "OpenAdvancedChooser";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Open Advanced";
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.groupBox3.ResumeLayout(false);
-            this.ResumeLayout(false);
-
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.btnLibretroLaunchNoGame = new System.Windows.Forms.Button();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.txtLibretroCore = new System.Windows.Forms.TextBox();
+            this.btnLibretroLaunchGame = new System.Windows.Forms.Button();
+            this.btnSetLibretroCore = new System.Windows.Forms.Button();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.btnClassicLaunchGame = new System.Windows.Forms.Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.btnMAMELaunchGame = new System.Windows.Forms.Button();
+            this.groupBox2.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // label3
+            // 
+            this.label3.Location = new System.Drawing.Point(6, 25);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(198, 45);
+            this.label3.TabIndex = 5;
+            this.label3.Text = "Load a ROM with the classic BizHawk autodetection method. But why not just use Op" +
+    "en Rom?";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(6, 26);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(69, 13);
+            this.label2.TabIndex = 3;
+            this.label2.Text = "Current Core:";
+            // 
+            // btnLibretroLaunchNoGame
+            // 
+            this.btnLibretroLaunchNoGame.Location = new System.Drawing.Point(217, 50);
+            this.btnLibretroLaunchNoGame.Name = "btnLibretroLaunchNoGame";
+            this.btnLibretroLaunchNoGame.Size = new System.Drawing.Size(102, 23);
+            this.btnLibretroLaunchNoGame.TabIndex = 1;
+            this.btnLibretroLaunchNoGame.Text = "Launch No Game";
+            this.btnLibretroLaunchNoGame.UseVisualStyleBackColor = true;
+            this.btnLibretroLaunchNoGame.Click += new System.EventHandler(this.btnLibretroLaunchNoGame_Click);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(370, 221);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(75, 23);
+            this.btnCancel.TabIndex = 2;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.txtLibretroCore);
+            this.groupBox2.Controls.Add(this.btnLibretroLaunchGame);
+            this.groupBox2.Controls.Add(this.btnSetLibretroCore);
+            this.groupBox2.Controls.Add(this.label2);
+            this.groupBox2.Controls.Add(this.btnLibretroLaunchNoGame);
+            this.groupBox2.Location = new System.Drawing.Point(12, 12);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(433, 81);
+            this.groupBox2.TabIndex = 3;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Libretro";
+            // 
+            // txtLibretroCore
+            // 
+            this.txtLibretroCore.AllowDrop = true;
+            this.txtLibretroCore.Location = new System.Drawing.Point(81, 23);
+            this.txtLibretroCore.Name = "txtLibretroCore";
+            this.txtLibretroCore.ReadOnly = true;
+            this.txtLibretroCore.Size = new System.Drawing.Size(314, 20);
+            this.txtLibretroCore.TabIndex = 6;
+            this.txtLibretroCore.DragDrop += new System.Windows.Forms.DragEventHandler(this.txtLibretroCore_DragDrop);
+            this.txtLibretroCore.DragEnter += new System.Windows.Forms.DragEventHandler(this.txtLibretroCore_DragEnter);
+            // 
+            // btnLibretroLaunchGame
+            // 
+            this.btnLibretroLaunchGame.Location = new System.Drawing.Point(325, 50);
+            this.btnLibretroLaunchGame.Name = "btnLibretroLaunchGame";
+            this.btnLibretroLaunchGame.Size = new System.Drawing.Size(102, 23);
+            this.btnLibretroLaunchGame.TabIndex = 5;
+            this.btnLibretroLaunchGame.Text = "Launch Game";
+            this.btnLibretroLaunchGame.UseVisualStyleBackColor = true;
+            this.btnLibretroLaunchGame.Click += new System.EventHandler(this.btnLibretroLaunchGame_Click);
+            // 
+            // btnSetLibretroCore
+            // 
+            this.btnSetLibretroCore.AutoSize = true;
+            this.btnSetLibretroCore.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.btnSetLibretroCore.Location = new System.Drawing.Point(401, 21);
+            this.btnSetLibretroCore.Name = "btnSetLibretroCore";
+            this.btnSetLibretroCore.Size = new System.Drawing.Size(26, 23);
+            this.btnSetLibretroCore.TabIndex = 4;
+            this.btnSetLibretroCore.Text = "...";
+            this.btnSetLibretroCore.UseVisualStyleBackColor = true;
+            this.btnSetLibretroCore.Click += new System.EventHandler(this.btnSetLibretroCore_Click);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.btnClassicLaunchGame);
+            this.groupBox3.Controls.Add(this.label3);
+            this.groupBox3.Location = new System.Drawing.Point(235, 99);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(210, 100);
+            this.groupBox3.TabIndex = 6;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "BizHawk Classic";
+            // 
+            // btnClassicLaunchGame
+            // 
+            this.btnClassicLaunchGame.Location = new System.Drawing.Point(102, 71);
+            this.btnClassicLaunchGame.Name = "btnClassicLaunchGame";
+            this.btnClassicLaunchGame.Size = new System.Drawing.Size(102, 23);
+            this.btnClassicLaunchGame.TabIndex = 6;
+            this.btnClassicLaunchGame.Text = "Launch Game";
+            this.btnClassicLaunchGame.UseVisualStyleBackColor = true;
+            this.btnClassicLaunchGame.Click += new System.EventHandler(this.btnClassicLaunchGame_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Controls.Add(this.btnMAMELaunchGame);
+            this.groupBox1.Location = new System.Drawing.Point(13, 99);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(216, 100);
+            this.groupBox1.TabIndex = 7;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "MAME Arcade";
+            // 
+            // label1
+            // 
+            this.label1.Location = new System.Drawing.Point(6, 25);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(204, 42);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "Load .zip archive as MAME Arcade ROM (do not unzip)";
+            this.label1.Click += new System.EventHandler(this.btnMAMELaunchGame_Click);
+            // 
+            // btnMAMELaunchGame
+            // 
+            this.btnMAMELaunchGame.Location = new System.Drawing.Point(108, 71);
+            this.btnMAMELaunchGame.Name = "btnMAMELaunchGame";
+            this.btnMAMELaunchGame.Size = new System.Drawing.Size(102, 23);
+            this.btnMAMELaunchGame.TabIndex = 0;
+            this.btnMAMELaunchGame.Text = "Launch Game";
+            this.btnMAMELaunchGame.UseVisualStyleBackColor = true;
+            this.btnMAMELaunchGame.Click += new System.EventHandler(this.btnMAMELaunchGame_Click);
+            // 
+            // OpenAdvancedChooser
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(457, 256);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.btnCancel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "OpenAdvancedChooser";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Open Advanced";
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
 		}
 
 		#endregion
@@ -182,6 +219,9 @@
 		private System.Windows.Forms.TextBox txtLibretroCore;
 		private System.Windows.Forms.Button btnLibretroLaunchGame;
 		private System.Windows.Forms.GroupBox groupBox3;
-		private System.Windows.Forms.Button btnClassicLaunchGame;
+		private System.Windows.Forms.Button btnClassicLaunchGame;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Button btnMAMELaunchGame;
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs b/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs
index 8eff5a7e6e..f68d411837 100644
--- a/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs
+++ b/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs
@@ -7,7 +7,8 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-
+
+using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores;
 using BizHawk.Emulation.Cores.Libretro;
 using BizHawk.Client.Common;
@@ -20,13 +21,7 @@ namespace BizHawk.Client.EmuHawk
 	{
 		MainForm mainForm;
 
-		public enum Command
-		{
-			RetroLaunchNoGame, RetroLaunchGame,
-			ClassicLaunchGame
-		}
-
-		public Command Result;
+		public AdvancedRomLoaderType Result;
 		public string SuggestedExtensionFilter;
 
 		public OpenAdvancedChooser(MainForm mainForm)
@@ -131,21 +126,28 @@ namespace BizHawk.Client.EmuHawk
 			filter = MainForm.FormatFilter(args.ToArray());
 			SuggestedExtensionFilter = filter;
 
-			Result = Command.RetroLaunchGame;
+			Result = AdvancedRomLoaderType.LibretroLaunchGame;
 			DialogResult =  DialogResult.OK;
 			Close();
+		}
+
+		private void btnMAMELaunchGame_Click(object sender, EventArgs e)
+		{
+			Result = AdvancedRomLoaderType.MAMELaunchGame;
+			DialogResult = DialogResult.OK;
+			Close();
 		}
 
 		private void btnClassicLaunchGame_Click(object sender, EventArgs e)
 		{
-			Result = Command.ClassicLaunchGame;
+			Result = AdvancedRomLoaderType.ClassicLaunchGame;
 			DialogResult = DialogResult.OK;
 			Close();
 		}
 
 		private void btnLibretroLaunchNoGame_Click(object sender, EventArgs e)
 		{
-			Result = Command.RetroLaunchNoGame;
+			Result = AdvancedRomLoaderType.LibretroLaunchNoGame;
 			DialogResult = DialogResult.OK;
 			Close();
 		}
@@ -170,6 +172,6 @@ namespace BizHawk.Client.EmuHawk
 			var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
 			Global.Config.LibretroCore = filePaths[0];
 			RefreshLibretroCore(false);
-		}
+		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/Program.cs b/BizHawk.Client.EmuHawk/Program.cs
index 10fb48b196..f05542abb8 100644
--- a/BizHawk.Client.EmuHawk/Program.cs
+++ b/BizHawk.Client.EmuHawk/Program.cs
@@ -30,36 +30,33 @@ namespace BizHawk.Client.EmuHawk
 				//try loading libraries we know we'll need
 				//something in the winforms, etc. code below will cause .net to popup a missing msvcr100.dll in case that one's missing
 				//but oddly it lets us proceed and we'll then catch it here
-				var d3dx9 = libLoader.LoadPlatformSpecific("d3dx9_43.dll");
-				var vc2015 = libLoader.LoadPlatformSpecific("vcruntime140.dll");
-				var vc2012 = libLoader.LoadPlatformSpecific("msvcr120.dll"); //TODO - check version?
-				var vc2010 = libLoader.LoadPlatformSpecific("msvcr100.dll"); //TODO - check version?
-				var vc2010p = libLoader.LoadPlatformSpecific("msvcp100.dll");
-				var fail = vc2015 == IntPtr.Zero || vc2010 == IntPtr.Zero || vc2012 == IntPtr.Zero || vc2010p == IntPtr.Zero;
-				var warn = d3dx9 == IntPtr.Zero;
-				if (fail || warn)
+				var d3dx9 = libLoader.LoadOrNull("d3dx9_43.dll");
+				var vc2015 = libLoader.LoadOrNull("vcruntime140.dll");
+				var vc2012 = libLoader.LoadOrNull("msvcr120.dll"); //TODO - check version?
+				var vc2010 = libLoader.LoadOrNull("msvcr100.dll"); //TODO - check version?
+				var vc2010p = libLoader.LoadOrNull("msvcp100.dll");
+				var reqPresent = vc2015.HasValue && vc2010.HasValue && vc2012.HasValue && vc2010p.HasValue;
+				var optPresent = d3dx9.HasValue;
+				if (!reqPresent || !optPresent)
 				{
 					var alertLines = new[]
 					{
 						"[ OK ] .NET CLR (You wouldn't even get here without it)",
-						$"[{(d3dx9 == IntPtr.Zero ? "WARN" : " OK ")}] Direct3d 9",
-						$"[{(vc2010 == IntPtr.Zero || vc2010p == IntPtr.Zero ? "FAIL" : " OK ")}] Visual C++ 2010 SP1 Runtime",
-						$"[{(vc2012 == IntPtr.Zero ? "FAIL" : " OK ")}] Visual C++ 2012 Runtime",
-						$"[{(vc2015 == IntPtr.Zero ? "FAIL" : " OK ")}] Visual C++ 2015 Runtime"
+						$"[{(d3dx9.HasValue ? " OK " : "WARN")}] Direct3d 9",
+						$"[{(vc2010.HasValue && vc2010p.HasValue ? " OK " : "FAIL")}] Visual C++ 2010 SP1 Runtime",
+						$"[{(vc2012.HasValue ? " OK " : "FAIL")}] Visual C++ 2012 Runtime",
+						$"[{(vc2015.HasValue ? " OK " : "FAIL")}] Visual C++ 2015 Runtime"
 					};
-					var box = new BizHawk.Client.EmuHawk.CustomControls.PrereqsAlert(!fail)
+					var box = new CustomControls.PrereqsAlert(reqPresent)
 					{
-						textBox1 = { Text = string.Concat("\n", alertLines) }
+						textBox1 = { Text = string.Join(Environment.NewLine, alertLines) }
 					};
 					box.ShowDialog();
-					if (fail) System.Diagnostics.Process.GetCurrentProcess().Kill();
+					if (!reqPresent) Process.GetCurrentProcess().Kill();
 				}
 
-				libLoader.FreePlatformSpecific(d3dx9);
-				libLoader.FreePlatformSpecific(vc2015);
-				libLoader.FreePlatformSpecific(vc2012);
-				libLoader.FreePlatformSpecific(vc2010);
-				libLoader.FreePlatformSpecific(vc2010p);
+				foreach (var p in new[] { d3dx9, vc2015, vc2012, vc2010, vc2010p })
+					if (p.HasValue) libLoader.FreeByPtr(p.Value);
 
 				// this will look in subdirectory "dll" to load pinvoked stuff
 				var dllDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll");
@@ -115,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			BizHawk.Common.TempFileManager.Start();
+			TempFileManager.Start();
 
 #if true // switch to if false for system-agnostic glory!
 			switch (EXE_PROJECT.OSTailoredCode.CurrentOS)
@@ -147,8 +144,8 @@ namespace BizHawk.Client.EmuHawk
 
 			Global.Config.ResolveDefaults();
 
-			BizHawk.Client.Common.StringLogUtil.DefaultToDisk = Global.Config.MoviesOnDisk;
-			BizHawk.Client.Common.StringLogUtil.DefaultToAWE = Global.Config.MoviesInAWE;
+			StringLogUtil.DefaultToDisk = Global.Config.MoviesOnDisk;
+			StringLogUtil.DefaultToAWE = Global.Config.MoviesInAWE;
 
 			// super hacky! this needs to be done first. still not worth the trouble to make this system fully proper
 			if (Array.Exists(args, arg => arg.StartsWith("--gdi", StringComparison.InvariantCultureIgnoreCase)))
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
index d9e97b6eff..0ca90c2902 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -120,6 +120,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ArcadeController {
+            get {
+                object obj = ResourceManager.GetObject("ArcadeController", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -870,6 +880,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap mame {
+            get {
+                object obj = ResourceManager.GetObject("mame", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -1479,6 +1499,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap StopButton {
+            get {
+                object obj = ResourceManager.GetObject("StopButton", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx
index 1876bfb3b7..ac426a1592 100644
--- a/BizHawk.Client.EmuHawk/Properties/Resources.resx
+++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx
@@ -1563,4 +1563,13 @@
   <data name="MoveTop" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\MoveTop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="StopButton" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\StopButton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ArcadeController" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\ControllerImages\ArcadeController.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="mame" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\mame.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.Client.EmuHawk/Sound/Interfaces/ISoundOutput.cs b/BizHawk.Client.EmuHawk/Sound/Interfaces/ISoundOutput.cs
index f6dce3be8d..061c93d7ff 100644
--- a/BizHawk.Client.EmuHawk/Sound/Interfaces/ISoundOutput.cs
+++ b/BizHawk.Client.EmuHawk/Sound/Interfaces/ISoundOutput.cs
@@ -9,6 +9,6 @@ namespace BizHawk.Client.EmuHawk
 		void ApplyVolumeSettings(double volume);
 		int MaxSamplesDeficit { get; }
 		int CalculateSamplesNeeded();
-		void WriteSamples(short[] samples, int sampleCount);
+		void WriteSamples(short[] samples, int sampleOffset, int sampleCount);
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs b/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs
index 21ca8bd90f..20d0959cad 100644
--- a/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs
+++ b/BizHawk.Client.EmuHawk/Sound/Output/DirectSoundSoundOutput.cs
@@ -42,7 +42,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public static IEnumerable<string> GetDeviceNames()
 		{
-			return DirectSound.GetDevices().Select(d => d.Description).ToList();
+			return DirectSound.GetDevices().Select(d => d.Description);
 		}
 
 		private int BufferSizeSamples { get; set; }
@@ -152,12 +152,10 @@ namespace BizHawk.Client.EmuHawk
 			return (end - start + size) % size;
 		}
 
-		public void WriteSamples(short[] samples, int sampleCount)
+		public void WriteSamples(short[] samples, int sampleOffset, int sampleCount)
 		{
 			if (sampleCount == 0) return;
-			int total = sampleCount * Sound.ChannelCount;
-			if (total > samples.Length) { total = samples.Length; }
-			_deviceBuffer.Write(samples, 0, total, _actualWriteOffsetBytes, LockFlags.None);
+			_deviceBuffer.Write(samples, sampleOffset * Sound.ChannelCount, sampleCount * Sound.ChannelCount, _actualWriteOffsetBytes, LockFlags.None);
 			_actualWriteOffsetBytes = (_actualWriteOffsetBytes + (sampleCount * Sound.BlockAlign)) % BufferSizeBytes;
 			_filledBufferSizeBytes += sampleCount * Sound.BlockAlign;
 		}
diff --git a/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs b/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs
index d1632ced87..31aebb6fa1 100644
--- a/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs
+++ b/BizHawk.Client.EmuHawk/Sound/Output/DummySoundOutput.cs
@@ -73,7 +73,7 @@ namespace BizHawk.Client.EmuHawk
 			return samplesNeeded;
 		}
 
-		public void WriteSamples(short[] samples, int sampleCount)
+		public void WriteSamples(short[] samples, int sampleOffset, int sampleCount)
 		{
 			if (sampleCount == 0) return;
 			_remainingSamples += sampleCount;
diff --git a/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs b/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs
index 263a18c5be..37d3d277ea 100644
--- a/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs
+++ b/BizHawk.Client.EmuHawk/Sound/Output/OpenALSoundOutput.cs
@@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk
 		private int _sourceID;
 		private BufferPool _bufferPool;
 		private int _currentSamplesQueued;
+		private short[] _tempSampleBuffer;
 
 		public OpenALSoundOutput(Sound sound)
 		{
@@ -94,11 +95,17 @@ namespace BizHawk.Client.EmuHawk
 			return samplesNeeded;
 		}
 
-		public void WriteSamples(short[] samples, int sampleCount)
+		public void WriteSamples(short[] samples, int sampleOffset, int sampleCount)
 		{
 			if (sampleCount == 0) return;
 			UnqueueProcessedBuffers();
 			int byteCount = sampleCount * Sound.BlockAlign;
+			if (sampleOffset != 0)
+			{
+				AllocateTempSampleBuffer(sampleCount);
+				Buffer.BlockCopy(samples, sampleOffset * Sound.BlockAlign, _tempSampleBuffer, 0, byteCount);
+				samples = _tempSampleBuffer;
+			}
 			var buffer = _bufferPool.Obtain(byteCount);
 			AL.BufferData(buffer.BufferID, ALFormat.Stereo16, samples, byteCount, Sound.SampleRate);
 			AL.SourceQueueBuffer(_sourceID, buffer.BufferID);
@@ -127,6 +134,15 @@ namespace BizHawk.Client.EmuHawk
 			return value;
 		}
 
+		private void AllocateTempSampleBuffer(int sampleCount)
+		{
+			int length = sampleCount * Sound.ChannelCount;
+			if (_tempSampleBuffer == null || _tempSampleBuffer.Length < length)
+			{
+				_tempSampleBuffer = new short[length];
+			}
+		}
+
 		private class BufferPool : IDisposable
 		{
 			private Stack<BufferPoolItem> _availableItems = new Stack<BufferPoolItem>();
diff --git a/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs b/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs
index e5bf4f8dc0..80fb913f06 100644
--- a/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs
+++ b/BizHawk.Client.EmuHawk/Sound/Output/XAudio2SoundOutput.cs
@@ -49,7 +49,9 @@ namespace BizHawk.Client.EmuHawk
 		{
 			using (XAudio2 device = new XAudio2())
 			{
-				return Enumerable.Range(0, device.DeviceCount).Select(n => device.GetDeviceDetails(n).DisplayName).ToList();
+				return Enumerable.Range(0, device.DeviceCount)
+					.Select(n => device.GetDeviceDetails(n).DisplayName)
+					.ToList(); // enumerate before local var device is disposed
 			}
 		}
 
@@ -110,14 +112,13 @@ namespace BizHawk.Client.EmuHawk
 			return samplesNeeded;
 		}
 
-		public void WriteSamples(short[] samples, int sampleCount)
+		public void WriteSamples(short[] samples, int sampleOffset, int sampleCount)
 		{
 			if (sampleCount == 0) return;
 			_bufferPool.Release(_sourceVoice.State.BuffersQueued);
 			int byteCount = sampleCount * Sound.BlockAlign;
 			var buffer = _bufferPool.Obtain(byteCount);
-			if (byteCount > (samples.Length * 2)) { byteCount = samples.Length * 2; }
-			Buffer.BlockCopy(samples, 0, buffer.Bytes, 0, byteCount);
+			Buffer.BlockCopy(samples, sampleOffset * Sound.BlockAlign, buffer.Bytes, 0, byteCount);
 			_sourceVoice.SubmitSourceBuffer(new AudioBuffer
 				{
 					AudioBytes = byteCount,
diff --git a/BizHawk.Client.EmuHawk/Sound/Sound.cs b/BizHawk.Client.EmuHawk/Sound/Sound.cs
index 85aaa2502d..6156b3cfc4 100644
--- a/BizHawk.Client.EmuHawk/Sound/Sound.cs
+++ b/BizHawk.Client.EmuHawk/Sound/Sound.cs
@@ -16,8 +16,6 @@ namespace BizHawk.Client.EmuHawk
 		public const int BlockAlign = BytesPerSample * ChannelCount;
 
 		private bool _disposed;
-		private bool _unjamSoundThrottle;
-
 		private readonly ISoundOutput _outputDevice;
 		private readonly SoundOutputProvider _outputProvider = new SoundOutputProvider(); // Buffer for Sync sources
 		private readonly BufferedAsync _bufferedAsync = new BufferedAsync(); // Buffer for Async sources
@@ -118,9 +116,8 @@ namespace BizHawk.Client.EmuHawk
 			// Fill device buffer with silence but leave enough room for one frame
 			int samplesPerFrame = (int)Math.Round(SampleRate / (double)Global.Emulator.VsyncRate());
 			int silenceSamples = Math.Max(samplesNeeded - samplesPerFrame, 0);
-			_outputDevice.WriteSamples(new short[silenceSamples * 2], silenceSamples);
+			_outputDevice.WriteSamples(new short[silenceSamples * 2], 0, silenceSamples);
 			samplesNeeded -= silenceSamples;
-			_unjamSoundThrottle = isUnderrun;
 
 			if (isUnderrun)
 			{
@@ -141,14 +138,16 @@ namespace BizHawk.Client.EmuHawk
 			if (atten > 1) atten = 1;
 			_outputDevice.ApplyVolumeSettings(atten);
 
-			short[] samples;
 			int samplesNeeded = _outputDevice.CalculateSamplesNeeded();
-			int samplesProvided;
+			short[] samples;
+			int sampleOffset;
+			int sampleCount;
 
 			if (atten == 0)
 			{
 				samples = new short[samplesNeeded * ChannelCount];
-				samplesProvided = samplesNeeded;
+				sampleOffset = 0;
+				sampleCount = samplesNeeded;
 
 				_bufferedProvider.DiscardSamples();
 			}
@@ -156,25 +155,34 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (Global.Config.SoundThrottle)
 				{
-					_outputProvider.BaseSoundProvider.GetSamplesSync(out samples, out samplesProvided);
+					_outputProvider.BaseSoundProvider.GetSamplesSync(out samples, out sampleCount);
+					sampleOffset = 0;
 
-					if (Global.DisableSecondaryThrottling && samplesProvided > samplesNeeded)
+					if (Global.DisableSecondaryThrottling && sampleCount > samplesNeeded)
 					{
 						return;
 					}
 
-					while (samplesProvided > samplesNeeded)
+					int samplesPerMs = SampleRate / 1000;
+					int outputThresholdMs = 20;
+					while (sampleCount > samplesNeeded)
 					{
-						Thread.Sleep((samplesProvided - samplesNeeded) / (SampleRate / 1000)); // Let the audio clock control sleep time
-						samplesNeeded = _outputDevice.CalculateSamplesNeeded();
-						if (_unjamSoundThrottle)
+						if (samplesNeeded >= outputThresholdMs * samplesPerMs)
 						{
-							//may be garbage, but what can we do?
-							samplesProvided = samplesNeeded;
-							break;
+							// If we were given a large enough number of samples (e.g. larger than the device's
+							// buffer), the device will never need that many samples no matter how long we
+							// wait, so we have to start splitting up the output
+							_outputDevice.WriteSamples(samples, sampleOffset, samplesNeeded);
+							sampleOffset += samplesNeeded;
+							sampleCount -= samplesNeeded;
 						}
+						else
+						{
+							// Let the audio clock control sleep time
+							Thread.Sleep(Math.Min((sampleCount - samplesNeeded) / samplesPerMs, outputThresholdMs));
+						}
+						samplesNeeded = _outputDevice.CalculateSamplesNeeded();
 					}
-					_unjamSoundThrottle = false;
 				}
 				else
 				{
@@ -182,7 +190,8 @@ namespace BizHawk.Client.EmuHawk
 					{
 						_outputProvider.OnVolatility();
 					}
-					_outputProvider.GetSamples(samplesNeeded, out samples, out samplesProvided);
+					_outputProvider.GetSamples(samplesNeeded, out samples, out sampleCount);
+					sampleOffset = 0;
 				}
 			}
 			else if (_bufferedProvider == _bufferedAsync)
@@ -191,14 +200,15 @@ namespace BizHawk.Client.EmuHawk
 
 				_bufferedAsync.GetSamplesAsync(samples);
 
-				samplesProvided = samplesNeeded;
+				sampleOffset = 0;
+				sampleCount = samplesNeeded;
 			}
 			else
 			{
 				return;
 			}
 
-			_outputDevice.WriteSamples(samples, samplesProvided);
+			_outputDevice.WriteSamples(samples, sampleOffset, sampleCount);
 		}
 
 		public static int MillisecondsToSamples(int milliseconds)
diff --git a/BizHawk.Client.EmuHawk/ToolAttribute.cs b/BizHawk.Client.EmuHawk/ToolAttribute.cs
index 721fa0cf48..53a2f837da 100644
--- a/BizHawk.Client.EmuHawk/ToolAttribute.cs
+++ b/BizHawk.Client.EmuHawk/ToolAttribute.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -9,14 +10,14 @@ namespace BizHawk.Client.EmuHawk
 		public ToolAttribute(bool released, string[] supportedSystems, string[] unsupportedCores = null)
 		{
 			Released = released;
-			SupportedSystems = supportedSystems;
-            UnsupportedCores = unsupportedCores;
+			SupportedSystems = supportedSystems ?? Enumerable.Empty<string>();
+			UnsupportedCores = unsupportedCores ?? Enumerable.Empty<string>();
 		}
 
-		public bool Released { get; private set; }
+		public bool Released { get; }
 
-		public IEnumerable<string> SupportedSystems { get; private set; }
+		public IEnumerable<string> SupportedSystems { get; }
 
-        public IEnumerable<string> UnsupportedCores { get; private set; }
+		public IEnumerable<string> UnsupportedCores { get; }
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/UIHelper.cs b/BizHawk.Client.EmuHawk/UIHelper.cs
index 27fffa4448..cc74296676 100644
--- a/BizHawk.Client.EmuHawk/UIHelper.cs
+++ b/BizHawk.Client.EmuHawk/UIHelper.cs
@@ -2,42 +2,21 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace BizHawk.Client.Common
+namespace BizHawk.Client.EmuHawk
 {
 	public static class UIHelper
 	{
-		private static readonly AutoScaleMode _autoScaleMode = AutoScaleMode.Font;
-		private static readonly SizeF _autoScaleBaseSize = new SizeF(6F, 13F);
-		private static readonly SizeF _autoScaleCurrentSize = GetCurrentAutoScaleSize(_autoScaleMode);
+		public static AutoScaleMode AutoScaleMode { get; } = AutoScaleMode.Font;
 
-		private static SizeF GetCurrentAutoScaleSize(AutoScaleMode autoScaleMode)
-		{
-			using (Form form = new Form())
-			{
-				form.AutoScaleMode = autoScaleMode;
-				return form.CurrentAutoScaleDimensions;
-			}
-		}
+		public static SizeF AutoScaleBaseSize { get; } = new SizeF(6F, 13F);
 
-		public static AutoScaleMode AutoScaleMode
-		{
-			get { return _autoScaleMode; }
-		}
+		public static SizeF AutoScaleCurrentSize { get; } = GetCurrentAutoScaleSize(AutoScaleMode);
 
-		public static SizeF AutoScaleBaseSize
-		{
-			get { return _autoScaleBaseSize; }
-		}
+		public static float AutoScaleFactorX { get; } = AutoScaleCurrentSize.Width / AutoScaleBaseSize.Width;
 
-		public static float AutoScaleFactorX
-		{
-			get { return _autoScaleCurrentSize.Width / _autoScaleBaseSize.Width; }
-		}
+		public static float AutoScaleFactorY { get; } = AutoScaleCurrentSize.Height / AutoScaleBaseSize.Height;
 
-		public static float AutoScaleFactorY
-		{
-			get { return _autoScaleCurrentSize.Height / _autoScaleBaseSize.Height; }
-		}
+		public static SizeF AutoScaleFactor { get; } = new SizeF(AutoScaleFactorX, AutoScaleFactorY);
 
 		public static int ScaleX(int size)
 		{
@@ -58,5 +37,13 @@ namespace BizHawk.Client.Common
 		{
 			return new Size(ScaleX(s.Width), ScaleY(s.Height));
 		}
+
+		private static SizeF GetCurrentAutoScaleSize(AutoScaleMode autoScaleMode)
+		{
+			using (var form = new Form { AutoScaleMode = autoScaleMode })
+			{
+				return form.CurrentAutoScaleDimensions;
+			}
+		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/app.config b/BizHawk.Client.EmuHawk/app.config
index 9b69721c46..9d91d3673b 100644
--- a/BizHawk.Client.EmuHawk/app.config
+++ b/BizHawk.Client.EmuHawk/app.config
@@ -3,7 +3,10 @@
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
 	</startup>
-		<runtime>
-			<loadFromRemoteSources enabled="true"/>
-		</runtime>
+	<runtime>
+		<loadFromRemoteSources enabled="true"/>
+	</runtime>
+	<appSettings>
+		<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
+	</appSettings>
 </configuration>
diff --git a/BizHawk.Client.EmuHawk/app.manifest b/BizHawk.Client.EmuHawk/app.manifest
new file mode 100644
index 0000000000..c86efcb5ad
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/app.manifest
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+	<assemblyIdentity version="1.0.0.0" name="BizHawk.Client.EmuHawk.app"/>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+		<security>
+			<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+				<!-- UAC Manifest Options
+							If you want to change the Windows User Account Control level replace the 
+							requestedExecutionLevel node with one of the following.
+
+				<requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+				<requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+				<requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+						Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+						Remove this element if your application requires this virtualization for backwards
+						compatibility.
+				-->
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<!-- A list of the Windows versions that this application has been tested on
+						and is designed to work with. Uncomment the appropriate elements
+						and Windows will automatically select the most compatible environment. -->
+
+			<!-- Windows 7 -->
+			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+			<!-- Windows 8 -->
+			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+			<!-- Windows 8.1 -->
+			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+			<!-- Windows 10 -->
+			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+		</application>
+	</compatibility>
+	<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+				DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+				to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+				also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+	<application xmlns="urn:schemas-microsoft-com:asm.v3">
+		<windowsSettings>
+			<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+		</windowsSettings>
+	</application>
+</assembly>
diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
index 20d7076fdf..cc024b4a27 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
@@ -302,7 +302,8 @@
 			this.Name = "ControllerConfig";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Controller Config";
-			this.Load += new System.EventHandler(this.NewControllerConfig_Load);
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ControllerConfig_FormClosed);
+			this.Load += new System.EventHandler(this.ControllerConfig_Load);
 			this.tabControl1.ResumeLayout(false);
 			this.tableLayoutPanel1.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
index 25b246d55f..01408593e5 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -49,7 +49,12 @@ namespace BizHawk.Client.EmuHawk
 			ControllerImages.Add("Apple IIe Keyboard", Properties.Resources.AppleIIKeyboard);
 			ControllerImages.Add("VirtualBoy Controller", Properties.Resources.VBoyController);
 			ControllerImages.Add("NeoGeo Portable Controller", Properties.Resources.NGPController);
-			
+			ControllerImages.Add("MAME Controller", Properties.Resources.ArcadeController);			
+		}
+
+		private ControllerConfig()
+		{
+			InitializeComponent();
 		}
 
 		protected override void OnActivated(EventArgs e)
@@ -64,13 +69,14 @@ namespace BizHawk.Client.EmuHawk
 			Input.Instance.ControlInputFocus(this, Input.InputFocus.Mouse, false);
 		}
 
-		private ControllerConfig()
+		private void ControllerConfig_Load(object sender, EventArgs e)
 		{
-			InitializeComponent();
-			Closing += (o, e) =>
-			{
-				buttonOK.Focus(); // A very dirty hack to avoid https://code.google.com/p/bizhawk/issues/detail?id=161
-			};
+			Text = $"{_theDefinition.Name} Configuration";
+		}
+
+		private void ControllerConfig_FormClosed(object sender, FormClosedEventArgs e)
+		{
+			Input.Instance.ClearEvents();
 		}
 
 		private delegate Control PanelCreator<T>(Dictionary<string, T> settings, List<string> buttons, Size size);
@@ -187,7 +193,10 @@ namespace BizHawk.Client.EmuHawk
                     if (Global.Emulator.SystemId == "ZXSpectrum" || Global.Emulator.SystemId == "AmstradCPC" || Global.Emulator.SystemId == "ChannelF")
                         return;
 
-                    string tabname = (Global.Emulator.SystemId == "C64") ? "Keyboard" : "Console"; // hack
+                    string tabname =
+						(Global.Emulator.SystemId == "C64") ? "Keyboard" :
+						(Global.Emulator.SystemId == "MAME") ? "Misc" :
+						"Console"; // hack
                     tt.TabPages.Add(tabname);
                     tt.TabPages[pageidx].Controls.Add(createpanel(settings, buckets[0], tt.Size));
                 }
@@ -365,11 +374,6 @@ namespace BizHawk.Client.EmuHawk
 			Close();
 		}
 
-		private void NewControllerConfig_Load(object sender, EventArgs e)
-		{
-			Text = $"{_theDefinition.Name} Configuration";
-		}
-
 		private static TabControl GetTabControl(IEnumerable controls)
 		{
 			if (controls != null)
diff --git a/BizHawk.Client.EmuHawk/config/GuiOptions.Designer.cs b/BizHawk.Client.EmuHawk/config/GuiOptions.Designer.cs
index 70e35459eb..038f9c74bf 100644
--- a/BizHawk.Client.EmuHawk/config/GuiOptions.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/GuiOptions.Designer.cs
@@ -42,6 +42,7 @@
             this.NeverAskSaveCheckbox = new System.Windows.Forms.CheckBox();
             this.label2 = new System.Windows.Forms.Label();
             this.AcceptBackgroundInputCheckbox = new System.Windows.Forms.CheckBox();
+            this.AcceptBackgroundInputControllerOnlyCheckBox = new System.Windows.Forms.CheckBox();
             this.label1 = new System.Windows.Forms.Label();
             this.RunInBackgroundCheckbox = new System.Windows.Forms.CheckBox();
             this.SaveWindowPositionCheckbox = new System.Windows.Forms.CheckBox();
@@ -73,6 +74,7 @@
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.label9 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
+            this.HandleAlternateKeyboardLayoutsCheckBox = new System.Windows.Forms.CheckBox();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -120,10 +122,12 @@
             // 
             // tabPage1
             // 
+            this.tabPage1.Controls.Add(this.HandleAlternateKeyboardLayoutsCheckBox);
             this.tabPage1.Controls.Add(this.groupBox1);
             this.tabPage1.Controls.Add(this.NeverAskSaveCheckbox);
             this.tabPage1.Controls.Add(this.label2);
             this.tabPage1.Controls.Add(this.AcceptBackgroundInputCheckbox);
+            this.tabPage1.Controls.Add(this.AcceptBackgroundInputControllerOnlyCheckBox);
             this.tabPage1.Controls.Add(this.label1);
             this.tabPage1.Controls.Add(this.RunInBackgroundCheckbox);
             this.tabPage1.Controls.Add(this.SaveWindowPositionCheckbox);
@@ -144,7 +148,7 @@
             this.groupBox1.Controls.Add(this.StartFullScreenCheckbox);
             this.groupBox1.Controls.Add(this.label3);
             this.groupBox1.Controls.Add(this.SingleInstanceModeCheckbox);
-            this.groupBox1.Location = new System.Drawing.Point(6, 182);
+            this.groupBox1.Location = new System.Drawing.Point(6, 205);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Size = new System.Drawing.Size(369, 140);
             this.groupBox1.TabIndex = 13;
@@ -215,7 +219,7 @@
             this.label2.Location = new System.Drawing.Point(26, 155);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(349, 13);
-            this.label2.TabIndex = 9;
+            this.label2.TabIndex = 10;
             this.label2.Text = "When this is set, the client will receive user input even when focus is lost";
             // 
             // AcceptBackgroundInputCheckbox
@@ -227,6 +231,18 @@
             this.AcceptBackgroundInputCheckbox.TabIndex = 8;
             this.AcceptBackgroundInputCheckbox.Text = "Accept background input";
             this.AcceptBackgroundInputCheckbox.UseVisualStyleBackColor = true;
+            this.AcceptBackgroundInputCheckbox.CheckedChanged += new System.EventHandler(this.AcceptBackgroundInputCheckbox_CheckedChanged);
+            // 
+            // AcceptBackgroundInputControllerOnlyCheckBox
+            // 
+            this.AcceptBackgroundInputControllerOnlyCheckBox.AutoSize = true;
+            this.AcceptBackgroundInputControllerOnlyCheckBox.Enabled = false;
+            this.AcceptBackgroundInputControllerOnlyCheckBox.Location = new System.Drawing.Point(156, 135);
+            this.AcceptBackgroundInputControllerOnlyCheckBox.Name = "AcceptBackgroundInputControllerOnlyCheckBox";
+            this.AcceptBackgroundInputControllerOnlyCheckBox.Size = new System.Drawing.Size(117, 17);
+            this.AcceptBackgroundInputControllerOnlyCheckBox.TabIndex = 9;
+            this.AcceptBackgroundInputControllerOnlyCheckBox.Text = "From controller only";
+            this.AcceptBackgroundInputControllerOnlyCheckBox.UseVisualStyleBackColor = true;
             // 
             // label1
             // 
@@ -313,7 +329,7 @@
             this.groupBox2.Margin = new System.Windows.Forms.Padding(0);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Size = new System.Drawing.Size(265, 60);
-            this.groupBox2.TabIndex = 27;
+            this.groupBox2.TabIndex = 5;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "AutoSaveRAM";
             // 
@@ -327,7 +343,7 @@
             0});
             this.AutosaveSRAMtextBox.Name = "AutosaveSRAMtextBox";
             this.AutosaveSRAMtextBox.Size = new System.Drawing.Size(50, 20);
-            this.AutosaveSRAMtextBox.TabIndex = 27;
+            this.AutosaveSRAMtextBox.TabIndex = 5;
             // 
             // AutosaveSRAMradioButton1
             // 
@@ -335,7 +351,7 @@
             this.AutosaveSRAMradioButton1.Location = new System.Drawing.Point(48, 33);
             this.AutosaveSRAMradioButton1.Name = "AutosaveSRAMradioButton1";
             this.AutosaveSRAMradioButton1.Size = new System.Drawing.Size(36, 17);
-            this.AutosaveSRAMradioButton1.TabIndex = 22;
+            this.AutosaveSRAMradioButton1.TabIndex = 2;
             this.AutosaveSRAMradioButton1.TabStop = true;
             this.AutosaveSRAMradioButton1.Text = "5s";
             this.AutosaveSRAMradioButton1.UseVisualStyleBackColor = true;
@@ -346,7 +362,7 @@
             this.label8.Location = new System.Drawing.Point(202, 35);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(12, 13);
-            this.label8.TabIndex = 26;
+            this.label8.TabIndex = 6;
             this.label8.Text = "s";
             // 
             // AutosaveSRAMradioButton2
@@ -355,7 +371,7 @@
             this.AutosaveSRAMradioButton2.Location = new System.Drawing.Point(90, 34);
             this.AutosaveSRAMradioButton2.Name = "AutosaveSRAMradioButton2";
             this.AutosaveSRAMradioButton2.Size = new System.Drawing.Size(39, 17);
-            this.AutosaveSRAMradioButton2.TabIndex = 23;
+            this.AutosaveSRAMradioButton2.TabIndex = 3;
             this.AutosaveSRAMradioButton2.TabStop = true;
             this.AutosaveSRAMradioButton2.Text = "5m";
             this.AutosaveSRAMradioButton2.UseVisualStyleBackColor = true;
@@ -366,7 +382,7 @@
             this.AutosaveSRAMradioButton3.Location = new System.Drawing.Point(131, 35);
             this.AutosaveSRAMradioButton3.Name = "AutosaveSRAMradioButton3";
             this.AutosaveSRAMradioButton3.Size = new System.Drawing.Size(14, 13);
-            this.AutosaveSRAMradioButton3.TabIndex = 24;
+            this.AutosaveSRAMradioButton3.TabIndex = 4;
             this.AutosaveSRAMradioButton3.TabStop = true;
             this.AutosaveSRAMradioButton3.UseVisualStyleBackColor = true;
             this.AutosaveSRAMradioButton3.CheckedChanged += new System.EventHandler(this.AutosaveSRAMradioButton3_CheckedChanged);
@@ -377,7 +393,7 @@
             this.AutosaveSRAMCheckbox.Location = new System.Drawing.Point(6, 62);
             this.AutosaveSRAMCheckbox.Name = "AutosaveSRAMCheckbox";
             this.AutosaveSRAMCheckbox.Size = new System.Drawing.Size(15, 14);
-            this.AutosaveSRAMCheckbox.TabIndex = 21;
+            this.AutosaveSRAMCheckbox.TabIndex = 4;
             this.AutosaveSRAMCheckbox.UseVisualStyleBackColor = true;
             this.AutosaveSRAMCheckbox.CheckedChanged += new System.EventHandler(this.AutosaveSRAMCheckbox_CheckedChanged);
             // 
@@ -397,7 +413,7 @@
             this.label7.Location = new System.Drawing.Point(3, 1);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(50, 13);
-            this.label7.TabIndex = 2;
+            this.label7.TabIndex = 0;
             this.label7.Text = "Lua Core";
             // 
             // LuaInterfaceRadio
@@ -406,7 +422,7 @@
             this.LuaInterfaceRadio.Location = new System.Drawing.Point(4, 36);
             this.LuaInterfaceRadio.Name = "LuaInterfaceRadio";
             this.LuaInterfaceRadio.Size = new System.Drawing.Size(338, 17);
-            this.LuaInterfaceRadio.TabIndex = 1;
+            this.LuaInterfaceRadio.TabIndex = 2;
             this.LuaInterfaceRadio.TabStop = true;
             this.LuaInterfaceRadio.Text = "Lua+LuaInterface - Faster but memory leaks,  use at your own risk!";
             this.LuaInterfaceRadio.UseVisualStyleBackColor = true;
@@ -417,7 +433,7 @@
             this.NLuaRadio.Location = new System.Drawing.Point(4, 17);
             this.NLuaRadio.Name = "NLuaRadio";
             this.NLuaRadio.Size = new System.Drawing.Size(194, 17);
-            this.NLuaRadio.TabIndex = 0;
+            this.NLuaRadio.TabIndex = 1;
             this.NLuaRadio.TabStop = true;
             this.NLuaRadio.Text = "NLua+KopiLua - Reliable but slower";
             this.NLuaRadio.UseVisualStyleBackColor = true;
@@ -507,7 +523,7 @@
             this.BackupSRamCheckbox.Location = new System.Drawing.Point(6, 39);
             this.BackupSRamCheckbox.Name = "BackupSRamCheckbox";
             this.BackupSRamCheckbox.Size = new System.Drawing.Size(203, 17);
-            this.BackupSRamCheckbox.TabIndex = 9;
+            this.BackupSRamCheckbox.TabIndex = 3;
             this.BackupSRamCheckbox.Text = "Backup SaveRAM to .SaveRAM.bak";
             this.BackupSRamCheckbox.UseVisualStyleBackColor = true;
             // 
@@ -536,7 +552,7 @@
             this.label9.Location = new System.Drawing.Point(6, 16);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(225, 13);
-            this.label9.TabIndex = 28;
+            this.label9.TabIndex = 0;
             this.label9.Text = "Save SaveRAM to .AutoSaveRAM.SaveRAM";
             // 
             // label10
@@ -545,9 +561,19 @@
             this.label10.Location = new System.Drawing.Point(9, 34);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(33, 13);
-            this.label10.TabIndex = 29;
+            this.label10.TabIndex = 1;
             this.label10.Text = "every";
             // 
+            // HandleAlternateKeyboardLayoutsCheckBox
+            // 
+            this.HandleAlternateKeyboardLayoutsCheckBox.AutoSize = true;
+            this.HandleAlternateKeyboardLayoutsCheckBox.Location = new System.Drawing.Point(6, 175);
+            this.HandleAlternateKeyboardLayoutsCheckBox.Name = "HandleAlternateKeyboardLayoutsCheckBox";
+            this.HandleAlternateKeyboardLayoutsCheckBox.Size = new System.Drawing.Size(255, 17);
+            this.HandleAlternateKeyboardLayoutsCheckBox.TabIndex = 11;
+            this.HandleAlternateKeyboardLayoutsCheckBox.Text = "Handle alternate keyboard layouts (e.g. Dvorak) [experimental]";
+            this.HandleAlternateKeyboardLayoutsCheckBox.UseVisualStyleBackColor = true;
+            // 
             // EmuHawkOptions
             // 
             this.AcceptButton = this.OkBtn;
@@ -593,6 +619,7 @@
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.Label label2;
 		private System.Windows.Forms.CheckBox AcceptBackgroundInputCheckbox;
+		private System.Windows.Forms.CheckBox AcceptBackgroundInputControllerOnlyCheckBox;
 		private System.Windows.Forms.CheckBox NeverAskSaveCheckbox;
 		private System.Windows.Forms.Label label3;
 		private System.Windows.Forms.CheckBox SingleInstanceModeCheckbox;
@@ -625,5 +652,6 @@
 		private System.Windows.Forms.NumericUpDown AutosaveSRAMtextBox;
 		private System.Windows.Forms.Label label10;
 		private System.Windows.Forms.Label label9;
+		private System.Windows.Forms.CheckBox HandleAlternateKeyboardLayoutsCheckBox;
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/config/GuiOptions.cs b/BizHawk.Client.EmuHawk/config/GuiOptions.cs
index d5106c9d24..f05e73be46 100644
--- a/BizHawk.Client.EmuHawk/config/GuiOptions.cs
+++ b/BizHawk.Client.EmuHawk/config/GuiOptions.cs
@@ -49,6 +49,8 @@ namespace BizHawk.Client.EmuHawk
 			SaveWindowPositionCheckbox.Checked = Global.Config.SaveWindowPosition;
 			RunInBackgroundCheckbox.Checked = Global.Config.RunInBackground;
 			AcceptBackgroundInputCheckbox.Checked = Global.Config.AcceptBackgroundInput;
+			AcceptBackgroundInputControllerOnlyCheckBox.Checked = Global.Config.AcceptBackgroundInputControllerOnly;
+			HandleAlternateKeyboardLayoutsCheckBox.Checked = Global.Config.HandleAlternateKeyboardLayouts;
 			NeverAskSaveCheckbox.Checked = Global.Config.SupressAskSave;
 			SingleInstanceModeCheckbox.Checked = Global.Config.SingleInstanceMode;
 
@@ -83,6 +85,8 @@ namespace BizHawk.Client.EmuHawk
 			Global.Config.SaveWindowPosition = SaveWindowPositionCheckbox.Checked;
 			Global.Config.RunInBackground = RunInBackgroundCheckbox.Checked;
 			Global.Config.AcceptBackgroundInput = AcceptBackgroundInputCheckbox.Checked;
+			Global.Config.AcceptBackgroundInputControllerOnly = AcceptBackgroundInputControllerOnlyCheckBox.Checked;
+			Global.Config.HandleAlternateKeyboardLayouts = HandleAlternateKeyboardLayoutsCheckBox.Checked;
 			Global.Config.SupressAskSave = NeverAskSaveCheckbox.Checked;
 			Global.Config.SingleInstanceMode = SingleInstanceModeCheckbox.Checked;
 
@@ -113,6 +117,11 @@ namespace BizHawk.Client.EmuHawk
 			GlobalWin.OSD.AddMessage("Customizing aborted.");
 		}
 
+		private void AcceptBackgroundInputCheckbox_CheckedChanged(object sender, EventArgs e)
+		{
+			AcceptBackgroundInputControllerOnlyCheckBox.Enabled = AcceptBackgroundInputCheckbox.Checked;
+		}
+
 		private void AutosaveSRAMCheckbox_CheckedChanged(object sender, EventArgs e)
 		{
 			groupBox2.Enabled = AutosaveSRAMCheckbox.Checked;
diff --git a/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs
index 7047ff8b90..d37183c230 100644
--- a/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/HotkeyConfig.Designer.cs
@@ -228,7 +228,8 @@
 			this.Name = "HotkeyConfig";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "Configure Hotkeys";
-			this.Load += new System.EventHandler(this.NewHotkeyWindow_Load);
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.HotkeyConfig_FormClosed);
+			this.Load += new System.EventHandler(this.HotkeyConfig_Load);
 			this.HotkeyTabControl.ResumeLayout(false);
 			this.clearBtnContextMenu.ResumeLayout(false);
 			this.ResumeLayout(false);
diff --git a/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs b/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
index 24adc44d21..79ee9abc29 100644
--- a/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
@@ -14,11 +14,6 @@ namespace BizHawk.Client.EmuHawk
 		{
 			InitializeComponent();
 
-			Closing += (o, e) =>
-			{
-				IDB_SAVE.Focus(); // A very dirty hack to avoid https://code.google.com/p/bizhawk/issues/detail?id=161
-			};
-
 			tabPage1.Focus();
 		}
 
@@ -34,7 +29,7 @@ namespace BizHawk.Client.EmuHawk
 			Input.Instance.ControlInputFocus(this, Input.InputFocus.Mouse, false);
 		}
 
-		private void NewHotkeyWindow_Load(object sender, EventArgs e)
+		private void HotkeyConfig_Load(object sender, EventArgs e)
 		{
 			var source = new AutoCompleteStringCollection();
 			source.AddRange(Global.Config.HotkeyBindings.Select(x => x.DisplayName).ToArray());
@@ -47,6 +42,11 @@ namespace BizHawk.Client.EmuHawk
 			DoFocus();
 		}
 
+		private void HotkeyConfig_FormClosed(object sender, FormClosedEventArgs e)
+		{
+			Input.Instance.ClearEvents();
+		}
+
 		private void IDB_CANCEL_Click(object sender, EventArgs e)
 		{
 			GlobalWin.OSD.AddMessage("Hotkey config aborted");
@@ -72,64 +72,49 @@ namespace BizHawk.Client.EmuHawk
 
 			foreach (var w in InputWidgets)
 			{
-				var b = Global.Config.HotkeyBindings.FirstOrDefault(x => x.DisplayName == w.WidgetName);
+				var b = Global.Config.HotkeyBindings.First(x => x.DisplayName == w.WidgetName);
 				b.Bindings = w.Bindings;
 			}
 		}
 
-		private IEnumerable<InputCompositeWidget> InputWidgets
-		{
-			get
-			{
-				var widgets = new List<InputCompositeWidget>();
-				for (var x = 0; x < HotkeyTabControl.TabPages.Count; x++)
-				{
-					for (var y = 0; y < HotkeyTabControl.TabPages[x].Controls.Count; y++)
-					{
-						if (HotkeyTabControl.TabPages[x].Controls[y] is InputCompositeWidget)
-						{
-							widgets.Add(HotkeyTabControl.TabPages[x].Controls[y] as InputCompositeWidget);
-						}
-					}
-				}
-				return widgets;
-			}
-		}
+		private IEnumerable<InputCompositeWidget> InputWidgets =>
+			HotkeyTabControl.TabPages.Cast<TabPage>().SelectMany(tp => tp.Controls.OfType<InputCompositeWidget>());
 
 		private void DoTabs()
 		{
+			HotkeyTabControl.SuspendLayout();
 			HotkeyTabControl.TabPages.Clear();
 
 			// Buckets
-			var tabs = Global.Config.HotkeyBindings.Select(x => x.TabGroup).Distinct().ToList();
+			var tabs = Global.Config.HotkeyBindings.Select(x => x.TabGroup).Distinct();
 
 			foreach (var tab in tabs)
 			{
-				var _y = UIHelper.ScaleY(14);
-				var _x = UIHelper.ScaleX(6);
-
-				var tb = new TabPage {Name = tab, Text = tab};
-
-				var bindings = Global.Config.HotkeyBindings.Where(x => x.TabGroup == tab).OrderBy(x => x.Ordinal).ThenBy(x => x.DisplayName).ToList();
-
+				var tb = new TabPage { Name = tab, Text = tab };
+				var bindings = Global.Config.HotkeyBindings.Where(n => n.TabGroup == tab).OrderBy(n => n.Ordinal).ThenBy(n => n.DisplayName);
+				int x = UIHelper.ScaleX(6);
+				int y = UIHelper.ScaleY(14);
 				int iwOffsetX = UIHelper.ScaleX(110);
 				int iwOffsetY = UIHelper.ScaleY(-4);
 				int iwWidth = UIHelper.ScaleX(120);
+
+				tb.SuspendLayout();
+
 				foreach (var b in bindings)
 				{
 					var l = new Label
 					{
 						Text = b.DisplayName,
-						Location = new Point(_x, _y),
-						Size = new Size(iwOffsetX - UIHelper.ScaleX(2), UIHelper.ScaleY(15)),
+						Location = new Point(x, y),
+						Size = new Size(iwOffsetX - UIHelper.ScaleX(2), UIHelper.ScaleY(15))
 					};
 
 					var w = new InputCompositeWidget
 					{
-						Location = new Point(_x + iwOffsetX, _y + iwOffsetY),
+						Location = new Point(x + iwOffsetX, y + iwOffsetY),
 						AutoTab = AutoTabCheckBox.Checked,
 						Width = iwWidth,
-						WidgetName = b.DisplayName,
+						WidgetName = b.DisplayName
 					};
 
 					w.SetupTooltip(toolTip1, b.ToolTip);
@@ -140,11 +125,11 @@ namespace BizHawk.Client.EmuHawk
 					tb.Controls.Add(l);
 					tb.Controls.Add(w);
 
-					_y += UIHelper.ScaleY(24);
-					if (_y > HotkeyTabControl.Height - UIHelper.ScaleY(35))
+					y += UIHelper.ScaleY(24);
+					if (y > HotkeyTabControl.Height - UIHelper.ScaleY(35))
 					{
-						_x += iwOffsetX + iwWidth + UIHelper.ScaleX(10);
-						_y = UIHelper.ScaleY(14);
+						x += iwOffsetX + iwWidth + UIHelper.ScaleX(10);
+						y = UIHelper.ScaleY(14);
 					}
 				}
 
@@ -153,13 +138,16 @@ namespace BizHawk.Client.EmuHawk
 					tb.Controls.Add(new Label
 					{
 						Text = "Save States hotkeys operate with branches when TAStudio is engaged.",
-						Location = new Point(_x, _y),
-						Size = new Size(iwWidth + iwOffsetX, HotkeyTabControl.Height - _y),
+						Location = new Point(x, y),
+						Size = new Size(iwWidth + iwOffsetX, HotkeyTabControl.Height - y)
 					});
 				}
 
 				HotkeyTabControl.TabPages.Add(tb);
+				tb.ResumeLayout();
 			}
+
+			HotkeyTabControl.ResumeLayout();
 		}
 
 		private void Defaults()
@@ -232,7 +220,6 @@ namespace BizHawk.Client.EmuHawk
 					if (w != null)
 					{
 						HotkeyTabControl.SelectTab((TabPage)w.Parent);
-						Input.Instance.BindUnpress(e.KeyCode);
 						w.Focus();
 					}
 				}
diff --git a/BizHawk.Client.EmuHawk/config/InputWidget.cs b/BizHawk.Client.EmuHawk/config/InputWidget.cs
index 7026051674..c34c500d5f 100644
--- a/BizHawk.Client.EmuHawk/config/InputWidget.cs
+++ b/BizHawk.Client.EmuHawk/config/InputWidget.cs
@@ -14,8 +14,8 @@ namespace BizHawk.Client.EmuHawk
 		// TODO: when binding, make sure that the new key combo is not in one of the other bindings
 		private readonly Timer _timer = new Timer();
 		private readonly List<string> _bindings = new List<string>();
-	
-		private string _wasPressed = "";
+
+		private Input.InputEvent _lastPress;
 
 		public InputCompositeWidget CompositeWidget { get; set; }
 
@@ -88,9 +88,9 @@ namespace BizHawk.Client.EmuHawk
 
 		protected override void OnEnter(EventArgs e)
 		{
+			Input.Instance.ClearEvents();
+			_lastPress = null;
 			_timer.Start();
-
-			_wasPressed = Input.Instance.GetNextBindEvent();
 			BackColor = Color.FromArgb(unchecked((int)0xFFC0FFFF)); // Color.LightCyan is too light on Windows 8, this is a bit darker
 		}
 
@@ -102,6 +102,12 @@ namespace BizHawk.Client.EmuHawk
 			base.OnLeave(e);
 		}
 
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			_timer.Stop();
+			base.OnHandleDestroyed(e);
+		}
+
 		private void Timer_Tick(object sender, EventArgs e)
 		{
 			ReadKeys();
@@ -129,11 +135,7 @@ namespace BizHawk.Client.EmuHawk
 		private void ReadKeys()
 		{
 			Input.Instance.Update();
-			var bindingStr = Input.Instance.GetNextBindEvent();
-			if (!string.IsNullOrEmpty(_wasPressed) && bindingStr == _wasPressed)
-			{
-				return;
-			}
+			var bindingStr = Input.Instance.GetNextBindEvent(ref _lastPress);
 			
 			if (bindingStr != null)
 			{
@@ -171,7 +173,6 @@ namespace BizHawk.Client.EmuHawk
 					_bindings.Add(bindingStr);
 				}
 				
-				_wasPressed = bindingStr;
 				UpdateLabel();
 				Increment();
 			}
@@ -188,8 +189,6 @@ namespace BizHawk.Client.EmuHawk
 			{
 				base.OnKeyUp(e);
 			}
-
-			_wasPressed = "";
 		}
 
 		protected override void OnKeyDown(KeyEventArgs e)
diff --git a/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs b/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs
index b343fe4355..3debf50624 100644
--- a/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs
+++ b/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs
@@ -64,7 +64,7 @@ namespace BizHawk.Client.EmuHawk
 				typeof(NES.NESSyncSettings.Region),
 				(string)RegionComboBox.SelectedItem);
 
-			List<byte> oldRam = _syncSettings.InitialWRamStatePattern?.ToList() ?? new List<byte>();
+			var oldRam = _syncSettings.InitialWRamStatePattern ?? new List<byte>();
 
 			if (!string.IsNullOrWhiteSpace(RamPatternOverrideBox.Text))
 			{
diff --git a/BizHawk.Client.EmuHawk/config/PathConfig.cs b/BizHawk.Client.EmuHawk/config/PathConfig.cs
index 04b5886de9..71942ae196 100644
--- a/BizHawk.Client.EmuHawk/config/PathConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/PathConfig.cs
@@ -115,8 +115,7 @@ namespace BizHawk.Client.EmuHawk
 				var paths = pathCollection
 					.Where(p => p.System == systemId)
 					.OrderBy(p => p.Ordinal)
-					.ThenBy(p => p.Type)
-					.ToList();
+					.ThenBy(p => p.Type);
 
 				var y = UIHelper.ScaleY(14);
 				foreach (var path in paths)
@@ -261,10 +260,10 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DoRomToggle()
 		{
-			AllPathControls
-				.Where(c => c.Name == "ROM")
-				.ToList()
-				.ForEach(control => control.Enabled = !RecentForROMs.Checked);
+			foreach (var control in AllPathControls.Where(c => c.Name == "ROM"))
+			{
+				control.Enabled = !RecentForROMs.Checked;
+			}
 		}
 
 		private IEnumerable<TextBox> AllPathBoxes
diff --git a/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs
index 144227ae21..0c2c1db224 100644
--- a/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs
@@ -186,7 +186,7 @@
             this.label10.Location = new System.Drawing.Point(6, 20);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(40, 13);
-            this.label10.TabIndex = 17;
+            this.label10.TabIndex = 0;
             this.label10.Text = "Enable";
             // 
             // LargeStateEnabledBox
@@ -195,7 +195,7 @@
             this.LargeStateEnabledBox.Location = new System.Drawing.Point(9, 87);
             this.LargeStateEnabledBox.Name = "LargeStateEnabledBox";
             this.LargeStateEnabledBox.Size = new System.Drawing.Size(15, 14);
-            this.LargeStateEnabledBox.TabIndex = 16;
+            this.LargeStateEnabledBox.TabIndex = 11;
             this.LargeStateEnabledBox.UseVisualStyleBackColor = true;
             this.LargeStateEnabledBox.CheckStateChanged += new System.EventHandler(this.LargeStateEnabledBox_CheckStateChanged);
             // 
@@ -205,7 +205,7 @@
             this.MediumStateEnabledBox.Location = new System.Drawing.Point(9, 63);
             this.MediumStateEnabledBox.Name = "MediumStateEnabledBox";
             this.MediumStateEnabledBox.Size = new System.Drawing.Size(15, 14);
-            this.MediumStateEnabledBox.TabIndex = 15;
+            this.MediumStateEnabledBox.TabIndex = 6;
             this.MediumStateEnabledBox.UseVisualStyleBackColor = true;
             this.MediumStateEnabledBox.CheckStateChanged += new System.EventHandler(this.MediumStateEnabledBox_CheckStateChanged);
             // 
@@ -215,7 +215,7 @@
             this.SmallStateEnabledBox.Location = new System.Drawing.Point(9, 39);
             this.SmallStateEnabledBox.Name = "SmallStateEnabledBox";
             this.SmallStateEnabledBox.Size = new System.Drawing.Size(15, 14);
-            this.SmallStateEnabledBox.TabIndex = 14;
+            this.SmallStateEnabledBox.TabIndex = 1;
             this.SmallStateEnabledBox.UseVisualStyleBackColor = true;
             this.SmallStateEnabledBox.CheckStateChanged += new System.EventHandler(this.SmallStateEnabledBox_CheckStateChanged);
             // 
@@ -234,7 +234,7 @@
             this.LargeLabel3.Location = new System.Drawing.Point(307, 88);
             this.LargeLabel3.Name = "LargeLabel3";
             this.LargeLabel3.Size = new System.Drawing.Size(38, 13);
-            this.LargeLabel3.TabIndex = 12;
+            this.LargeLabel3.TabIndex = 15;
             this.LargeLabel3.Text = "frames";
             // 
             // LargeSavestateNumeric
@@ -252,7 +252,7 @@
             0});
             this.LargeSavestateNumeric.Name = "LargeSavestateNumeric";
             this.LargeSavestateNumeric.Size = new System.Drawing.Size(38, 20);
-            this.LargeSavestateNumeric.TabIndex = 11;
+            this.LargeSavestateNumeric.TabIndex = 14;
             this.LargeSavestateNumeric.Value = new decimal(new int[] {
             1,
             0,
@@ -266,7 +266,7 @@
             this.LargeLabel1.Location = new System.Drawing.Point(40, 88);
             this.LargeLabel1.Name = "LargeLabel1";
             this.LargeLabel1.Size = new System.Drawing.Size(179, 13);
-            this.LargeLabel1.TabIndex = 10;
+            this.LargeLabel1.TabIndex = 12;
             this.LargeLabel1.Text = "Large savestates (more than 100KB)";
             this.LargeLabel1.Click += new System.EventHandler(this.LargeLabel1_Click);
             // 
@@ -276,7 +276,7 @@
             this.MediumLabel2.Location = new System.Drawing.Point(227, 64);
             this.MediumLabel2.Name = "MediumLabel2";
             this.MediumLabel2.Size = new System.Drawing.Size(33, 13);
-            this.MediumLabel2.TabIndex = 9;
+            this.MediumLabel2.TabIndex = 8;
             this.MediumLabel2.Text = "every";
             // 
             // MediumLabel3
@@ -285,7 +285,7 @@
             this.MediumLabel3.Location = new System.Drawing.Point(307, 64);
             this.MediumLabel3.Name = "MediumLabel3";
             this.MediumLabel3.Size = new System.Drawing.Size(38, 13);
-            this.MediumLabel3.TabIndex = 8;
+            this.MediumLabel3.TabIndex = 10;
             this.MediumLabel3.Text = "frames";
             // 
             // MediumSavestateNumeric
@@ -303,7 +303,7 @@
             0});
             this.MediumSavestateNumeric.Name = "MediumSavestateNumeric";
             this.MediumSavestateNumeric.Size = new System.Drawing.Size(38, 20);
-            this.MediumSavestateNumeric.TabIndex = 7;
+            this.MediumSavestateNumeric.TabIndex = 9;
             this.MediumSavestateNumeric.Value = new decimal(new int[] {
             1,
             0,
@@ -317,7 +317,7 @@
             this.MediumLabel1.Location = new System.Drawing.Point(40, 64);
             this.MediumLabel1.Name = "MediumLabel1";
             this.MediumLabel1.Size = new System.Drawing.Size(160, 13);
-            this.MediumLabel1.TabIndex = 6;
+            this.MediumLabel1.TabIndex = 7;
             this.MediumLabel1.Text = "Medium savestates (32 - 100KB)";
             this.MediumLabel1.Click += new System.EventHandler(this.MediumLabel1_Click);
             // 
@@ -327,7 +327,7 @@
             this.SmallLabel2.Location = new System.Drawing.Point(227, 40);
             this.SmallLabel2.Name = "SmallLabel2";
             this.SmallLabel2.Size = new System.Drawing.Size(33, 13);
-            this.SmallLabel2.TabIndex = 5;
+            this.SmallLabel2.TabIndex = 3;
             this.SmallLabel2.Text = "every";
             // 
             // SmallLabel3
@@ -336,7 +336,7 @@
             this.SmallLabel3.Location = new System.Drawing.Point(307, 40);
             this.SmallLabel3.Name = "SmallLabel3";
             this.SmallLabel3.Size = new System.Drawing.Size(38, 13);
-            this.SmallLabel3.TabIndex = 4;
+            this.SmallLabel3.TabIndex = 5;
             this.SmallLabel3.Text = "frames";
             // 
             // SmallSavestateNumeric
@@ -354,7 +354,7 @@
             0});
             this.SmallSavestateNumeric.Name = "SmallSavestateNumeric";
             this.SmallSavestateNumeric.Size = new System.Drawing.Size(38, 20);
-            this.SmallSavestateNumeric.TabIndex = 3;
+            this.SmallSavestateNumeric.TabIndex = 4;
             this.SmallSavestateNumeric.Value = new decimal(new int[] {
             1,
             0,
@@ -399,7 +399,7 @@
             this.MediumStateTrackbar.Minimum = 1;
             this.MediumStateTrackbar.Name = "MediumStateTrackbar";
             this.MediumStateTrackbar.Size = new System.Drawing.Size(186, 45);
-            this.MediumStateTrackbar.TabIndex = 7;
+            this.MediumStateTrackbar.TabIndex = 1;
             this.MediumStateTrackbar.TickFrequency = 256;
             this.MediumStateTrackbar.Value = 1;
             this.MediumStateTrackbar.ValueChanged += new System.EventHandler(this.MediumStateTrackbar_ValueChanged);
@@ -417,7 +417,7 @@
             this.groupBox2.Location = new System.Drawing.Point(12, 387);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Size = new System.Drawing.Size(371, 105);
-            this.groupBox2.TabIndex = 8;
+            this.groupBox2.TabIndex = 5;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "State Size Definition";
             // 
@@ -436,7 +436,7 @@
             0});
             this.LargeStateUpDown.Name = "LargeStateUpDown";
             this.LargeStateUpDown.Size = new System.Drawing.Size(52, 20);
-            this.LargeStateUpDown.TabIndex = 14;
+            this.LargeStateUpDown.TabIndex = 6;
             this.LargeStateUpDown.Value = new decimal(new int[] {
             256,
             0,
@@ -459,7 +459,7 @@
             0});
             this.MediumStateUpDown.Name = "MediumStateUpDown";
             this.MediumStateUpDown.Size = new System.Drawing.Size(52, 20);
-            this.MediumStateUpDown.TabIndex = 13;
+            this.MediumStateUpDown.TabIndex = 2;
             this.MediumStateUpDown.Value = new decimal(new int[] {
             1,
             0,
@@ -473,7 +473,7 @@
             this.LargeStateSizeLabel.Location = new System.Drawing.Point(312, 71);
             this.LargeStateSizeLabel.Name = "LargeStateSizeLabel";
             this.LargeStateSizeLabel.Size = new System.Drawing.Size(21, 13);
-            this.LargeStateSizeLabel.TabIndex = 12;
+            this.LargeStateSizeLabel.TabIndex = 7;
             this.LargeStateSizeLabel.Text = "KB";
             // 
             // label5
@@ -482,7 +482,7 @@
             this.label5.Location = new System.Drawing.Point(27, 63);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(34, 13);
-            this.label5.TabIndex = 11;
+            this.label5.TabIndex = 4;
             this.label5.Text = "Large";
             // 
             // LargeStateTrackbar
@@ -493,7 +493,7 @@
             this.LargeStateTrackbar.Minimum = 256;
             this.LargeStateTrackbar.Name = "LargeStateTrackbar";
             this.LargeStateTrackbar.Size = new System.Drawing.Size(186, 45);
-            this.LargeStateTrackbar.TabIndex = 10;
+            this.LargeStateTrackbar.TabIndex = 5;
             this.LargeStateTrackbar.TickFrequency = 1024;
             this.LargeStateTrackbar.Value = 256;
             this.LargeStateTrackbar.ValueChanged += new System.EventHandler(this.LargeStateTrackbar_ValueChanged);
@@ -504,7 +504,7 @@
             this.MediumStateSizeLabel.Location = new System.Drawing.Point(313, 35);
             this.MediumStateSizeLabel.Name = "MediumStateSizeLabel";
             this.MediumStateSizeLabel.Size = new System.Drawing.Size(21, 13);
-            this.MediumStateSizeLabel.TabIndex = 9;
+            this.MediumStateSizeLabel.TabIndex = 3;
             this.MediumStateSizeLabel.Text = "KB";
             // 
             // label2
@@ -513,7 +513,7 @@
             this.label2.Location = new System.Drawing.Point(18, 31);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(44, 13);
-            this.label2.TabIndex = 8;
+            this.label2.TabIndex = 0;
             this.label2.Text = "Medium";
             // 
             // groupBox3
@@ -531,7 +531,7 @@
             this.groupBox3.Location = new System.Drawing.Point(12, 214);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Size = new System.Drawing.Size(371, 167);
-            this.groupBox3.TabIndex = 9;
+            this.groupBox3.TabIndex = 4;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "Rewind Options";
             // 
@@ -683,7 +683,7 @@
             this.groupBox4.Location = new System.Drawing.Point(12, 12);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Size = new System.Drawing.Size(371, 72);
-            this.groupBox4.TabIndex = 12;
+            this.groupBox4.TabIndex = 2;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "Current Statistics";
             // 
@@ -767,7 +767,7 @@
             this.groupBox6.Location = new System.Drawing.Point(22, 78);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Size = new System.Drawing.Size(215, 48);
-            this.groupBox6.TabIndex = 0;
+            this.groupBox6.TabIndex = 4;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "Type";
             // 
@@ -811,7 +811,7 @@
             this.btnResetCompression.Location = new System.Drawing.Point(243, 34);
             this.btnResetCompression.Name = "btnResetCompression";
             this.btnResetCompression.Size = new System.Drawing.Size(27, 27);
-            this.btnResetCompression.TabIndex = 23;
+            this.btnResetCompression.TabIndex = 3;
             this.toolTip1.SetToolTip(this.btnResetCompression, "Reset to default");
             this.btnResetCompression.UseVisualStyleBackColor = true;
             this.btnResetCompression.Click += new System.EventHandler(this.BtnResetCompression_Click);
@@ -823,7 +823,7 @@
             this.trackBarCompression.Maximum = 9;
             this.trackBarCompression.Name = "trackBarCompression";
             this.trackBarCompression.Size = new System.Drawing.Size(157, 45);
-            this.trackBarCompression.TabIndex = 20;
+            this.trackBarCompression.TabIndex = 1;
             this.toolTip1.SetToolTip(this.trackBarCompression, "0 = None; 9 = Maximum");
             this.trackBarCompression.Value = 1;
             this.trackBarCompression.ValueChanged += new System.EventHandler(this.TrackBarCompression_ValueChanged);
@@ -838,7 +838,7 @@
             0});
             this.nudCompression.Name = "nudCompression";
             this.nudCompression.Size = new System.Drawing.Size(52, 20);
-            this.nudCompression.TabIndex = 22;
+            this.nudCompression.TabIndex = 2;
             this.nudCompression.Value = new decimal(new int[] {
             1,
             0,
@@ -866,7 +866,7 @@
             this.groupBox7.Location = new System.Drawing.Point(389, 12);
             this.groupBox7.Name = "groupBox7";
             this.groupBox7.Size = new System.Drawing.Size(342, 408);
-            this.groupBox7.TabIndex = 2;
+            this.groupBox7.TabIndex = 6;
             this.groupBox7.TabStop = false;
             this.groupBox7.Text = "Savestate Options";
             // 
@@ -983,7 +983,7 @@
             this.label12.Location = new System.Drawing.Point(19, 21);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(96, 13);
-            this.label12.TabIndex = 24;
+            this.label12.TabIndex = 0;
             this.label12.Text = "Compression Level";
             // 
             // RewindConfig
diff --git a/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs
index 29732a87ea..6c53cb8612 100644
--- a/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs
@@ -89,7 +89,7 @@
 			this.cbEnableNormal.Location = new System.Drawing.Point(6, 20);
 			this.cbEnableNormal.Name = "cbEnableNormal";
 			this.cbEnableNormal.Size = new System.Drawing.Size(48, 17);
-			this.cbEnableNormal.TabIndex = 3;
+			this.cbEnableNormal.TabIndex = 0;
 			this.cbEnableNormal.Text = "Ena.";
 			this.cbEnableNormal.UseVisualStyleBackColor = true;
 			this.cbEnableNormal.CheckedChanged += new System.EventHandler(this.UpdateSoundDialog);
@@ -116,7 +116,7 @@
 			this.nudRWFF.Location = new System.Drawing.Point(58, 223);
 			this.nudRWFF.Name = "nudRWFF";
 			this.nudRWFF.Size = new System.Drawing.Size(45, 20);
-			this.nudRWFF.TabIndex = 15;
+			this.nudRWFF.TabIndex = 7;
 			this.nudRWFF.Value = new decimal(new int[] {
             100,
             0,
@@ -129,7 +129,7 @@
 			this.cbEnableRWFF.Location = new System.Drawing.Point(58, 20);
 			this.cbEnableRWFF.Name = "cbEnableRWFF";
 			this.cbEnableRWFF.Size = new System.Drawing.Size(48, 17);
-			this.cbEnableRWFF.TabIndex = 14;
+			this.cbEnableRWFF.TabIndex = 4;
 			this.cbEnableRWFF.Text = "Ena.";
 			this.cbEnableRWFF.UseVisualStyleBackColor = true;
 			// 
@@ -141,7 +141,7 @@
 			this.tbRWFF.Name = "tbRWFF";
 			this.tbRWFF.Orientation = System.Windows.Forms.Orientation.Vertical;
 			this.tbRWFF.Size = new System.Drawing.Size(42, 164);
-			this.tbRWFF.TabIndex = 13;
+			this.tbRWFF.TabIndex = 6;
 			this.tbRWFF.TickFrequency = 10;
 			this.tbRWFF.Scroll += new System.EventHandler(this.TbRwff_Scroll);
 			// 
@@ -152,7 +152,7 @@
 			this.label2.Location = new System.Drawing.Point(56, 42);
 			this.label2.Name = "label2";
 			this.label2.Size = new System.Drawing.Size(50, 13);
-			this.label2.TabIndex = 12;
+			this.label2.TabIndex = 5;
 			this.label2.Text = "RW && FF";
 			// 
 			// label1
@@ -162,7 +162,7 @@
 			this.label1.Location = new System.Drawing.Point(6, 42);
 			this.label1.Name = "label1";
 			this.label1.Size = new System.Drawing.Size(40, 13);
-			this.label1.TabIndex = 11;
+			this.label1.TabIndex = 1;
 			this.label1.Text = "Normal";
 			// 
 			// tbNormal
@@ -173,7 +173,7 @@
 			this.tbNormal.Name = "tbNormal";
 			this.tbNormal.Orientation = System.Windows.Forms.Orientation.Vertical;
 			this.tbNormal.Size = new System.Drawing.Size(42, 164);
-			this.tbNormal.TabIndex = 0;
+			this.tbNormal.TabIndex = 2;
 			this.tbNormal.TickFrequency = 10;
 			this.tbNormal.Scroll += new System.EventHandler(this.TrackBar1_Scroll);
 			// 
@@ -182,7 +182,7 @@
 			this.nudNormal.Location = new System.Drawing.Point(5, 223);
 			this.nudNormal.Name = "nudNormal";
 			this.nudNormal.Size = new System.Drawing.Size(45, 20);
-			this.nudNormal.TabIndex = 1;
+			this.nudNormal.TabIndex = 3;
 			this.nudNormal.Value = new decimal(new int[] {
             100,
             0,
@@ -199,7 +199,7 @@
 			this.listBoxSoundDevices.Location = new System.Drawing.Point(138, 110);
 			this.listBoxSoundDevices.Name = "listBoxSoundDevices";
 			this.listBoxSoundDevices.Size = new System.Drawing.Size(254, 95);
-			this.listBoxSoundDevices.TabIndex = 7;
+			this.listBoxSoundDevices.TabIndex = 8;
 			// 
 			// SoundDeviceLabel
 			// 
@@ -207,7 +207,7 @@
 			this.SoundDeviceLabel.Location = new System.Drawing.Point(135, 89);
 			this.SoundDeviceLabel.Name = "SoundDeviceLabel";
 			this.SoundDeviceLabel.Size = new System.Drawing.Size(78, 13);
-			this.SoundDeviceLabel.TabIndex = 6;
+			this.SoundDeviceLabel.TabIndex = 7;
 			this.SoundDeviceLabel.Text = "Sound Device:";
 			// 
 			// BufferSizeLabel
@@ -217,7 +217,7 @@
 			this.BufferSizeLabel.Location = new System.Drawing.Point(135, 210);
 			this.BufferSizeLabel.Name = "BufferSizeLabel";
 			this.BufferSizeLabel.Size = new System.Drawing.Size(61, 13);
-			this.BufferSizeLabel.TabIndex = 8;
+			this.BufferSizeLabel.TabIndex = 9;
 			this.BufferSizeLabel.Text = "Buffer Size:";
 			// 
 			// BufferSizeNumeric
@@ -236,7 +236,7 @@
             0});
 			this.BufferSizeNumeric.Name = "BufferSizeNumeric";
 			this.BufferSizeNumeric.Size = new System.Drawing.Size(59, 20);
-			this.BufferSizeNumeric.TabIndex = 9;
+			this.BufferSizeNumeric.TabIndex = 10;
 			this.BufferSizeNumeric.Value = new decimal(new int[] {
             100,
             0,
@@ -250,7 +250,7 @@
 			this.BufferSizeUnitsLabel.Location = new System.Drawing.Point(267, 210);
 			this.BufferSizeUnitsLabel.Name = "BufferSizeUnitsLabel";
 			this.BufferSizeUnitsLabel.Size = new System.Drawing.Size(63, 13);
-			this.BufferSizeUnitsLabel.TabIndex = 10;
+			this.BufferSizeUnitsLabel.TabIndex = 11;
 			this.BufferSizeUnitsLabel.Text = "milliseconds";
 			// 
 			// grpOutputMethod
@@ -261,7 +261,7 @@
 			this.grpOutputMethod.Location = new System.Drawing.Point(292, 12);
 			this.grpOutputMethod.Name = "grpOutputMethod";
 			this.grpOutputMethod.Size = new System.Drawing.Size(100, 90);
-			this.grpOutputMethod.TabIndex = 5;
+			this.grpOutputMethod.TabIndex = 12;
 			this.grpOutputMethod.TabStop = false;
 			this.grpOutputMethod.Text = "Output Method";
 			// 
@@ -307,7 +307,7 @@
 			this.cbMuteFrameAdvance.Location = new System.Drawing.Point(139, 68);
 			this.cbMuteFrameAdvance.Name = "cbMuteFrameAdvance";
 			this.cbMuteFrameAdvance.Size = new System.Drawing.Size(128, 17);
-			this.cbMuteFrameAdvance.TabIndex = 17;
+			this.cbMuteFrameAdvance.TabIndex = 6;
 			this.cbMuteFrameAdvance.Text = "Mute Frame Advance";
 			this.cbMuteFrameAdvance.UseVisualStyleBackColor = true;
 			// 
@@ -317,7 +317,7 @@
 			this.cbEnableMaster.Location = new System.Drawing.Point(139, 16);
 			this.cbEnableMaster.Name = "cbEnableMaster";
 			this.cbEnableMaster.Size = new System.Drawing.Size(128, 17);
-			this.cbEnableMaster.TabIndex = 18;
+			this.cbEnableMaster.TabIndex = 4;
 			this.cbEnableMaster.Text = "Sound Master Enable";
 			this.cbEnableMaster.UseVisualStyleBackColor = true;
 			this.cbEnableMaster.CheckedChanged += new System.EventHandler(this.UpdateSoundDialog);
@@ -328,7 +328,7 @@
 			this.label3.Location = new System.Drawing.Point(161, 35);
 			this.label3.Name = "label3";
 			this.label3.Size = new System.Drawing.Size(126, 26);
-			this.label3.TabIndex = 19;
+			this.label3.TabIndex = 5;
 			this.label3.Text = "Controls whether cores even generate audio.";
 			// 
 			// SoundConfig
diff --git a/BizHawk.Client.EmuHawk/images/ControllerImages/ArcadeController.jpg b/BizHawk.Client.EmuHawk/images/ControllerImages/ArcadeController.jpg
new file mode 100644
index 0000000000..d243bc8471
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/ControllerImages/ArcadeController.jpg differ
diff --git a/BizHawk.Client.EmuHawk/images/mame.png b/BizHawk.Client.EmuHawk/images/mame.png
new file mode 100644
index 0000000000..18f5678efd
Binary files /dev/null and b/BizHawk.Client.EmuHawk/images/mame.png differ
diff --git a/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs
index 8afcc7d618..3ccf267f64 100644
--- a/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs
+++ b/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs
@@ -49,7 +49,7 @@
 			this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.StopOnFrameCheckbox = new System.Windows.Forms.CheckBox();
 			this.StopOnFrameTextBox = new BizHawk.Client.EmuHawk.WatchValueBox();
-			this.MovieView = new BizHawk.Client.EmuHawk.VirtualListView();
+			this.MovieView = new System.Windows.Forms.ListView();
 			this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -269,7 +269,6 @@
 			this.MovieView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.MovieView.BlazingFast = false;
 			this.MovieView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader1,
             this.columnHeader2,
@@ -279,16 +278,13 @@
 			this.MovieView.FullRowSelect = true;
 			this.MovieView.GridLines = true;
 			this.MovieView.HideSelection = false;
-			this.MovieView.ItemCount = 0;
+			this.MovieView.VirtualListSize = 0;
 			this.MovieView.Location = new System.Drawing.Point(12, 28);
 			this.MovieView.MultiSelect = false;
 			this.MovieView.Name = "MovieView";
-			this.MovieView.SelectAllInProgress = false;
-			this.MovieView.selectedItem = -1;
 			this.MovieView.Size = new System.Drawing.Size(480, 322);
 			this.MovieView.TabIndex = 5;
 			this.MovieView.UseCompatibleStateImageBehavior = false;
-			this.MovieView.UseCustomBackground = true;
 			this.MovieView.View = System.Windows.Forms.View.Details;
 			this.MovieView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.MovieView_ColumnClick);
 			this.MovieView.SelectedIndexChanged += new System.EventHandler(this.MovieView_SelectedIndexChanged);
@@ -381,7 +377,7 @@
 		private System.Windows.Forms.Button Cancel;
 		private System.Windows.Forms.Button OK;
 		private System.Windows.Forms.Button BrowseMovies;
-		private VirtualListView MovieView;
+		private  System.Windows.Forms.ListView MovieView;
 		private System.Windows.Forms.ColumnHeader columnHeader1;
 		private System.Windows.Forms.ColumnHeader columnHeader2;
 		private System.Windows.Forms.ColumnHeader columnHeader3;
diff --git a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
index 6365304e9f..7a3169b96f 100644
--- a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
+++ b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
@@ -27,7 +27,7 @@ namespace BizHawk.Client.EmuHawk
 		public PlayMovie()
 		{
 			InitializeComponent();
-			MovieView.QueryItemText += MovieView_QueryItemText;
+			MovieView.RetrieveVirtualItem += MovieView_QueryItemText;
 			MovieView.VirtualMode = true;
 			_sortReverse = false;
 			_sortedCol = "";
@@ -45,28 +45,13 @@ namespace BizHawk.Client.EmuHawk
 			TurboCheckbox.Checked = Global.Config.TurboSeek;
 		}
 
-		private void MovieView_QueryItemText(int index, int column, out string text)
+		private void MovieView_QueryItemText(object sender, RetrieveVirtualItemEventArgs e)
 		{
-			text = "";
-			if (column == 0) // File
-			{
-				text = Path.GetFileName(_movieList[index].Filename);
-			}
-
-			if (column == 1) // System
-			{
-				text = _movieList[index].SystemID;
-			}
-
-			if (column == 2) // Game
-			{
-				text = _movieList[index].GameName;
-			}
-
-			if (column == 3) // Time
-			{
-				text = PlatformFrameRates.MovieTime(_movieList[index]).ToString(@"hh\:mm\:ss\.fff");
-			}
+			var entry = _movieList[e.ItemIndex];
+			e.Item = new ListViewItem(entry.Filename);
+			e.Item.SubItems.Add(entry.SystemID);
+			e.Item.SubItems.Add(entry.GameName);
+			e.Item.SubItems.Add(PlatformFrameRates.MovieTime(entry).ToString(@"hh\:mm\:ss\.fff"));
 		}
 
 		private void Run()
@@ -230,14 +215,13 @@ namespace BizHawk.Client.EmuHawk
 		private void HighlightMovie(int index)
 		{
 			MovieView.SelectedIndices.Clear();
-			MovieView.setSelection(index);
-			MovieView.SelectItem(index, true);
+			MovieView.Items[index].Selected = true;
 		}
 
 		private void ScanFiles()
 		{
 			_movieList.Clear();
-			MovieView.ItemCount = 0;
+			MovieView.VirtualListSize = 0;
 			MovieView.Update();
 
 			var directory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null);
@@ -293,7 +277,7 @@ namespace BizHawk.Client.EmuHawk
 
 		void RefreshMovieList()
 		{
-			MovieView.ItemCount = _movieList.Count;
+			MovieView.VirtualListSize = _movieList.Count;
 			UpdateList();
 		}
 
@@ -306,10 +290,10 @@ namespace BizHawk.Client.EmuHawk
 		{
 			var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
 
-			filePaths
-				.Where(path => MovieService.MovieExtensions.Contains(Path.GetExtension(path).Replace(".", "")))
-				.ToList()
-				.ForEach(path => AddMovieToList(path, force: true));
+			foreach (var path in filePaths.Where(path => MovieService.MovieExtensions.Contains(Path.GetExtension(path).Replace(".", ""))))
+			{
+				AddMovieToList(path, force: true);
+			}
 
 			RefreshMovieList();
 		}
@@ -403,7 +387,7 @@ namespace BizHawk.Client.EmuHawk
 			OK.Enabled = true;
 
 			var firstIndex = MovieView.SelectedIndices[0];
-			MovieView.ensureVisible(firstIndex);
+			MovieView.EnsureVisible(firstIndex);
 
 			foreach (var kvp in _movieList[firstIndex].HeaderEntries)
 			{
@@ -468,11 +452,11 @@ namespace BizHawk.Client.EmuHawk
 
 		private void EditMenuItem_Click(object sender, EventArgs e)
 		{
-			MovieView.SelectedIndices
-				.Cast<int>()
-				.Select(index => _movieList[index])
-				.ToList()
-				.ForEach(movie => System.Diagnostics.Process.Start(movie.Filename));
+			foreach (var movie in MovieView.SelectedIndices.Cast<int>()
+				.Select(index => _movieList[index]))
+			{
+				System.Diagnostics.Process.Start(movie.Filename);
+			}
 		}
 
 		#endregion
@@ -593,8 +577,7 @@ namespace BizHawk.Client.EmuHawk
 				if (index.HasValue)
 				{
 					MovieView.SelectedIndices.Clear();
-					MovieView.setSelection(index.Value);
-					MovieView.SelectItem(index.Value, true);
+					MovieView.Items[index.Value].Selected = true;
 				}
 			}
 		}
diff --git a/BizHawk.Client.EmuHawk/tools/AutoHawk.Designer.cs b/BizHawk.Client.EmuHawk/tools/AutoHawk.Designer.cs
deleted file mode 100644
index 5054e0208c..0000000000
--- a/BizHawk.Client.EmuHawk/tools/AutoHawk.Designer.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-namespace BizHawk.Client.EmuHawk
-{
-	partial class AutoHawk
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.AutoMenu = new System.Windows.Forms.MenuStrip();
-			this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.AutoMenu.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// AutoMenu
-			// 
-			this.AutoMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FileSubMenu});
-			this.AutoMenu.Location = new System.Drawing.Point(0, 0);
-			this.AutoMenu.Name = "AutoMenu";
-			this.AutoMenu.Size = new System.Drawing.Size(508, 24);
-			this.AutoMenu.TabIndex = 2;
-			this.AutoMenu.Text = "menuStrip1";
-			// 
-			// FileSubMenu
-			// 
-			this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ExitMenuItem});
-			this.FileSubMenu.Name = "FileSubMenu";
-			this.FileSubMenu.Size = new System.Drawing.Size(37, 20);
-			this.FileSubMenu.Text = "&File";
-			// 
-			// ExitMenuItem
-			// 
-			this.ExitMenuItem.Name = "ExitMenuItem";
-			this.ExitMenuItem.Size = new System.Drawing.Size(152, 22);
-			this.ExitMenuItem.Text = "E&xit";
-			this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
-			// 
-			// AutoHawk
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(508, 444);
-			this.Controls.Add(this.AutoMenu);
-			this.MainMenuStrip = this.AutoMenu;
-			this.Name = "AutoHawk";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "AutoHawk";
-			this.Load += new System.EventHandler(this.AutoHawk_Load);
-			this.AutoMenu.ResumeLayout(false);
-			this.AutoMenu.PerformLayout();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.MenuStrip AutoMenu;
-		private System.Windows.Forms.ToolStripMenuItem FileSubMenu;
-		private System.Windows.Forms.ToolStripMenuItem ExitMenuItem;
-	}
-}
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/AutoHawk.cs b/BizHawk.Client.EmuHawk/tools/AutoHawk.cs
deleted file mode 100644
index c1674db0ee..0000000000
--- a/BizHawk.Client.EmuHawk/tools/AutoHawk.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-using BizHawk.Emulation.Common;
-
-namespace BizHawk.Client.EmuHawk
-{
-	[Tool(released: false, supportedSystems: null)]
-	public partial class AutoHawk : Form, IToolFormAutoConfig
-	{
-		public AutoHawk()
-		{
-			InitializeComponent();
-		}
-
-		private void AutoHawk_Load(object sender, EventArgs e)
-		{
-
-		}
-
-		[RequiredService]
-		public IMemoryDomains MemoryDomains { get; set; }
-
-		[RequiredService]
-		public IStatable StatableCore { get; set; }
-
-		[ConfigPersist]
-		public ConfigVariables Config { get; set; }
-
-		public class ConfigVariables
-		{
-			// anything that needs to be saved in config.ini should go here
-		}
-
-		#region IToolForm Implementation
-
-		public void NewUpdate(ToolFormUpdateType type) { }
-
-		public void UpdateValues()
-		{
-			// TODO: per frame stuff goes here
-		}
-
-		public void FastUpdate()
-		{
-			// TODO: when the user is turboing this will be called, slow things like updating graphics should be avoided, but critical operations must still be done here
-		}
-
-		public void Restart()
-		{
-			// When the user changes to a new ROM, closes a ROM, starts a movie, etc, this will be called
-		}
-
-		public bool UpdateBefore { get { return true; } }
-
-		public bool AskSaveChanges()
-		{
-			return true;
-		}
-
-		#endregion
-
-		private void ExitMenuItem_Click(object sender, EventArgs e)
-		{
-			Close();
-		}
-	}
-}
diff --git a/BizHawk.Client.EmuHawk/tools/AutoHawk.resx b/BizHawk.Client.EmuHawk/tools/AutoHawk.resx
deleted file mode 100644
index 435c368278..0000000000
--- a/BizHawk.Client.EmuHawk/tools/AutoHawk.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="AutoMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
index 5f32d9ecc4..e4a1d99ca2 100644
--- a/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
+++ b/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
@@ -449,10 +449,10 @@ namespace BizHawk.Client.EmuHawk
 			CurrentFileName = "";
 			_bestBotAttempt = null;
 
-			ControlProbabilityPanel.Controls
-				.OfType<BotControlsRow>()
-				.ToList()
-				.ForEach(cp => cp.Probability = 0);
+			foreach (var cp in ControlProbabilityPanel.Controls.OfType<BotControlsRow>())
+			{
+				cp.Probability = 0;
+			}
 
 			FrameLength = 0;
 			MaximizeAddress = 0;
@@ -845,14 +845,14 @@ namespace BizHawk.Client.EmuHawk
 
 			StartFromSlotBox.SelectedIndex = 0;
 
-			int starty = 0;
+			const int starty = 0;
+			const int lineHeight = 30;
+			const int marginLeft = 15;
 			int accumulatedy = 0;
-			int lineHeight = 30;
-			int marginLeft = 15;
 			int count = 0;
 
+			ControlProbabilityPanel.SuspendLayout();
 			ControlProbabilityPanel.Controls.Clear();
-
 			foreach (var button in Emulator.ControllerDefinition.BoolButtons)
 			{
 				var control = new BotControlsRow
@@ -863,11 +863,13 @@ namespace BizHawk.Client.EmuHawk
 					TabIndex = count + 1,
 					ProbabilityChangedCallback = AssessRunButtonStatus
 				};
+				control.Scale(UIHelper.AutoScaleFactor);
 
 				ControlProbabilityPanel.Controls.Add(control);
 				accumulatedy += lineHeight;
 				count++;
 			}
+			ControlProbabilityPanel.ResumeLayout();
 
 			if (Settings.RecentBotFiles.AutoLoad)
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs b/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs
index 0ddb924cff..9ee550ffe8 100644
--- a/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/BasicBot/BotControlsRow.Designer.cs
@@ -72,8 +72,7 @@
 			// 
 			// BotControlsRow
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
 			this.Controls.Add(this.ProbabilitySlider);
 			this.Controls.Add(this.ProbabilityUpDown);
 			this.Controls.Add(this.ButtonNameLabel);
diff --git a/BizHawk.Client.EmuHawk/tools/CDL.cs b/BizHawk.Client.EmuHawk/tools/CDL.cs
index fa9e45556e..af444b8e08 100644
--- a/BizHawk.Client.EmuHawk/tools/CDL.cs
+++ b/BizHawk.Client.EmuHawk/tools/CDL.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Common;
@@ -59,6 +60,24 @@ namespace BizHawk.Client.EmuHawk
 			InitializeComponent();
 
 			tsbViewStyle.SelectedIndex = 0;
+
+			lvCDL.AllColumns.Clear();
+			lvCDL.AllColumns.AddRange(new []
+			{
+				new RollColumn { Name = "CDLFile", Text = "CDL File @", Width = 107, Type = ColumnType.Text  },
+				new RollColumn { Name = "Domain", Text = "Domain", Width = 126, Type = ColumnType.Text  },
+				new RollColumn { Name = "Percent", Text = "%", Width = 58, Type = ColumnType.Text  },
+				new RollColumn { Name = "Mapped", Text = "Mapped", Width = 64, Type = ColumnType.Text  },
+				new RollColumn { Name = "Size", Text = "Size", Width = 112, Type = ColumnType.Text  },
+				new RollColumn { Name = "0x01", Text = "0x01", Width = 56, Type = ColumnType.Text  },
+				new RollColumn { Name = "0x02", Text = "0x02", Width = 56, Type = ColumnType.Text  },
+				new RollColumn { Name = "0x04", Text = "0x04", Width = 56, Type = ColumnType.Text  },
+				new RollColumn { Name = "0x08", Text = "0x08", Width = 56, Type = ColumnType.Text  },
+				new RollColumn { Name = "0x10", Text = "0x10", Width = 56, Type = ColumnType.Text  },
+				new RollColumn { Name = "0x20", Text = "0x20", Width = 56, Type = ColumnType.Text  },
+				new RollColumn { Name = "0x40", Text = "0x40", Width = 56, Type = ColumnType.Text  },
+				new RollColumn { Name = "0x80", Text = "0x80", Width = 56, Type = ColumnType.Text  }
+			});
 		}
 
 		public void NewUpdate(ToolFormUpdateType type) { }
@@ -98,23 +117,10 @@ namespace BizHawk.Client.EmuHawk
 
 			if (_cdl == null)
 			{
-				lvCDL.BeginUpdate();
-				if (OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows)
-				{
-					lvCDL.Items.Clear();
-				}
-				else
-				{
-					// this is a winforms implementation problem for mono
-					// see https://github.com/mono/mono/issues/11070
-					// until this is resolved in mono we should just skip this call
-				}
-				lvCDL.EndUpdate();
+				lvCDL.DeselectAll();
 				return;
 			}
 
-			lvCDL.BeginUpdate();
-
 			listContents = new string[_cdl.Count][];
 
 			int idx = 0;
@@ -183,8 +189,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 
 			}
-			lvCDL.VirtualListSize = _cdl.Count;
-			lvCDL.EndUpdate();
+			lvCDL.RowCount = _cdl.Count;
 		}
 
 		public bool AskSaveChanges()
@@ -571,9 +576,10 @@ namespace BizHawk.Client.EmuHawk
 				CodeDataLogger.SetCDL(null);
 		}
 
-		private void lvCDL_QueryItemText(int item, int subItem, out string text)
+		private void lvCDL_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
-			text = listContents[item][subItem];
+			var subItem = lvCDL.AllColumns.IndexOf(column);
+			text = listContents[index][subItem];
 		}
 
 		private void tsbExportText_Click(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/tools/CDL.designer.cs b/BizHawk.Client.EmuHawk/tools/CDL.designer.cs
index a43f020105..5b24949487 100644
--- a/BizHawk.Client.EmuHawk/tools/CDL.designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/CDL.designer.cs
@@ -52,20 +52,7 @@
 			this.tsbViewStyle = new System.Windows.Forms.ToolStripComboBox();
 			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
 			this.tsbExportText = new System.Windows.Forms.ToolStripButton();
-			this.lvCDL = new BizHawk.Client.EmuHawk.VirtualListView();
-			this.colAddress = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colDomain = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colPct = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colMapped = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colSize = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colFlag01 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colFlag02 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colFlag04 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colFlag08 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colFlag10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colFlag20 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colFlag40 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.colFlag80 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.lvCDL = new InputRoll();
 			this.miAutoResume = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuStrip1.SuspendLayout();
 			this.toolStrip1.SuspendLayout();
@@ -280,93 +267,18 @@
 			// 
 			// lvCDL
 			// 
-			this.lvCDL.BlazingFast = false;
-			this.lvCDL.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.colAddress,
-            this.colDomain,
-            this.colPct,
-            this.colMapped,
-            this.colSize,
-            this.colFlag01,
-            this.colFlag02,
-            this.colFlag04,
-            this.colFlag08,
-            this.colFlag10,
-            this.colFlag20,
-            this.colFlag40,
-            this.colFlag80});
 			this.lvCDL.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.lvCDL.FullRowSelect = true;
 			this.lvCDL.GridLines = true;
-			this.lvCDL.ItemCount = 0;
+			this.lvCDL.RowCount = 0;
 			this.lvCDL.Location = new System.Drawing.Point(0, 49);
 			this.lvCDL.Name = "lvCDL";
-			this.lvCDL.SelectAllInProgress = false;
-			this.lvCDL.selectedItem = -1;
 			this.lvCDL.Size = new System.Drawing.Size(992, 323);
 			this.lvCDL.TabIndex = 9;
-			this.lvCDL.UseCompatibleStateImageBehavior = false;
 			this.lvCDL.UseCustomBackground = true;
-			this.lvCDL.View = System.Windows.Forms.View.Details;
-			this.lvCDL.VirtualMode = true;
-			this.lvCDL.QueryItemText += new BizHawk.Client.EmuHawk.QueryItemTextHandler(this.lvCDL_QueryItemText);
-			// 
-			// colAddress
-			// 
-			this.colAddress.Text = "CDL File @";
-			this.colAddress.Width = 107;
-			// 
-			// colDomain
-			// 
-			this.colDomain.Text = "Domain";
-			this.colDomain.Width = 126;
-			// 
-			// colPct
-			// 
-			this.colPct.Text = "%";
-			this.colPct.Width = 58;
-			// 
-			// colMapped
-			// 
-			this.colMapped.Text = "Mapped";
-			this.colMapped.Width = 64;
-			// 
-			// colSize
-			// 
-			this.colSize.Text = "Size";
-			this.colSize.Width = 102;
-			// 
-			// colFlag01
-			// 
-			this.colFlag01.Text = "0x01";
-			// 
-			// colFlag02
-			// 
-			this.colFlag02.Text = "0x02";
-			// 
-			// colFlag04
-			// 
-			this.colFlag04.Text = "0x04";
-			// 
-			// colFlag08
-			// 
-			this.colFlag08.Text = "0x08";
-			// 
-			// colFlag10
-			// 
-			this.colFlag10.Text = "0x10";
-			// 
-			// colFlag20
-			// 
-			this.colFlag20.Text = "0x20";
-			// 
-			// colFlag40
-			// 
-			this.colFlag40.Text = "0x40";
-			// 
-			// colFlag80
-			// 
-			this.colFlag80.Text = "0x80";
+			this.lvCDL.AllowColumnReorder = false;
+			this.lvCDL.AllowColumnResize = true;
+			this.lvCDL.QueryItemText += new InputRoll.QueryItemTextHandler(this.lvCDL_QueryItemText);
 			// 
 			// miAutoResume
 			// 
@@ -422,20 +334,7 @@
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
 		private System.Windows.Forms.ToolStripButton tsbViewUpdate;
 		private System.Windows.Forms.ToolStripComboBox tsbViewStyle;
-		private VirtualListView lvCDL;
-		private System.Windows.Forms.ColumnHeader colAddress;
-		private System.Windows.Forms.ColumnHeader colDomain;
-		private System.Windows.Forms.ColumnHeader colPct;
-		private System.Windows.Forms.ColumnHeader colMapped;
-		private System.Windows.Forms.ColumnHeader colSize;
-		private System.Windows.Forms.ColumnHeader colFlag01;
-		private System.Windows.Forms.ColumnHeader colFlag02;
-		private System.Windows.Forms.ColumnHeader colFlag04;
-		private System.Windows.Forms.ColumnHeader colFlag08;
-		private System.Windows.Forms.ColumnHeader colFlag10;
-		private System.Windows.Forms.ColumnHeader colFlag20;
-		private System.Windows.Forms.ColumnHeader colFlag40;
-		private System.Windows.Forms.ColumnHeader colFlag80;
+		private InputRoll lvCDL;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
 		private System.Windows.Forms.ToolStripButton tsbExportText;
 		private System.Windows.Forms.ToolStripMenuItem miAutoStart;
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs
index 1e115271d4..9707bb5bb5 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs
@@ -41,7 +41,7 @@
 			this.DomainDropDown = new System.Windows.Forms.ComboBox();
 			this.SizeLabel = new System.Windows.Forms.Label();
 			this.SizeDropDown = new System.Windows.Forms.ComboBox();
-			this.DisplayTypeLael = new System.Windows.Forms.Label();
+			this.DisplayTypeLabel = new System.Windows.Forms.Label();
 			this.DisplayTypeDropDown = new System.Windows.Forms.ComboBox();
 			this.BigEndianCheckBox = new System.Windows.Forms.CheckBox();
 			this.AddButton = new System.Windows.Forms.Button();
@@ -174,14 +174,14 @@
 			this.SizeDropDown.TabIndex = 19;
 			this.SizeDropDown.SelectedIndexChanged += new System.EventHandler(this.SizeDropDown_SelectedIndexChanged);
 			// 
-			// DisplayTypeLael
+			// DisplayTypeLabel
 			// 
-			this.DisplayTypeLael.AutoSize = true;
-			this.DisplayTypeLael.Location = new System.Drawing.Point(11, 219);
-			this.DisplayTypeLael.Name = "DisplayTypeLael";
-			this.DisplayTypeLael.Size = new System.Drawing.Size(114, 25);
-			this.DisplayTypeLael.TabIndex = 20;
-			this.DisplayTypeLael.Text = "Display As";
+			this.DisplayTypeLabel.AutoSize = true;
+			this.DisplayTypeLabel.Location = new System.Drawing.Point(11, 219);
+			this.DisplayTypeLabel.Name = "DisplayTypeLabel";
+			this.DisplayTypeLabel.Size = new System.Drawing.Size(114, 25);
+			this.DisplayTypeLabel.TabIndex = 20;
+			this.DisplayTypeLabel.Text = "Display As";
 			// 
 			// DisplayTypeDropDown
 			// 
@@ -289,7 +289,7 @@
 			this.Controls.Add(this.AddButton);
 			this.Controls.Add(this.BigEndianCheckBox);
 			this.Controls.Add(this.DisplayTypeDropDown);
-			this.Controls.Add(this.DisplayTypeLael);
+			this.Controls.Add(this.DisplayTypeLabel);
 			this.Controls.Add(this.SizeDropDown);
 			this.Controls.Add(this.SizeLabel);
 			this.Controls.Add(this.DomainDropDown);
@@ -330,7 +330,7 @@
 		private System.Windows.Forms.ComboBox DomainDropDown;
 		private System.Windows.Forms.Label SizeLabel;
 		private System.Windows.Forms.ComboBox SizeDropDown;
-		private System.Windows.Forms.Label DisplayTypeLael;
+		private System.Windows.Forms.Label DisplayTypeLabel;
 		private System.Windows.Forms.ComboBox DisplayTypeDropDown;
 		private System.Windows.Forms.CheckBox BigEndianCheckBox;
 		private System.Windows.Forms.Button AddButton;
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs
index 63fce6be5a..10fa9bdabe 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs
@@ -30,14 +30,7 @@
 		{
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Cheats));
-			this.CheatListView = new BizHawk.Client.EmuHawk.VirtualListView();
-			this.CheatName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.Value = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.Compare = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.ComparisonType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.On = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.Domain = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.CheatListView = new InputRoll();
 			this.CheatsContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.ToggleContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.RemoveContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -102,35 +95,22 @@
 			// CheatListView
 			// 
 			this.CheatListView.AllowColumnReorder = true;
+			this.CheatListView.AllowColumnResize = true;
+			this.CheatListView.MultiSelect = true;
 			this.CheatListView.AllowDrop = true;
 			this.CheatListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.CheatListView.AutoArrange = false;
-			this.CheatListView.BlazingFast = false;
-			this.CheatListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.CheatName,
-            this.Address,
-            this.Value,
-            this.Compare,
-            this.ComparisonType,
-            this.On,
-            this.Domain});
 			this.CheatListView.ContextMenuStrip = this.CheatsContextMenu;
 			this.CheatListView.FullRowSelect = true;
 			this.CheatListView.GridLines = true;
-			this.CheatListView.HideSelection = false;
-			this.CheatListView.ItemCount = 0;
+			this.CheatListView.RowCount = 0;
 			this.CheatListView.Location = new System.Drawing.Point(12, 72);
 			this.CheatListView.Name = "CheatListView";
-			this.CheatListView.SelectAllInProgress = false;
-			this.CheatListView.selectedItem = -1;
 			this.CheatListView.Size = new System.Drawing.Size(414, 321);
 			this.CheatListView.TabIndex = 1;
-			this.CheatListView.UseCompatibleStateImageBehavior = false;
 			this.CheatListView.UseCustomBackground = true;
-			this.CheatListView.View = System.Windows.Forms.View.Details;
-			this.CheatListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.CheatListView_ColumnClick);
+			this.CheatListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.CheatListView_ColumnClick);
 			this.CheatListView.SelectedIndexChanged += new System.EventHandler(this.CheatListView_SelectedIndexChanged);
 			this.CheatListView.Click += new System.EventHandler(this.CheatListView_Click);
 			this.CheatListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewCheatForm_DragDrop);
@@ -138,41 +118,6 @@
 			this.CheatListView.DoubleClick += new System.EventHandler(this.CheatListView_DoubleClick);
 			this.CheatListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CheatListView_KeyDown);
 			// 
-			// CheatName
-			// 
-			this.CheatName.Text = "Name";
-			this.CheatName.Width = 104;
-			// 
-			// Address
-			// 
-			this.Address.Text = "Address";
-			this.Address.Width = 52;
-			// 
-			// Value
-			// 
-			this.Value.Text = "Value";
-			this.Value.Width = 40;
-			// 
-			// Compare
-			// 
-			this.Compare.Text = "Compare";
-			// 
-			// ComparisonType
-			// 
-			this.ComparisonType.Text = "Comparison Type";
-			this.ComparisonType.Width = 194;
-			// 
-			// On
-			// 
-			this.On.Text = "On";
-			this.On.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-			this.On.Width = 40;
-			// 
-			// Domain
-			// 
-			this.Domain.Text = "Domain";
-			this.Domain.Width = 75;
-			// 
 			// CheatsContextMenu
 			// 
 			this.CheatsContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -403,6 +348,8 @@
 			// 
 			this.DisableAllCheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop;
 			this.DisableAllCheatsMenuItem.Name = "DisableAllCheatsMenuItem";
+			this.DisableAllCheatsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Back)));
+			this.DisableAllCheatsMenuItem.ShortcutKeyDisplayString = "Ctrl + Backspace";
 			this.DisableAllCheatsMenuItem.Size = new System.Drawing.Size(233, 22);
 			this.DisableAllCheatsMenuItem.Text = "Disable all";
 			this.DisableAllCheatsMenuItem.Click += new System.EventHandler(this.DisableAllCheatsMenuItem_Click);
@@ -693,14 +640,7 @@
 
 		#endregion
 
-		private VirtualListView CheatListView;
-		private System.Windows.Forms.ColumnHeader CheatName;
-		private System.Windows.Forms.ColumnHeader Address;
-		private System.Windows.Forms.ColumnHeader Value;
-		private System.Windows.Forms.ColumnHeader ComparisonType;
-		private System.Windows.Forms.ColumnHeader Compare;
-		private System.Windows.Forms.ColumnHeader On;
-		private System.Windows.Forms.ColumnHeader Domain;
+		private InputRoll CheatListView;
 		private MenuStripEx CheatsMenu;
 		private System.Windows.Forms.ToolStripMenuItem FileSubMenu;
 		private System.Windows.Forms.ToolStripMenuItem NewMenuItem;
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
index cbc8cd2efe..9fff2eadc5 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
@@ -43,7 +43,6 @@ namespace BizHawk.Client.EmuHawk
 
 			CheatListView.QueryItemText += CheatListView_QueryItemText;
 			CheatListView.QueryItemBkColor += CheatListView_QueryItemBkColor;
-			CheatListView.VirtualMode = true;
 
 			_sortedColumn = "";
 			_sortReverse = false;
@@ -80,7 +79,7 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		public void UpdateDialog()
 		{
-			CheatListView.ItemCount = Global.CheatList.Count;
+			CheatListView.RowCount = Global.CheatList.Count;
 			TotalLabel.Text = $"{Global.CheatList.CheatCount} {(Global.CheatList.CheatCount == 1 ? "cheat" : "cheats")} {Global.CheatList.ActiveCount} active";
 		}
 
@@ -150,21 +149,36 @@ namespace BizHawk.Client.EmuHawk
 
 		private void Cheats_Load(object sender, EventArgs e)
 		{
+			// Hack for previous config settings
+			if (Settings.Columns.Any(c => string.IsNullOrWhiteSpace(c.Text)))
+			{
+				Settings = new CheatsSettings();
+			}
+
 			TopMost = Settings.TopMost;
 			CheatEditor.MemoryDomains = Core;
 			LoadConfigSettings();
+			CheatsMenu.Items.Add(CheatListView.ToColumnsMenu(ColumnToggleCallback));
 			ToggleGameGenieButton();
 			CheatEditor.SetAddEvent(AddCheat);
 			CheatEditor.SetEditEvent(EditCheat);
 			UpdateDialog();
+		}
 
-			CheatsMenu.Items.Add(Settings.Columns.GenerateColumnsMenu(ColumnToggleCallback));
+		private void SetColumns()
+		{
+			foreach (var column in Settings.Columns)
+			{
+				if (CheatListView.AllColumns[column.Name] == null)
+				{
+					CheatListView.AllColumns.Add(column);
+				}
+			}
 		}
 
 		private void ColumnToggleCallback()
 		{
-			SaveColumnInfo(CheatListView, Settings.Columns);
-			LoadColumnInfo(CheatListView, Settings.Columns);
+			Settings.Columns = CheatListView.AllColumns;
 		}
 
 		private void ToggleGameGenieButton()
@@ -195,7 +209,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SaveConfigSettings()
 		{
-			SaveColumnInfo(CheatListView, Settings.Columns);
+			Settings.Columns =CheatListView.AllColumns;
 
 			if (WindowState == FormWindowState.Normal)
 			{
@@ -221,10 +235,11 @@ namespace BizHawk.Client.EmuHawk
 				Size = Settings.WindowSize;
 			}
 
-			LoadColumnInfo(CheatListView, Settings.Columns);
+			CheatListView.AllColumns.Clear();
+			SetColumns();
 		}
 
-		private void CheatListView_QueryItemText(int index, int column, out string text)
+		private void CheatListView_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
 			text = "";
 			if (index >= Global.CheatList.Count || Global.CheatList[index].IsSeparator)
@@ -232,7 +247,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			var columnName = CheatListView.Columns[column].Name;
+			var columnName = column.Name;
 
 			switch (columnName)
 			{
@@ -296,7 +311,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void CheatListView_QueryItemBkColor(int index, int column, ref Color color)
+		private void CheatListView_QueryItemBkColor(int index, RollColumn column, ref Color color)
 		{
 			if (index < Global.CheatList.Count)
 			{
@@ -311,7 +326,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private IEnumerable<int> SelectedIndices => CheatListView.SelectedIndices.Cast<int>();
+		private IEnumerable<int> SelectedIndices => CheatListView.SelectedRows;
 
 		private IEnumerable<Cheat> SelectedItems
 		{
@@ -325,19 +340,16 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DoSelectedIndexChange()
 		{
-			if (!CheatListView.SelectAllInProgress)
+			if (SelectedCheats.Any())
 			{
-				if (SelectedCheats.Any())
-				{
-					var cheat = SelectedCheats.First();
-					CheatEditor.SetCheat(cheat);
-					CheatGroupBox.Text = $"Editing Cheat {cheat.Name} - {cheat.AddressStr}";
-				}
-				else
-				{
-					CheatEditor.ClearForm();
-					CheatGroupBox.Text = "New Cheat";
-				}
+				var cheat = SelectedCheats.First();
+				CheatEditor.SetCheat(cheat);
+				CheatGroupBox.Text = $"Editing Cheat {cheat.Name} - {cheat.AddressStr}";
+			}
+			else
+			{
+				CheatEditor.ClearForm();
+				CheatGroupBox.Text = "New Cheat";
 			}
 		}
 
@@ -434,7 +446,8 @@ namespace BizHawk.Client.EmuHawk
 				ToggleMenuItem.Enabled =
 				SelectedIndices.Any();
 
-			DisableAllCheatsMenuItem.Enabled = Global.CheatList.ActiveCount > 0;
+			// Always leave enabled even if no cheats enabled. This way the hotkey will always work however a new cheat is enabled
+			// DisableAllCheatsMenuItem.Enabled = Global.CheatList.ActiveCount > 0;
 
 			GameGenieSeparator.Visible =
 				OpenGameGenieEncoderDecoderMenuItem.Visible =
@@ -451,7 +464,7 @@ namespace BizHawk.Client.EmuHawk
 					Global.CheatList.Remove(item);
 				}
 
-				CheatListView.SelectedIndices.Clear();
+				CheatListView.DeselectAll();
 				UpdateDialog();
 			}
 		}
@@ -486,12 +499,12 @@ namespace BizHawk.Client.EmuHawk
 				Global.CheatList.Insert(index - 1, cheat);
 			}
 
-			var newindices = indices.Select(t => t - 1).ToList();
+			var newIndices = indices.Select(t => t - 1);
 
-			CheatListView.SelectedIndices.Clear();
-			foreach (var newi in newindices)
+			CheatListView.DeselectAll();
+			foreach (var index in newIndices)
 			{
-				CheatListView.SelectItem(newi, true);
+				CheatListView.SelectRow(index, true);
 			}
 
 			UpdateMessageLabel();
@@ -515,12 +528,12 @@ namespace BizHawk.Client.EmuHawk
 
 			UpdateMessageLabel();
 
-			var newindices = indices.Select(t => t + 1).ToList();
+			var newIndices = indices.Select(t => t + 1);
 
-			CheatListView.SelectedIndices.Clear();
-			foreach (var newi in newindices)
+			CheatListView.DeselectAll();
+			foreach (var index in newIndices)
 			{
-				CheatListView.SelectItem(newi, true);
+				CheatListView.SelectRow(index, true);
 			}
 
 			UpdateDialog();
@@ -533,12 +546,15 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ToggleMenuItem_Click(object sender, EventArgs e)
 		{
-			SelectedCheats.ToList().ForEach(x => x.Toggle());
+			foreach (var x in SelectedCheats)
+			{
+				x.Toggle();
+			}
 			CheatListView.Refresh();
 		}
 
 		private void DisableAllCheatsMenuItem_Click(object sender, EventArgs e)
-		{
+		{	
 			Global.CheatList.DisableAll();
 		}
 
@@ -608,14 +624,15 @@ namespace BizHawk.Client.EmuHawk
 					.OfType<ToolStripMenuItem>()
 					.First(x => x.Name == "GeneratedColumnsSubMenu"));
 
-			CheatsMenu.Items.Add(Settings.Columns.GenerateColumnsMenu(ColumnToggleCallback));
+			CheatsMenu.Items.Add(CheatListView.ToColumnsMenu(ColumnToggleCallback));
 
 			Global.Config.DisableCheatsOnLoad = false;
 			Global.Config.LoadCheatFileByGame = true;
 			Global.Config.CheatsAutoSaveOnClose = true;
 
 			RefreshFloatingWindowControl(Settings.FloatingWindow);
-			LoadColumnInfo(CheatListView, Settings.Columns);
+			CheatListView.AllColumns.Clear();
+			SetColumns();
 		}
 
 		#endregion
@@ -648,9 +665,9 @@ namespace BizHawk.Client.EmuHawk
 			DoSelectedIndexChange();
 		}
 
-		private void CheatListView_ColumnClick(object sender, ColumnClickEventArgs e)
+		private void CheatListView_ColumnClick(object sender, InputRoll.ColumnClickEventArgs e)
 		{
-			var column = CheatListView.Columns[e.Column];
+			var column = e.Column;
 			if (column.Name != _sortedColumn)
 			{
 				_sortReverse = false;
@@ -720,22 +737,21 @@ namespace BizHawk.Client.EmuHawk
 		{
 			public CheatsSettings()
 			{
-				Columns = new ColumnList
+				Columns = new List<RollColumn>
 				{
-					new Column { Name = NameColumn, Visible = true, Index = 0, Width = 128 },
-					new Column { Name = AddressColumn, Visible = true, Index = 1, Width = 60 },
-					new Column { Name = ValueColumn, Visible = true, Index = 2, Width = 59 },
-					new Column { Name = CompareColumn, Visible = true, Index = 3, Width = 59 },
-					new Column { Name = ComparisonTypeColumn, Visible = true, Index = 4, Width = 60 },
-					new Column { Name = OnColumn, Visible = false, Index = 5, Width = 28 },
-					new Column { Name = DomainColumn, Visible = true, Index = 6, Width = 55 },
-					new Column { Name = SizeColumn, Visible = true, Index = 7, Width = 55 },
-					new Column { Name = EndianColumn, Visible = false, Index = 8, Width = 55 },
-					new Column { Name = TypeColumn, Visible = false, Index = 9, Width = 55 }
+					new RollColumn { Text = "Names", Name = NameColumn, Visible = true, Width = 128, Type = ColumnType.Text },
+					new RollColumn { Text = "Address", Name = AddressColumn, Visible = true, Width = 60, Type = ColumnType.Text },
+					new RollColumn { Text = "Value", Name = ValueColumn, Visible = true, Width = 59, Type = ColumnType.Text },
+					new RollColumn { Text = "Compare", Name = CompareColumn, Visible = true, Width = 63, Type = ColumnType.Text },
+					new RollColumn { Text = "Compare Type", Name = ComparisonTypeColumn, Visible = true, Width = 98, Type = ColumnType.Text },
+					new RollColumn { Text = "On", Name = OnColumn, Visible = false, Width = 28, Type = ColumnType.Text },
+					new RollColumn { Text = "Size", Name = SizeColumn, Visible = true, Width = 55, Type = ColumnType.Text },
+					new RollColumn { Text = "Endian", Name = EndianColumn, Visible = false, Width = 55, Type = ColumnType.Text },
+					new RollColumn { Text = "Display Type", Name = TypeColumn, Visible = false, Width = 88, Type = ColumnType.Text }
 				};
 			}
 
-			public ColumnList Columns { get; set; }
+			public List<RollColumn> Columns { get; set; }
 		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.Designer.cs b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.Designer.cs
index a30300fc04..7ea0308c42 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.Designer.cs
@@ -36,7 +36,7 @@
 			this.RemoveBreakpointButton = new System.Windows.Forms.Button();
 			this.DuplicateBreakpointButton = new System.Windows.Forms.Button();
 			this.EditBreakpointButton = new System.Windows.Forms.Button();
-			this.BreakpointView = new BizHawk.Client.EmuHawk.VirtualListView();
+			this.BreakpointView = new System.Windows.Forms.ListView();
 			this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -118,7 +118,6 @@
 			this.BreakpointView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
 			| System.Windows.Forms.AnchorStyles.Left) 
 			| System.Windows.Forms.AnchorStyles.Right)));
-			this.BreakpointView.BlazingFast = false;
 			this.BreakpointView.CheckBoxes = true;
 			this.BreakpointView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
 			this.columnHeader1,
@@ -129,16 +128,13 @@
 			this.BreakpointView.FullRowSelect = true;
 			this.BreakpointView.GridLines = true;
 			this.BreakpointView.HideSelection = false;
-			this.BreakpointView.ItemCount = 0;
+			this.BreakpointView.VirtualListSize = 0;
 			this.BreakpointView.Location = new System.Drawing.Point(0, 19);
 			this.BreakpointView.Name = "BreakpointView";
-			this.BreakpointView.SelectAllInProgress = false;
-			this.BreakpointView.selectedItem = -1;
 			this.BreakpointView.Size = new System.Drawing.Size(366, 365);
 			this.BreakpointView.TabIndex = 5;
 			this.BreakpointView.TabStop = false;
 			this.BreakpointView.UseCompatibleStateImageBehavior = false;
-			this.BreakpointView.UseCustomBackground = true;
 			this.BreakpointView.View = System.Windows.Forms.View.Details;
 			this.BreakpointView.ItemActivate += new System.EventHandler(this.BreakpointView_ItemActivate);
 			this.BreakpointView.SelectedIndexChanged += new System.EventHandler(this.BreakpointView_SelectedIndexChanged);
@@ -184,7 +180,7 @@
 
 		#endregion
 
-		private VirtualListView BreakpointView;
+		private System.Windows.Forms.ListView BreakpointView;
 		public System.Windows.Forms.ColumnHeader columnHeader1;
 		private System.Windows.Forms.ColumnHeader columnHeader2;
 		private System.Windows.Forms.Button AddBreakpointButton;
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
index 5d8dfc5bc9..9594007e9d 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
@@ -22,8 +22,7 @@ namespace BizHawk.Client.EmuHawk
 		public BreakpointControl()
 		{
 			InitializeComponent();
-			BreakpointView.QueryItemText += BreakPointView_QueryItemText;
-			BreakpointView.QueryItemBkColor += BreakPointView_QueryItemBkColor;
+			BreakpointView.RetrieveVirtualItem += BreakPointView_QueryItemText;
 			BreakpointView.VirtualMode = true;
 			_breakpoints.Callback = BreakpointCallback;
 		}
@@ -33,30 +32,16 @@ namespace BizHawk.Client.EmuHawk
 			UpdateStatsLabel();
 		}
 
-		private void BreakPointView_QueryItemText(int index, int column, out string text)
+		private void BreakPointView_QueryItemText(object sender, RetrieveVirtualItemEventArgs e)
 		{
-			text = "";
-			switch (column)
-			{
-				case 0:
-					text = $"{_breakpoints[index].Address:X}";
-					break;
-				case 1:
-					text = $"{_breakpoints[index].AddressMask:X}";
-					break;
-				case 2:
-					text = _breakpoints[index].Type.ToString();
-					break;
-				case 3:
-					text = _breakpoints[index].Name;
-					break;
-			}
-		}
+			var entry = _breakpoints[e.ItemIndex];
+			e.Item = new ListViewItem($"{entry.Address:X}");
+			e.Item.SubItems.Add($"{entry.AddressMask:X}");
+			e.Item.SubItems.Add(entry.Type.ToString());
+			e.Item.SubItems.Add(entry.Name);
 
-		private void BreakPointView_QueryItemBkColor(int index, int column, ref Color color)
-		{
-			color = _breakpoints[index].ReadOnly ? SystemColors.Control
-				: _breakpoints[index].Active ? Color.LightCyan
+			e.Item.BackColor = entry.ReadOnly ? SystemColors.Control
+				: entry.Active ? Color.LightCyan
 				: Color.White;
 		}
 
@@ -90,7 +75,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				CheckForNewBreakpoints();
 
-				BreakpointView.ItemCount = _breakpoints.Count;
+				BreakpointView.VirtualListSize = _breakpoints.Count;
 				UpdateStatsLabel();
 			}
 		}
@@ -124,7 +109,7 @@ namespace BizHawk.Client.EmuHawk
 					_breakpoints.Add(new Breakpoint(Core, callback));
 				}
 
-				BreakpointView.ItemCount = _breakpoints.Count;
+				BreakpointView.VirtualListSize = _breakpoints.Count;
 				BreakpointView.Refresh();
 				UpdateBreakpointRemoveButton();
 				UpdateStatsLabel();
@@ -146,7 +131,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_breakpoints.Add(Core, MemoryDomains.SystemBus.Name, address, mask, type);
 
-			BreakpointView.ItemCount = _breakpoints.Count;
+			BreakpointView.VirtualListSize = _breakpoints.Count;
 			UpdateBreakpointRemoveButton();
 			UpdateStatsLabel();
 		}
@@ -160,7 +145,7 @@ namespace BizHawk.Client.EmuHawk
 				_breakpoints.Add(Core, MemoryDomains.SystemBus.Name, b.Address, b.AddressMask, b.BreakType);
 			}
 
-			BreakpointView.ItemCount = _breakpoints.Count;
+			BreakpointView.VirtualListSize = _breakpoints.Count;
 			UpdateBreakpointRemoveButton();
 			UpdateStatsLabel();
 		}
@@ -208,7 +193,7 @@ namespace BizHawk.Client.EmuHawk
 						_breakpoints.Remove(item);
 					}
 
-					BreakpointView.ItemCount = _breakpoints.Count;
+					BreakpointView.VirtualListSize = _breakpoints.Count;
 					UpdateBreakpointRemoveButton();
 					UpdateStatsLabel();
 				}
@@ -243,7 +228,7 @@ namespace BizHawk.Client.EmuHawk
 						item.Active ^= true;
 					}
 
-					BreakpointView.ItemCount = _breakpoints.Count;
+					BreakpointView.VirtualListSize = _breakpoints.Count;
 					UpdateBreakpointRemoveButton();
 					UpdateStatsLabel();
 				}
@@ -270,7 +255,7 @@ namespace BizHawk.Client.EmuHawk
 				item.Active ^= true;
 			}
 
-			BreakpointView.ItemCount = _breakpoints.Count;
+			BreakpointView.VirtualListSize = _breakpoints.Count;
 			UpdateStatsLabel();
 		}
 
@@ -288,7 +273,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			BreakpointView.ItemCount = _breakpoints.Count;
+			BreakpointView.VirtualListSize = _breakpoints.Count;
 			UpdateBreakpointRemoveButton();
 			UpdateStatsLabel();
 		}
@@ -310,7 +295,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			BreakpointView.ItemCount = _breakpoints.Count;
+			BreakpointView.VirtualListSize = _breakpoints.Count;
 			UpdateBreakpointRemoveButton();
 			UpdateStatsLabel();
 		}
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs
index ff6dc13a11..2eaa8ea454 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs
@@ -46,9 +46,7 @@
 			this.DisassemblerBox = new System.Windows.Forms.GroupBox();
 			this.ToPCBtn = new System.Windows.Forms.Button();
 			this.label1 = new System.Windows.Forms.Label();
-			this.DisassemblerView = new BizHawk.Client.EmuHawk.VirtualListView();
-			this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.Instruction = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.DisassemblerView = new InputRoll();
 			this.DisassemblerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.AddBreakpointContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.StepOutBtn = new System.Windows.Forms.Button();
@@ -239,39 +237,21 @@
 			this.DisassemblerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.DisassemblerView.BlazingFast = false;
-			this.DisassemblerView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.Address,
-            this.Instruction});
+			this.DisassemblerView.AllowColumnReorder = false;
+			this.DisassemblerView.AllowColumnResize = true;
 			this.DisassemblerView.ContextMenuStrip = this.DisassemblerContextMenu;
 			this.DisassemblerView.Font = new System.Drawing.Font("Courier New", 8F);
 			this.DisassemblerView.FullRowSelect = true;
 			this.DisassemblerView.GridLines = true;
-			this.DisassemblerView.HideSelection = false;
-			this.DisassemblerView.ItemCount = 0;
+			this.DisassemblerView.RowCount = 0;
 			this.DisassemblerView.Location = new System.Drawing.Point(6, 39);
 			this.DisassemblerView.Name = "DisassemblerView";
-			this.DisassemblerView.SelectAllInProgress = false;
-			this.DisassemblerView.selectedItem = -1;
 			this.DisassemblerView.Size = new System.Drawing.Size(395, 476);
 			this.DisassemblerView.TabIndex = 1;
-			this.DisassemblerView.UseCompatibleStateImageBehavior = false;
 			this.DisassemblerView.UseCustomBackground = true;
-			this.DisassemblerView.View = System.Windows.Forms.View.Details;
-			this.DisassemblerView.Scroll += new System.Windows.Forms.ScrollEventHandler(this.DisassemblerView_Scroll);
+			this.DisassemblerView.RowScroll += new InputRoll.RowScrollEvent(this.DisassemblerView_Scroll);
 			this.DisassemblerView.SizeChanged += new System.EventHandler(this.DisassemblerView_SizeChanged);
 			this.DisassemblerView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DisassemblerView_KeyDown);
-			this.DisassemblerView.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.DisassemblerView_Wheel);
-			// 
-			// Address
-			// 
-			this.Address.Text = "Address";
-			this.Address.Width = 94;
-			// 
-			// Instruction
-			// 
-			this.Instruction.Text = "Instruction";
-			this.Instruction.Width = 291;
 			// 
 			// DisassemblerContextMenu
 			// 
@@ -412,9 +392,7 @@
 		private System.Windows.Forms.GroupBox BreakpointsGroupBox;
 		private BreakpointControl BreakPointControl1;
 		private System.Windows.Forms.GroupBox DisassemblerBox;
-		private VirtualListView DisassemblerView;
-		private System.Windows.Forms.ColumnHeader Address;
-		private System.Windows.Forms.ColumnHeader Instruction;
+		private InputRoll DisassemblerView;
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.Button StepOutBtn;
 		private System.Windows.Forms.Button StepIntoBtn;
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index df9b7328aa..c86f93f188 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -43,16 +43,14 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (CanDisassemble)
 			{
-				DisassemblerView.BlazingFast = true;
 				Disassemble();
 				SetDisassemblerItemCount();
-				DisassemblerView.BlazingFast = false;
 			}
 		}
 		
 		private void Disassemble()
 		{
-			int lineCount = DisassemblerView.NumberOfVisibleRows;
+			int lineCount = DisassemblerView.RowCount + 2;
 
 			_disassemblyLines.Clear();
 			uint a = _currentDisassemblerAddress;
@@ -69,24 +67,24 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void DisassemblerView_QueryItemText(int index, int column, out string text)
+		private void DisassemblerView_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
 			text = "";
 
 			if (index < _disassemblyLines.Count)
 			{
-				if (column == 0)
+				if (column.Name == AddressColumnName)
 				{
 					text = _disassemblyLines[index].Address.ToHexString(_pcRegisterSize);
 				}
-				else if (column == 1)
+				else if (column.Name == InstructionColumnName)
 				{
 					text = _disassemblyLines[index].Mnemonic;
 				}
 			}
 		}
 
-		private void DisassemblerView_QueryItemBkColor(int index, int column, ref Color color)
+		private void DisassemblerView_QueryItemBkColor(int index, RollColumn column, ref Color color)
 		{
 			if (_disassemblyLines.Any() && index < _disassemblyLines.Count)
 			{
@@ -97,9 +95,16 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+
 		private void DecrementCurrentAddress()
 		{
+			if (_currentDisassemblerAddress == 0)
+			{
+				return;
+			}
+
 			uint newaddress = _currentDisassemblerAddress;
+			
 			while (true)
 			{
 				int bytestoadvance;
@@ -137,51 +142,44 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void DisassemblerView_Scroll(object sender, ScrollEventArgs e)
+
+		private bool _blockScroll;
+		private void DisassemblerView_Scroll(object sender, EventArgs e)
 		{
-			if (e.Type == ScrollEventType.SmallIncrement)
+			// This is really really gross, but it works
+			if (_blockScroll)
 			{
-				SmallIncrement();
+				return;
 			}
 
-			if (e.Type == ScrollEventType.SmallDecrement)
+			var scrollBar = sender as ScrollBar;
+			if (scrollBar != null)
 			{
-				SmallDecrement();
-			}
-		}
+				if (scrollBar.Value > 0)
+				{
+					SmallIncrement();
 
-		private void DisassemblerView_Wheel(object sender, MouseEventArgs e)
-		{
-			if (e.Delta > 0)
-			{
-				SmallDecrement();
-			}
-			if (e.Delta > 120)
-			{
-				SmallDecrement();
-			}
-			if (e.Delta > 240)
-			{
-				SmallDecrement();
-			}
+					_blockScroll = true;
+					scrollBar.Value = 14;
+					_blockScroll = false;
+				}
+				else
+				{
+					SmallDecrement();
 
-			if (e.Delta < 0)
-			{
-				SmallIncrement();		
-			}
-			if (e.Delta < -120)
-			{
-				SmallIncrement();
-			}
-			if (e.Delta < -240)
-			{
-				SmallIncrement();
+					if (_currentDisassemblerAddress != 0)
+					{
+						_blockScroll = true;
+						scrollBar.Value = 14;
+						_blockScroll = false;
+					}
+				}
 			}
 		}
 
 		private void SetDisassemblerItemCount()
 		{
-			DisassemblerView.ItemCount = DisassemblerView.NumberOfVisibleRows + 1;
+			DisassemblerView.RowCount = DisassemblerView.VisibleRows + 2;
 		}
 
 		private void DisassemblerView_SizeChanged(object sender, EventArgs e)
@@ -225,7 +223,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void CopySelectedDisassembler()
 		{
-			var indices = DisassemblerView.SelectedIndices;
+			var indices = DisassemblerView.SelectedRows.ToList();
 
 			if (indices.Count > 0)
 			{
@@ -256,12 +254,12 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DisassemblerContextMenu_Opening(object sender, EventArgs e)
 		{
-			AddBreakpointContextMenuItem.Enabled = DisassemblerView.SelectedIndices.Count > 0;
+			AddBreakpointContextMenuItem.Enabled = DisassemblerView.SelectedRows.Any();
 		}
 
 		private void AddBreakpointContextMenuItem_Click(object sender, EventArgs e)
 		{
-			var indices = DisassemblerView.SelectedIndices;
+			var indices = DisassemblerView.SelectedRows.ToList();
 
 			if (indices.Count > 0)
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
index e15f973653..4f180134ff 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
@@ -10,6 +10,9 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class GenericDebugger : Form, IToolFormAutoConfig, IControlMainform
 	{
+		private const string AddressColumnName = "Address";
+		private const string InstructionColumnName = "Instruction";
+
 		public GenericDebugger()
 		{
 			InitializeComponent();
@@ -17,7 +20,24 @@ namespace BizHawk.Client.EmuHawk
 
 			DisassemblerView.QueryItemText += DisassemblerView_QueryItemText;
 			DisassemblerView.QueryItemBkColor += DisassemblerView_QueryItemBkColor;
-			DisassemblerView.VirtualMode = true;
+			DisassemblerView.AllColumns.Clear();
+			DisassemblerView.AllColumns.AddRange(new[]
+			{
+				new RollColumn
+				{
+					Name = AddressColumnName,
+					Text = AddressColumnName,
+					Width = 94,
+					Type = ColumnType.Text
+				},
+				new RollColumn
+				{
+					Name = InstructionColumnName,
+					Text = InstructionColumnName,
+					Width = 291,
+					Type = ColumnType.Text
+				}
+			});
 		}
 
 		private void GenericDebugger_Load(object sender, EventArgs e)
@@ -75,7 +95,7 @@ namespace BizHawk.Client.EmuHawk
 			else
 			{
 				DisassemblerBox.Enabled = false;
-				DisassemblerView.ItemCount = 0;
+				DisassemblerView.RowCount = 0;
 				DisassemblerBox.Controls.Add(new Label
 				{
 					Location = new Point(UIHelper.ScaleX(35), UIHelper.ScaleY(23)),
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/RegisterBoxControl.cs b/BizHawk.Client.EmuHawk/tools/Debugger/RegisterBoxControl.cs
index 9f6d273e8f..83dba6a59b 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/RegisterBoxControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/RegisterBoxControl.cs
@@ -41,46 +41,37 @@ namespace BizHawk.Client.EmuHawk
 				{
 					if (Controls.OfType<Panel>().Any(p => p.Name == "FlagPanel"))
 					{
-						Controls
-							.OfType<Panel>()
+						foreach (var checkbox in Controls.OfType<Panel>()
 							.First(p => p.Name == "FlagPanel")
 							.Controls
-							.OfType<CheckBox>()
-							.ToList()
-							.ForEach(checkbox =>
+							.OfType<CheckBox>())
+						{
+							if (checkbox.Name == register.Key)
 							{
-								if (checkbox.Name == register.Key)
-								{
-									checkbox.Checked = register.Value.Value == 1;
-								}
-							});
+								checkbox.Checked = register.Value.Value == 1;
+							}
+						}
 					}
 
 					if (_canSetCpuRegisters)
 					{
-						Controls
-							.OfType<TextBox>()
-							.ToList()
-							.ForEach(textbox =>
+						foreach (var textbox in Controls.OfType<TextBox>())
+						{
+							if (textbox.Name == register.Key)
 							{
-								if (textbox.Name == register.Key)
-								{
-									textbox.Text = register.Value.Value.ToHexString(register.Value.BitSize / 4);
-								}
-							});
+								textbox.Text = register.Value.Value.ToHexString(register.Value.BitSize / 4);
+							}
+						}
 					}
 					else
 					{
-						Controls
-							.OfType<Label>()
-							.ToList()
-							.ForEach(label =>
+						foreach (var label in Controls.OfType<Label>())
+						{
+							if (label.Name == register.Key)
 							{
-								if (label.Name == register.Key)
-								{
-									label.Text = register.Value.Value.ToHexString(register.Value.BitSize / 4);
-								}
-							});
+								label.Text = register.Value.Value.ToHexString(register.Value.BitSize / 4);
+							}
+						}
 					}
 				}
 
diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
index 26c3997900..a7a3259c89 100644
--- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
+++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
@@ -213,7 +213,7 @@ namespace BizHawk.Client.EmuHawk
 				SetDomain(domain);
 				SetHighlighted(addrList[0]);
 				_secondaryHighlightedAddresses.Clear();
-				_secondaryHighlightedAddresses.AddRange(addrList.Where(addr => addr != addrList[0]).ToList());
+				_secondaryHighlightedAddresses.AddRange(addrList.Where(addr => addr != addrList[0]));
 				ClearNibbles();
 				UpdateValues();
 				MemoryViewerBox.Refresh();
@@ -835,8 +835,7 @@ namespace BizHawk.Client.EmuHawk
 			if (address >= 0) 
 			{
 				// TODO: can't unfreeze address 0??
-				Global.CheatList.RemoveRange(
-					Global.CheatList.Where(x => x.Contains(address)).ToList());
+				Global.CheatList.RemoveRange(Global.CheatList.Where(x => x.Contains(address)));
 			}
 
 			MemoryViewerBox.Refresh();
@@ -2251,6 +2250,12 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private Pen _blackPen = new Pen(Color.Black);
+		private SolidBrush _freezeBrush = new SolidBrush(Global.Config.HexFreezeColor);
+		private SolidBrush _freezeHighlightBrush = new SolidBrush(Global.Config.HexHighlightFreezeColor);
+		private SolidBrush _highlightBrush = new SolidBrush(Global.Config.HexHighlightColor);
+		private SolidBrush _secondaryHighlightBrush = new SolidBrush(Color.FromArgb(0x44, Global.Config.HexHighlightColor));
+
 		private void MemoryViewerBox_Paint(object sender, PaintEventArgs e)
 		{
 			var activeCheats = Global.CheatList.Where(x => x.Enabled);
@@ -2272,8 +2277,9 @@ namespace BizHawk.Client.EmuHawk
 						var width = (fontWidth * 2 * (int)cheat.Size) + (gaps * fontWidth);
 
 						var rect = new Rectangle(GetAddressCoordinates(cheat.Address ?? 0), new Size(width, fontHeight));
-						e.Graphics.DrawRectangle(new Pen(Brushes.Black), rect);
-						e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexFreezeColor), rect);
+						e.Graphics.DrawRectangle(_blackPen, rect);
+						_freezeBrush.Color = Global.Config.HexFreezeColor;
+						e.Graphics.FillRectangle(_freezeBrush, rect);
 					}
 				}
 			}
@@ -2286,19 +2292,21 @@ namespace BizHawk.Client.EmuHawk
 				var textpoint = new Point(textX, point.Y);
 
 				var rect = new Rectangle(point, new Size(fontWidth * 2 * DataSize + (NeedsExtra(_addressHighlighted) ? fontWidth : 0) + 2, fontHeight));
-				e.Graphics.DrawRectangle(new Pen(Brushes.Black), rect);
+				e.Graphics.DrawRectangle(_blackPen, rect);
 
 				var textrect = new Rectangle(textpoint, new Size(fontWidth * DataSize, fontHeight));
 
 				if (Global.CheatList.IsActive(_domain, _addressHighlighted))
 				{
-					e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightFreezeColor), rect);
-					e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightFreezeColor), textrect);
+					_freezeHighlightBrush.Color = Global.Config.HexHighlightFreezeColor;
+					e.Graphics.FillRectangle(_freezeHighlightBrush, rect);
+					e.Graphics.FillRectangle(_freezeHighlightBrush, textrect);
 				}
 				else
 				{
-					e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightColor), rect);
-					e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightColor), textrect);
+					_highlightBrush.Color = Global.Config.HexHighlightColor;
+					e.Graphics.FillRectangle(_highlightBrush, rect);
+					e.Graphics.FillRectangle(_highlightBrush, textrect);
 				}
 			}
 
@@ -2311,19 +2319,21 @@ namespace BizHawk.Client.EmuHawk
 					var textpoint = new Point(textX, point.Y);
 
 					var rect = new Rectangle(point, new Size(fontWidth * 2 * DataSize + 2, fontHeight));
-					e.Graphics.DrawRectangle(new Pen(Brushes.Black), rect);
+					e.Graphics.DrawRectangle(_blackPen, rect);
 
 					var textrect = new Rectangle(textpoint, new Size(fontWidth * DataSize, fontHeight));
 
 					if (Global.CheatList.IsActive(_domain, address))
 					{
-						e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightFreezeColor), rect);
-						e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightFreezeColor), textrect);
+						_freezeHighlightBrush.Color = Global.Config.HexHighlightFreezeColor;
+						e.Graphics.FillRectangle(_freezeHighlightBrush, rect);
+						e.Graphics.FillRectangle(_freezeHighlightBrush, textrect);
 					}
 					else
 					{
-						e.Graphics.FillRectangle(new SolidBrush(Color.FromArgb(0x44, Global.Config.HexHighlightColor)), rect);
-						e.Graphics.FillRectangle(new SolidBrush(Color.FromArgb(0x44, Global.Config.HexHighlightColor)), textrect);
+						_secondaryHighlightBrush.Color = Color.FromArgb(0x44, Global.Config.HexHighlightColor);
+						e.Graphics.FillRectangle(_secondaryHighlightBrush, rect);
+						e.Graphics.FillRectangle(_secondaryHighlightBrush, textrect);
 					}
 				}
 			}
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
index 3ebe0aeccc..f8523ea8a4 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
@@ -404,12 +404,12 @@ namespace BizHawk.Client.EmuHawk
 			return GlobalWin.MainForm.DesktopLocation.Y;
 		}
 
-        [LuaMethodExample("local incbhver = client.getversion( );")]
-        [LuaMethod("getversion", "Returns the current stable BizHawk version")]
-        public static string GetVersion()
-        {
-            return VersionInfo.Mainversion;            
-        }
+		[LuaMethodExample("local incbhver = client.getversion( );")]
+		[LuaMethod("getversion", "Returns the current stable BizHawk version")]
+		public static string GetVersion()
+		{
+			return VersionInfo.Mainversion;
+		}
 
 		[LuaMethodExample("local nlcliget = client.getavailabletools( );")]
 		[LuaMethod("getavailabletools", "Returns a list of the tools currently open")]
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
index d4eae545c1..30de9ba773 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
@@ -123,8 +123,7 @@ namespace BizHawk.Client.EmuHawk
 							}
 						}
 
-						kvps = kvps.OrderBy(x => x.Key).ToList();
-						foreach (var kvp in kvps)
+						foreach (var kvp in kvps.OrderBy(x => x.Key))
 						{
 							sb
 								.Append("\"")
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
index a836574ddb..869843689a 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Forms.cs
@@ -149,11 +149,7 @@ namespace BizHawk.Client.EmuHawk
 				{
 					if (control.Handle == ptr)
 					{
-						var luaEvents = form.ControlEvents.Where(x => x.Control == ptr).ToList();
-						foreach (var luaEvent in luaEvents)
-						{
-							form.ControlEvents.Remove(luaEvent);
-						}
+						form.ControlEvents.RemoveAll(x => x.Control == ptr);
 					}
 				}
 			}
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs
index bdba64d3a1..24e92d1f42 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs
@@ -587,7 +587,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Engaged())
 			{
-				Tastudio.AddColumn(name, text, width, InputRoll.RollColumn.InputType.Text);
+				Tastudio.AddColumn(name, text, width, ColumnType.Text);
 			}
 		}
 	}
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
index 08efa298d3..b278e54f55 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
@@ -35,15 +35,12 @@ namespace BizHawk.Client.EmuHawk
 				.Where(t => typeof(LuaLibraryBase).IsAssignableFrom(t))
 				.Where(t => t.IsSealed)
 				.Where(t => ServiceInjector.IsAvailable(serviceProvider, t))
-				.ToList();
-
-			libs.AddRange(
-				Assembly
-				.GetAssembly(typeof(EmuLuaLibrary))
-				.GetTypes()
-				.Where(t => typeof(LuaLibraryBase).IsAssignableFrom(t))
-				.Where(t => t.IsSealed)
-				.Where(t => ServiceInjector.IsAvailable(serviceProvider, t)));
+				.Concat(Assembly
+					.GetAssembly(typeof(EmuLuaLibrary))
+					.GetTypes()
+					.Where(t => typeof(LuaLibraryBase).IsAssignableFrom(t))
+					.Where(t => t.IsSealed)
+					.Where(t => ServiceInjector.IsAvailable(serviceProvider, t)));
 
 			foreach (var lib in libs)
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs
index 01816fd1c6..fb7bfd1ac9 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs
@@ -104,10 +104,7 @@
 			this.InsertSeparatorToolbarItem = new System.Windows.Forms.ToolStripButton();
 			this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
 			this.EraseToolbarItem = new System.Windows.Forms.ToolStripButton();
-			this.LuaListView = new BizHawk.Client.EmuHawk.VirtualListView();
-			this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+			this.LuaListView = new InputRoll();
 			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
 			this.CopyContextItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.ScriptListContextMenu.SuspendLayout();
@@ -805,46 +802,20 @@
 			this.LuaListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.LuaListView.BlazingFast = false;
-			this.LuaListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.Script,
-            this.PathName});
+			this.LuaListView.AllowColumnResize = true;
+			this.LuaListView.AllowColumnReorder = false;
 			this.LuaListView.ContextMenuStrip = this.ScriptListContextMenu;
 			this.LuaListView.FullRowSelect = true;
 			this.LuaListView.GridLines = true;
-			this.LuaListView.HideSelection = false;
-			this.LuaListView.ItemCount = 0;
+			this.LuaListView.RowCount = 0;
 			this.LuaListView.Location = new System.Drawing.Point(4, 21);
 			this.LuaListView.Name = "LuaListView";
-			this.LuaListView.SelectAllInProgress = false;
-			this.LuaListView.selectedItem = -1;
 			this.LuaListView.Size = new System.Drawing.Size(273, 271);
-			this.LuaListView.SmallImageList = this.imageList1;
 			this.LuaListView.TabIndex = 0;
-			this.LuaListView.UseCompatibleStateImageBehavior = false;
 			this.LuaListView.UseCustomBackground = true;
-			this.LuaListView.View = System.Windows.Forms.View.Details;
-			this.LuaListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.LuaListView_ColumnClick);
-			this.LuaListView.ItemActivate += new System.EventHandler(this.LuaListView_ItemActivate);
+			this.LuaListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.LuaListView_ColumnClick);
 			this.LuaListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaListView_KeyDown);
-			// 
-			// Script
-			// 
-			this.Script.Text = "Script";
-			this.Script.Width = 92;
-			// 
-			// PathName
-			// 
-			this.PathName.Text = "Path";
-			this.PathName.Width = 195;
-			// 
-			// imageList1
-			// 
-			this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
-			this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
-			this.imageList1.Images.SetKeyName(0, "StopButton.png");
-			this.imageList1.Images.SetKeyName(1, "PlayButton.png");
-			this.imageList1.Images.SetKeyName(2, "Pause.png");
+			this.LuaListView.DoubleClick += new System.EventHandler(this.LuaListView_DoubleClick);
 			// 
 			// splitContainer1
 			// 
@@ -910,8 +881,7 @@
 
 		#endregion
 
-		private VirtualListView LuaListView;
-		private System.Windows.Forms.ColumnHeader PathName;
+		private InputRoll LuaListView;
 		private MenuStripEx menuStrip1;
 		private System.Windows.Forms.ToolStripMenuItem FileSubMenu;
 		private System.Windows.Forms.ToolStripMenuItem SaveSessionMenuItem;
@@ -921,7 +891,6 @@
 		private System.Windows.Forms.ToolStripMenuItem ScriptSubMenu;
 		private System.Windows.Forms.ToolStripMenuItem EditScriptMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem ToggleScriptMenuItem;
-		public System.Windows.Forms.ColumnHeader Script;
 		private System.Windows.Forms.GroupBox groupBox1;
 		private System.Windows.Forms.ToolStripMenuItem NewSessionMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem SettingsSubMenu;
@@ -980,7 +949,6 @@
 		private System.Windows.Forms.ToolStripMenuItem DuplicateScriptMenuItem;
         private System.Windows.Forms.TextBox InputBox;
 				private System.Windows.Forms.SplitContainer splitContainer1;
-				private System.Windows.Forms.ImageList imageList1;
 				private System.Windows.Forms.ToolStripMenuItem ReturnAllIfNoneSelectedMenuItem;
 				private System.Windows.Forms.ToolStripMenuItem RemoveRegisteredFunctionsOnToggleMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem ReloadWhenScriptFileChangesMenuItem;
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index cd9c2229b8..9d17fb6518 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -13,11 +13,16 @@ using BizHawk.Client.EmuHawk.ToolExtensions;
 using BizHawk.Client.EmuHawk.WinFormExtensions;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
+using NLua;
 
 namespace BizHawk.Client.EmuHawk
 {
 	public partial class LuaConsole : ToolFormBase, IToolFormAutoConfig
 	{
+		private const string IconColumnName = "Icon";
+		private const string ScriptColumnName = "Script";
+		private const string PathColumnName = "PathName";
+
 		[RequiredService]
 		private IEmulator Emulator { get; set; }
 
@@ -33,14 +38,15 @@ namespace BizHawk.Client.EmuHawk
 		{
 			public LuaConsoleSettings()
 			{
-				Columns = new ToolDialogSettings.ColumnList
+				Columns = new List<RollColumn>
 				{
-					new ToolDialogSettings.Column { Name = "Script", Visible = true, Index = 0, Width = 92 },
-					new ToolDialogSettings.Column { Name = "PathName", Visible = true, Index = 0, Width = 195 }
+					new RollColumn { Name = IconColumnName, Text = " ", Visible = true, Width = 22, Type = ColumnType.Image },
+					new RollColumn { Name = ScriptColumnName, Text = "Script", Visible = true, Width = 92, Type = ColumnType.Text },
+					new RollColumn { Name = PathColumnName, Text = "Path", Visible = true, Width = 300, Type = ColumnType.Text }
 				};
 			}
 
-			public ToolDialogSettings.ColumnList Columns { get; set; }
+			public List<RollColumn> Columns { get; set; }
 		}
 
 		[ConfigPersist]
@@ -58,23 +64,20 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (AskSaveChanges())
 				{
-					SaveColumnInfo(LuaListView, Settings.Columns);
+					Settings.Columns = LuaListView.AllColumns;
+					
+					GlobalWin.DisplayManager.ClearLuaSurfaces();
 
-					if (GlobalWin.DisplayManager != null)
+					if (GlobalWin.DisplayManager.ClientExtraPadding != Padding.Empty)
 					{
-						GlobalWin.DisplayManager.ClearLuaSurfaces();
+						GlobalWin.DisplayManager.ClientExtraPadding = new Padding(0);
+						GlobalWin.MainForm.FrameBufferResized();
+					}
 
-						if (GlobalWin.DisplayManager.ClientExtraPadding != Padding.Empty)
-						{
-							GlobalWin.DisplayManager.ClientExtraPadding = new Padding(0);
-							GlobalWin.MainForm.FrameBufferResized();
-						}
-
-						if (GlobalWin.DisplayManager.GameExtraPadding != Padding.Empty)
-						{
-							GlobalWin.DisplayManager.GameExtraPadding = new Padding(0);
-							GlobalWin.MainForm.FrameBufferResized();
-						}
+					if (GlobalWin.DisplayManager.GameExtraPadding != Padding.Empty)
+					{
+						GlobalWin.DisplayManager.GameExtraPadding = new Padding(0);
+						GlobalWin.MainForm.FrameBufferResized();
 					}
 
 					LuaImp.GuiLibrary.DrawFinish();
@@ -88,9 +91,7 @@ namespace BizHawk.Client.EmuHawk
 
 			LuaListView.QueryItemText += LuaListView_QueryItemText;
 			LuaListView.QueryItemBkColor += LuaListView_QueryItemBkColor;
-			LuaListView.QueryItemImage += LuaListView_QueryItemImage;
-			LuaListView.QueryItemIndent += LuaListView_QueryItemIndent;
-			LuaListView.VirtualMode = true;
+			LuaListView.QueryItemIcon += LuaListView_QueryItemImage;
 
 			// this is bad, in case we ever have more than one gui part running lua.. not sure how much other badness there is like that
 			LuaSandbox.DefaultLogger = ConsoleLog;
@@ -100,15 +101,9 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool UpdateBefore => true;
 
-		private IEnumerable<LuaFile> SelectedItems
-		{
-			get { return LuaListView.SelectedIndices().Select(index => LuaImp.ScriptList[index]); }
-		}
+		private IEnumerable<LuaFile> SelectedItems =>  LuaListView.SelectedRows.Select(index => LuaImp.ScriptList[index]);
 
-		private IEnumerable<LuaFile> SelectedFiles
-		{
-			get { return SelectedItems.Where(x => !x.IsSeparator); }
-		}
+		private IEnumerable<LuaFile> SelectedFiles => SelectedItems.Where(x => !x.IsSeparator);
 
 		public void NewUpdate(ToolFormUpdateType type) { }
 
@@ -132,6 +127,12 @@ namespace BizHawk.Client.EmuHawk
 
 		private void LuaConsole_Load(object sender, EventArgs e)
 		{
+			// Hack for previous config settings
+			if (Settings.Columns.Any(c => c.Text == null))
+			{
+				Settings = new LuaConsoleSettings();
+			}
+
 			LuaImp.ScriptList.ChangedCallback = SessionChangedCallback;
 			LuaImp.ScriptList.LoadCallback = ClearOutputWindow;
 
@@ -147,7 +148,8 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			LoadColumnInfo(LuaListView, Settings.Columns);
+			LuaListView.AllColumns.Clear();
+			SetColumns();
 		}
 
 		public void Restart()
@@ -174,14 +176,7 @@ namespace BizHawk.Client.EmuHawk
 				{
 					LuaImp.CallExitEvent(file);
 
-					var functions = LuaImp.GetRegisteredFunctions()
-						.Where(lf => lf.Lua == file.Thread)
-						.ToList();
-
-					foreach (var function in functions)
-					{
-						LuaImp.GetRegisteredFunctions().Remove(function);
-					}
+					LuaImp.GetRegisteredFunctions().RemoveAll(lf => lf.Lua == file.Thread);
 
 					UpdateRegisteredFunctionsDialog();
 
@@ -190,7 +185,9 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			var currentScripts = LuaImp?.ScriptList; // Temp fix for now
-			LuaImp = new EmuLuaLibrary(Emulator.ServiceProvider);
+			LuaImp = OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows
+				? (PlatformEmuLuaLibrary)new EmuLuaLibrary(Emulator.ServiceProvider)
+				: (PlatformEmuLuaLibrary)new NotReallyLuaLibrary();
 			if (currentScripts != null)
 			{
 				LuaImp.ScriptList.AddRange(currentScripts);
@@ -225,10 +222,21 @@ namespace BizHawk.Client.EmuHawk
 
 		private readonly List<FileSystemWatcher> _watches = new List<FileSystemWatcher>();
 
+		private void SetColumns()
+		{
+			foreach (var column in Settings.Columns)
+			{
+				if (LuaListView.AllColumns[column.Name] == null)
+				{
+					LuaListView.AllColumns.Add(column);
+				}
+			}
+		}
+
 		private void AddFileWatches()
 		{
 			_watches.Clear();
-			foreach (var item in LuaImp.ScriptList)
+			foreach (var item in LuaImp.ScriptList.Where(s => !s.IsSeparator))
 			{
 				var processedPath = PathManager.TryMakeRelative(item.Path);
 				string pathToLoad = ProcessPath(processedPath);
@@ -271,7 +279,7 @@ namespace BizHawk.Client.EmuHawk
 				var luaFile = new LuaFile("", processedPath);
 
 				LuaImp.ScriptList.Add(luaFile);
-				LuaListView.ItemCount = LuaImp.ScriptList.Count;
+				LuaListView.RowCount = LuaImp.ScriptList.Count;
 				Global.Config.RecentLua.Add(processedPath);
 
 				if (!Global.Config.DisableLuaScriptsOnLoad)
@@ -305,7 +313,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void UpdateDialog()
 		{
-			LuaListView.ItemCount = LuaImp.ScriptList.Count;
+			LuaListView.RowCount = LuaImp.ScriptList.Count;
 			LuaListView.Refresh();
 			UpdateNumberOfScripts();
 			UpdateRegisteredFunctionsDialog();
@@ -313,7 +321,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void RunLuaScripts()
 		{
-			foreach (var file in LuaImp.ScriptList)
+			foreach (var file in LuaImp.ScriptList.Where(s => !s.IsSeparator))
 			{
 				if (!file.Enabled && file.Thread == null)
 				{
@@ -348,62 +356,62 @@ namespace BizHawk.Client.EmuHawk
 				Path.GetFileName(LuaImp.ScriptList.Filename);
 		}
 
-		private void LuaListView_QueryItemImage(int item, int subItem, out int imageIndex)
+		private void LuaListView_QueryItemImage(int index, RollColumn column, ref Bitmap bitmap, ref int offsetX, ref int offsetY)
 		{
-			imageIndex = -1;
-			if (subItem != 0)
+			if (column.Name != IconColumnName)
 			{
 				return;
 			}
 
-			if (LuaImp.ScriptList[item].Paused)
+			if (LuaImp.ScriptList[index].IsSeparator)
 			{
-				imageIndex = 2;
+				return;
 			}
-			else if (LuaImp.ScriptList[item].Enabled)
+
+			if (LuaImp.ScriptList[index].Paused)
 			{
-				imageIndex = 1;
+				bitmap = Properties.Resources.Pause;
+			}
+			else if (LuaImp.ScriptList[index].Enabled)
+			{
+				bitmap = Properties.Resources.ts_h_arrow_green;
 			}
 			else
 			{
-				imageIndex = 0;
+				bitmap = Properties.Resources.StopButton;
 			}
 		}
 
-		private void LuaListView_QueryItemIndent(int item, out int itemIndent)
+		private void LuaListView_QueryItemBkColor(int index, RollColumn column, ref Color color)
 		{
-			itemIndent = 0;
-		}
-
-		private void LuaListView_QueryItemBkColor(int index, int column, ref Color color)
-		{
-			if (column == 0)
+			if (LuaImp.ScriptList[index].IsSeparator)
 			{
-				if (LuaImp.ScriptList[index].IsSeparator)
-				{
-					color = BackColor;
-				}
-				else if (LuaImp.ScriptList[index].Enabled && !LuaImp.ScriptList[index].Paused)
-				{
-					color = Color.LightCyan;
-				}
-				else if (LuaImp.ScriptList[index].Enabled && LuaImp.ScriptList[index].Paused)
-				{
-					color = Color.LightPink;
-				}
+				color = BackColor;
+			}
+			else if (LuaImp.ScriptList[index].Enabled && !LuaImp.ScriptList[index].Paused)
+			{
+				color = Color.LightCyan;
+			}
+			else if (LuaImp.ScriptList[index].Enabled && LuaImp.ScriptList[index].Paused)
+			{
+				color = Color.LightPink;
 			}
-
-			UpdateNumberOfScripts();
 		}
 
-		private void LuaListView_QueryItemText(int index, int column, out string text)
+		private void LuaListView_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
 			text = "";
-			if (column == 0)
+
+			if (LuaImp.ScriptList[index].IsSeparator)
+			{
+				return;
+			}
+
+			if (column.Name == ScriptColumnName)
 			{
 				text = Path.GetFileNameWithoutExtension(LuaImp.ScriptList[index].Path); // TODO: how about allow the user to name scripts?
 			}
-			else if (column == 1)
+			else if (column.Name == PathColumnName)
 			{
 				text = DressUpRelative(LuaImp.ScriptList[index].Path);
 			}
@@ -445,9 +453,9 @@ namespace BizHawk.Client.EmuHawk
 		private void UpdateNumberOfScripts()
 		{
 			var message = "";
-			var total = SelectedFiles.Count();
-			var active = LuaImp.ScriptList.Count(file => file.Enabled);
-			var paused = LuaImp.ScriptList.Count(file => file.Enabled && file.Paused);
+			var total = LuaImp.ScriptList.Count(file => !file.IsSeparator);
+			var active = LuaImp.ScriptList.Count(file => !file.IsSeparator && file.Enabled);
+			var paused = LuaImp.ScriptList.Count(file => !file.IsSeparator && file.Enabled && file.Paused);
 
 			if (total == 1)
 			{
@@ -693,7 +701,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private static void UpdateRegisteredFunctionsDialog()
 		{
-			foreach (var form in Application.OpenForms.OfType<LuaRegisteredFunctionsList>().ToList())
+			foreach (var form in Application.OpenForms.OfType<LuaRegisteredFunctionsList>())
 			{
 				form.UpdateValues();
 			}
@@ -788,7 +796,7 @@ namespace BizHawk.Client.EmuHawk
 				DuplicateScriptMenuItem.Enabled =
 				MoveUpMenuItem.Enabled =
 				MoveDownMenuItem.Enabled =
-				LuaListView.SelectedIndices().Any();
+				LuaListView.SelectedRows.Any();
 
 			SelectAllMenuItem.Enabled = LuaImp.ScriptList.Any();
 			StopAllScriptsMenuItem.Enabled = LuaImp.ScriptList.Any(script => script.Enabled);
@@ -851,16 +859,10 @@ namespace BizHawk.Client.EmuHawk
 				{
 					LuaImp.CallExitEvent(file);
 
-					var items = SelectedItems.ToList();
-					foreach (var selectedItem in items)
+					foreach (var selectedItem in SelectedItems)
 					{
 						var temp = selectedItem;
-						var functions = LuaImp.GetRegisteredFunctions().Where(lf => lf.Lua == temp.Thread).ToList();
-						foreach (var function in functions)
-						{
-							LuaImp.GetRegisteredFunctions().Remove(function);
-						}
-
+						LuaImp.GetRegisteredFunctions().RemoveAll(lf => lf.Lua == temp.Thread);
 						UpdateRegisteredFunctionsDialog();
 					}
 
@@ -914,7 +916,10 @@ namespace BizHawk.Client.EmuHawk
 
 		private void PauseScriptMenuItem_Click(object sender, EventArgs e)
 		{
-			SelectedFiles.ToList().ForEach(x => x.TogglePause());
+			foreach (var x in SelectedFiles)
+			{
+				x.TogglePause();
+			}
 			UpdateDialog();
 		}
 
@@ -927,14 +932,14 @@ namespace BizHawk.Client.EmuHawk
 
 		private void EditScriptMenuItem_Click(object sender, EventArgs e)
 		{
-			SelectedFiles.ToList().ForEach(file =>
+			foreach (var file in SelectedFiles)
 			{
 				Process.Start(new ProcessStartInfo
 				{
 					Verb = "Open",
 					FileName = ProcessPath(file.Path)
 				});
-			});
+			}
 		}
 
 		private void RemoveScriptMenuItem_Click(object sender, EventArgs e)
@@ -945,11 +950,7 @@ namespace BizHawk.Client.EmuHawk
 				foreach (var item in items)
 				{
 					var temp = item;
-					var functions = LuaImp.GetRegisteredFunctions().Where(x => x.Lua == temp.Thread).ToList();
-					foreach (var function in functions)
-					{
-						LuaImp.GetRegisteredFunctions().Remove(function);
-					}
+					LuaImp.GetRegisteredFunctions().RemoveAll(x => x.Lua == temp.Thread);
 
 					LuaImp.ScriptList.Remove(item);
 				}
@@ -961,7 +962,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DuplicateScriptMenuItem_Click(object sender, EventArgs e)
 		{
-			if (LuaListView.SelectedIndices().Any())
+			if (LuaListView.SelectedRows.Any())
 			{
 				var script = SelectedFiles.First();
 
@@ -991,7 +992,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void InsertSeparatorMenuItem_Click(object sender, EventArgs e)
 		{
-			var indices = LuaListView.SelectedIndices().ToList();
+			var indices = LuaListView.SelectedRows.ToList();
 			if (indices.Any() && indices.Last() < LuaImp.ScriptList.Count)
 			{
 				LuaImp.ScriptList.Insert(indices.Last(), LuaFile.SeparatorInstance);
@@ -1006,7 +1007,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void MoveUpMenuItem_Click(object sender, EventArgs e)
 		{
-			var indices = LuaListView.SelectedIndices().ToList();
+			var indices = LuaListView.SelectedRows.ToList();
 			if (indices.Count == 0 || indices[0] == 0)
 			{
 				return;
@@ -1019,12 +1020,12 @@ namespace BizHawk.Client.EmuHawk
 				LuaImp.ScriptList.Insert(index - 1, file);
 			}
 
-			var newIndices = indices.Select(t => t - 1).ToList();
+			var newIndices = indices.Select(t => t - 1);
 
-			LuaListView.SelectedIndices.Clear();
+			LuaListView.DeselectAll();
 			foreach (var i in newIndices)
 			{
-				LuaListView.SelectItem(i, true);
+				LuaListView.SelectRow(i, true);
 			}
 
 			UpdateDialog();
@@ -1032,7 +1033,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void MoveDownMenuItem_Click(object sender, EventArgs e)
 		{
-			var indices = LuaListView.SelectedIndices().ToList();
+			var indices = LuaListView.SelectedRows.ToList();
 			if (indices.Count == 0 || indices.Last() == LuaImp.ScriptList.Count - 1)
 			{
 				return;
@@ -1045,12 +1046,12 @@ namespace BizHawk.Client.EmuHawk
 				LuaImp.ScriptList.Insert(indices[i] + 1, file);
 			}
 
-			var newIndices = indices.Select(t => t + 1).ToList();
+			var newIndices = indices.Select(t => t + 1);
 
-			LuaListView.SelectedIndices.Clear();
+			LuaListView.DeselectAll();
 			foreach (var i in newIndices)
 			{
-				LuaListView.SelectItem(i, true);
+				LuaListView.SelectRow(i, true);
 			}
 
 			UpdateDialog();
@@ -1295,11 +1296,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void LuaListView_ItemActivate(object sender, EventArgs e)
-		{
-			ToggleScriptMenuItem_Click(sender, e);
-		}
-
 		private void OutputBox_KeyDown(object sender, KeyEventArgs e)
 		{
 			if (e.KeyCode == Keys.F12 && !e.Control && !e.Alt && !e.Shift) // F12
@@ -1311,9 +1307,9 @@ namespace BizHawk.Client.EmuHawk
 		/// <summary>
 		/// Sorts the column Ascending on the first click and Descending on the second click.
 		/// </summary>
-		private void LuaListView_ColumnClick(object sender, ColumnClickEventArgs e)
+		private void LuaListView_ColumnClick(object sender, InputRoll.ColumnClickEventArgs e)
 		{
-			var columnToSort = LuaListView.Columns[e.Column].Text;
+			var columnToSort = e.Column.Name;
 			var luaListTemp = new List<LuaFile>();
 			if (columnToSort != _lastColumnSorted)
 			{
@@ -1453,5 +1449,28 @@ namespace BizHawk.Client.EmuHawk
 		}
 
 		#endregion
+
+		private void LuaListView_DoubleClick(object sender, EventArgs e)
+		{
+			var index = LuaListView.CurrentCell?.RowIndex;
+			if (index < LuaImp.ScriptList.Count)
+			{
+				var file = LuaImp.ScriptList[index.Value];
+				if (!file.IsSeparator)
+				{
+					file.Toggle();
+					UpdateDialog();
+				}
+			}
+		}
+
+		[RestoreDefaults]
+		private void RestoreDefaults()
+		{
+			Settings = new LuaConsoleSettings();
+			LuaListView.AllColumns.Clear();
+			SetColumns();
+			UpdateDialog();
+		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.resx b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.resx
index 7d82bb08eb..4b0fdcdf07 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.resx
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.resx
@@ -144,78 +144,6 @@
         S+GOLQu6U6BFjPvqKOP1AYw88WOoZif9DgmfLVtxaj1RSLdwNvrkPCA3M54KqxrnvRia9MKcGrUrqFOt
         5H7qKsqT1mGO9+Lqhc2ELdw+U/r0i+gVZ8hMiCDx3DHORwZyKnQ/hw/uYt9uCTskPvh6e7Fp41rWr/Fg
         g6eHO+A/lyD8ARfG3mk9fv1YAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>489, 17</value>
-  </metadata>
-  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABi
-        DgAAAk1TRnQBSQFMAgEBAwEAAVgBAAFYAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
-        AwABEAMAAQEBAAEgBgABECoAAWUBWwFdAeUBsgG0AdIB/wG7Ab4B1wH/AWYCXAHnMAABZQFdAVsB5QGy
-        AdIBtgH/AbsB1wG+Af8BZgJcAecwAAFnAlsB5QHSAb4BsgH/AdcBxQG7Af8BaQJcAedoAAFoAVkBbQH1
-        ATUBPAGXAf8BAQEMAYcB/wECAQwBhwH/AQABCwGHAf8BBwERAYgB/wEKARQBiQH/AWkBXgGEAfkgAAFo
-        AW0BWQH1ATUBlwFBAf8BAQGHARAB/wECAYcBEQH/AQABhwEOAf8BBwGIARUB/wEKAYkBGAH/AWkBhAFe
-        AfkgAAF+AWABWQH1AZcBVwE1Af8BhwEvAQEB/wGHATABAgH/AYcBLgEAAf8BiAEzAQcB/wGJATYBCgH/
-        AYsBaAFaAflcAAEwATgBmAH/AS0BNQGYAf8BsAGyAcsB/wHaAdsB2gH/AtEB1QH/AcsBzAHSAf8BxAHH
-        Ac4B/wFUAVoBpQH/AUcBRQFqAfkBJQEuAY8B/xgAASIBkgEuAf8BLQGYATkB/wGwAcsBswH/AdsC2gH/
-        AdEB1QHSAf8BywHSAcsB/wHFAc4BxAH/AVQBpQFdAf8BRwFqAUYB+QElAY8BMAH/GAABkgFIASIB/wGY
-        AVIBLQH/AcsBugGwAf8C2gHbAf8B1QHTAdEB/wHSAc0BywH/Ac4BxgHEAf8BpQFvAVQB/wGEAVwBQQH5
-        AY8BSAElAf9UAAJAAY0B/QFiAlgB4wL+Af0B/wH+Af0B9QH/AvcB8wH/Ae8C7gH/Au0B6wH/AdkC2wH/
-        AeMB5AHiAf8CwAHMAf8BZgFYAV0B7QFMAUkBeQH7EAABQAGNAUAB/QFiAlgB4wH/Af4C/wH+AfUB/QH/
-        AfcB8wH2Af8C7gHvAf8B7QHrAe0B/wLbAdkB/wHkAeIB4wH/AcABzAHCAf8BZgFdAVgB7QFMAXkBSwH7
-        EAABkwFGAUAB/QFkAlgB4wH+A/8B9QH7Af4B/wHzAfUB9wH/Ae4B7wHuAf8B6wHsAe0B/wHbAdkB2gH/
-        AuIB5AH/AcwBxQHAAf8BagFZAVcB7QGGAVkBQwH7TAABagFdAWwB8wFqAVkBYAHrBf8B/gH9F/8B/gH/
-        AfAB7wHwAf8BzwHQAdYB/wFjAVQBXQHtAWQBWAFiAe8IAAFqAWwBXQHzAWoBYAFZAesF/wH9Bv8B4wHw
-        AeMB/wGcAc0BnAr/Af4C/wHvAvAB/wHPAdYBzwH/AWMBXQFUAe0BZAFiAVgB7wgAAXsBXwFdAfMBbgFg
-        AVkB6wT/Af0X/wH+A/8C4wHgAf8BzwHJAccB/wFpAVgBUwHtAWwCWAHvSAABagFeAYkB+QP+Jf8B8AHy
-        AfAB/wLGAc0B/wFHAUEBagH5CAABagGJAV4B+RD/AdwB7QHcAf8BDQF1AQ0B/wGDAcEBgw3/AfIB8QHw
-        Af8BxwHOAcgB/wFHAWoBQQH5CAABjAFqAV4B+Qz/AeEBzQG+Af8BvgGSAY0B/wH3AfEB7wH/AfsB+AH3
-        Af8BwQGYAY8B/wHqAdoB0QX/AeUB4gHmAf8BzgHKAccB/wGAAVcBQQH5RAABbwFfAXAB8wFqAV0BYwHt
-        CP8C9QH7Af8BaQFlAdQB/wGhAZ8B5wH/AaMBoQHmAf8BogGhAeUB/wGUAZEB4QH/AZ4BnAHmBf8B+QH4
-        AfcB/wHnAeQB3gH/AVkBVwFqAfUBXQFZAYkB+wFvAXABXwHzAWoBYwFdAe0Q/wHkAfEB5AH/AQABcQEA
-        Af8BDQF3AQ0B/wGcAc4BnAn/AfkB9wH5Af8B5gHeAecB/wFZAWoBWQH1AV0BiQFZAfsBgAFoAV8B8wFx
-        Al0B7Qz/Aa4BcgFQAf8BVQIAAf8B+AH1AfIB/wH6AfcB9QH/AVUCAAH/AbMBdwFWBf8B8QH0AfUB/wHe
-        AeYB5wH/AXQBWQFUAfUBkQFfAVQB+0AAAYIBiAHKAf8B0AHSAe0J/wL1AfoB/wE3ATQBuwH/AWMBYAHe
-        Af8BYAFcAdgB/wFbAVcB0wH/AU8BSgHRAf8BogGhAekF/wL5AfgB/wH8AfsB6gH/AaMBpgG+Af8BPwFG
-        AaAB/wGCAcoBigH/AdAB7QHUEf8B4gHwAeIB/wEAAXIBAAH/AQABcgEAAf8BDQGEAQ0B/wGYAcwBmAX/
-        AfkB+AH5Af8B/AHqAfoB/wGjAb4BpQH/AT8BoAFKAf8BygGcAYIB/wHtAdsB0A3/AboBjAFmAf8BjQEe
-        AQAC/wL+Af8D/gH/AY0BHQEAAf8BuwGJAWQF/wHyAfQB9QH/AeoB9QH8Af8BvgGsAaMB/wGgAWABPwH/
-        QAABcAF2AcIB/wHlAeYB9An/AvcB+wH/AUYBQwHDAf8BcQFvAeMB/wFsAWkB3QH/AWcBZAHYAf8BWwFW
-        AdMB/wGrAakB6gX/A/kB/wH+AfsB7wH/AbQBtgHFAf8BPQFFAZ8B/wFwAcIBgQH/AeUB9AHnEf8B4gHw
-        AeIB/wEAAXQBAAH/AQABdgEAAf8BAAFuAQAB/wENAYQBDQH/AfoB/AH6Af8D+QH/Af4B7wH+Af8BtAHF
-        AbYB/wE9AZ8BSAH/AcIBkwFwAf8B9AHrAeUN/wG5AYwBZwH/AacBNAEHAf8B+wH5AfgB/wH7AfoB+QH/
-        AacBNAEHAf8BvQGMAWcF/wP0Af8B7wH6Af4B/wHFAboBtAH/AZ8BXgE9Af9AAAFsAXMBvQH/AtoB7wn/
-        AvcB+wH/AUoBRwHHAf8BdwF1AeoB/wFyAXEB4wH/AW8BbQHfAf8BYgFfAdoB/wGtAasB6wX/AvoB+AH/
-        Af0B/AHuAf8BnQGgAbsB/wFFAU0BowH/AWwBvQF0Af8B2gHvAd4R/wHiAfAB4gH/AQABdAEAAf8BAAFs
-        AQAB/wEoAY4BKAH/AeIB8AHiBf8B+gH4AfoB/wH9Ae4B+wH/AZ0BuwGhAf8BRQGjAU4B/wG9AY4BbAH/
-        Ae8B4wHaDf8BtwGIAWIB/wHEAUMBIAH/Av0B/AH/AfwB+gH5Af8BxgFGASIB/wHCAY8BbAX/AfIB9QH3
-        Af8B7gH3Af0B/wG7AagBnQH/AaMBZAFFAf9AAAFoAVgBYwHvAXMBZAFuAfEI/wL2AfsB/wFHAUMBxQH/
-        AXYBdQHrAf8BcgFxAeQB/wFwAW0B4QH/AWABXQHbAf8BqQGnAesF/wL7AfkB/wH7AfwB7gH/AU0BSgGB
-        AfsBZQFYAWIB7wFoAWMBWAHvAXMBbgFkAfEQ/wHiAfAB4gH/AQABagEAAf8BJAGHASQB/wHnAfMB5wn/
-        AfsB+QH7Af8B/AHuAfkB/wFNAYEBTAH7AWUBYgFYAe8BcgFiAVgB7wGAAWUBZAHxDP8BwQGXAXYB/wGk
-        AToBEgH/Af0B+wH6Af8B/AH6AfkB/wGTATUBCwH/AcwBqQGUBf8B9AH3AfkB/wHuAfUB/AH/AYoBWQFF
-        AfsBcAJYAe9EAAF3AYEBzwn/AvMB+QH/AUUBQgG5Af8BhwGGAdYB/wGHAYUB1QH/AYcBhQHVAf8BYQFe
-        AcgB/wFpAWgBzAb/Af4B/AH/As4B1wH/ATUBPQGYAf8IAAF3Ac8BjRH/AdMB6AHTAf8BIAGHASAB/wHi
-        AfAB4g3/Af4B/AL/Ac4B1wHQAf8BNQGYAT8B/wgAAc8BoQF3Kf8B+wP/AdcB0gHOAf8BmAFWATUB/0gA
-        AYIBagGQAfkBewFlAXQB8ST/AfwB+wH2Af8BMwE7AZYB/wFlAVgBWwHpCAABggGQAWoB+QF7AXQBbQHx
-        DP8B+gH8AfoB/wHvAfYB7xH/AfwB9gH8Af8BMwGWAT0B/wFlAVsBWAHpCAABngGBAWoB+QGCAW0BZQHx
-        JP8B9QH6AfwB/wGWAVQBMwH/AWoCWAHpTAACgwG4Af0BagFdAWIB6Rz/AfIB9QH4Af8CWQFqAfUBaQFZ
-        AW4B9RAAAYMBuAGIAf0BagFiAV0B6Rz/AfQB+AHyAf8BWQFqAVkB9QFpAW4BWQH1EAABugGdAXEB/QFs
-        AV8BXQHpHP8B+ALyAf8BdwFZAUsB9QGAAWABWQH1VAABdgFtAZsB+wGJAXcBmQH5AtMB9wH/AfEB8AH7
-        Af8B9gH3Av8B9wH4Af0B/wHkAecB8wH/AWUBWAFiAe8BbAFfAWwB8wFrAVkBYAHrGAABdgGbAXkB+wGJ
-        AZkBhAH5AdMB9wHaAf8B8AH7AfMB/wH2Af8B9wH/AfcB/QH4Af8B5AHzAeQB/wFlAWIBWAHvAmwBXwHz
-        AWsBYAFZAesYAAGjAYgBZgH7AaUBiwF0AfkB9wHjAdMB/wH7AfYB8AL/AfkB9gH/Af0B+QH3Af8B8wHo
-        AeQB/wFwAlgB7wF8Al8B8wFxAWABWQHrXAABbgFgAWIB6wGNAZMB1wH/AY4BlAHdAf8BjwGVAeAB/wGN
-        AZQB2wH/AZoBnwHaAf8BZgJcAeckAAFuAWIBYAHrAY0B1wGWAf8BjgHdAZgB/wGPAeABmQH/AY0B2wGW
-        Af8BmgHaAaIB/wFmAlwB5yQAAXMCYAHrAdcBqAGNAf8B3QGsAY4B/wHgAa0BjwH/AdsBqQGNAf8B2gGy
-        AZoB/wFpAlwB51QAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAH8AT8B/AE/
-        AfwBPwIAAfABDwHwAQ8B8AEPAgAB4AEHAeABBwHgAQcCAAHAAQMBwAEDAcABAwIAAYABAQGAAQEBgAEB
-        AgABgAEBAYABAQGAAQEqAAGAAQEBgAEBAYABAQIAAYABAQGAAQEBgAEBAgABwAEDAcABAwHAAQMCAAHg
-        AQcB4AEHAeABBwIAAfABHwHwAR8B8AEfAgAL
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs
index 4805891afc..9c559ab2a4 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.Designer.cs
@@ -34,7 +34,7 @@
 			this.FilterBox = new System.Windows.Forms.TextBox();
 			this.label1 = new System.Windows.Forms.Label();
 			this.ToWikiMarkupButton = new System.Windows.Forms.Button();
-			this.FunctionView = new BizHawk.Client.EmuHawk.VirtualListView();
+			this.FunctionView = new System.Windows.Forms.ListView();
 			this.LibraryReturn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.LibraryHead = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.LibraryName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -96,7 +96,6 @@
 			this.FunctionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.FunctionView.BlazingFast = false;
 			this.FunctionView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.LibraryReturn,
             this.LibraryHead,
@@ -105,11 +104,9 @@
             this.LibraryDescription});
 			this.FunctionView.FullRowSelect = true;
 			this.FunctionView.GridLines = true;
-			this.FunctionView.ItemCount = 0;
+			this.FunctionView.VirtualListSize = 0;
 			this.FunctionView.Location = new System.Drawing.Point(12, 12);
 			this.FunctionView.Name = "FunctionView";
-			this.FunctionView.SelectAllInProgress = false;
-			this.FunctionView.selectedItem = -1;
 			this.FunctionView.Size = new System.Drawing.Size(710, 291);
 			this.FunctionView.TabIndex = 1;
 			this.FunctionView.UseCompatibleStateImageBehavior = false;
@@ -170,7 +167,7 @@
 
 		private System.Windows.Forms.Button OK;
 		private System.DirectoryServices.DirectoryEntry directoryEntry1;
-		private VirtualListView FunctionView;
+		private System.Windows.Forms.ListView FunctionView;
 		private System.Windows.Forms.ColumnHeader LibraryHead;
 		private System.Windows.Forms.ColumnHeader LibraryReturn;
 		private System.Windows.Forms.ColumnHeader LibraryName;
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs
index 8a0aceb800..37965de304 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaFunctionsForm.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
 using BizHawk.Client.Common;
-using BizHawk.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -35,8 +33,7 @@ namespace BizHawk.Client.EmuHawk
 		public LuaFunctionsForm()
 		{
 			InitializeComponent();
-			FunctionView.QueryItemText += FunctionView_QueryItemText;
-			FunctionView.QueryItemBkColor += FunctionView_QueryItemBkColor;
+			FunctionView.RetrieveVirtualItem += FunctionView_QueryItemText;
 		}
 
 		private void LuaFunctionList_Load(object sender, EventArgs e)
@@ -51,42 +48,14 @@ namespace BizHawk.Client.EmuHawk
 			ToWikiMarkupButton.Visible = VersionInfo.DeveloperBuild;
 		}
 
-		private void FunctionView_QueryItemBkColor(int index, int column, ref Color color)
+		private void FunctionView_QueryItemText(object sender, RetrieveVirtualItemEventArgs e)
 		{
-		}
-
-		private void FunctionView_QueryItemText(int index, int column, out string text)
-		{
-			text = "";
-
-			try
-			{
-				if (_filteredList.Any() && index < _filteredList.Count)
-				{
-					switch (column)
-					{
-						case 0:
-							text = _filteredList[index].ReturnType;
-							break;
-						case 1:
-							text = _filteredList[index].Library;
-							break;
-						case 2:
-							text = _filteredList[index].Name;
-							break;
-						case 3:
-							text = _filteredList[index].ParameterList;
-							break;
-						case 4:
-							text = _filteredList[index].Description;
-							break;
-					}
-				}
-			}
-			catch
-			{
-				/* Eat it*/
-			}
+			var entry = _filteredList[e.ItemIndex];
+			e.Item = new ListViewItem(entry.ReturnType);
+			e.Item.SubItems.Add(entry.Library);
+			e.Item.SubItems.Add(entry.Name);
+			e.Item.SubItems.Add(entry.ParameterList);
+			e.Item.SubItems.Add(entry.Description);
 		}
 
 		private void OrderColumn(int column)
@@ -150,31 +119,24 @@ namespace BizHawk.Client.EmuHawk
 
 		private class Sorting
 		{
-			private bool _desc;
 			private int _column = 1;
 
 			public int Column
 			{
-				get
-				{
-					return _column;
-				}
+				get => _column;
 
 				set
 				{
 					if (_column == value)
 					{
-						_desc ^= true;
+						Descending ^= true;
 					}
 
 					_column = value;
 				}
 			}
 
-			public bool Descending
-			{
-				get { return _desc; }
-			}
+			public bool Descending { get; private set; }
 		}
 
 		private void FunctionView_KeyDown(object sender, KeyEventArgs e)
@@ -206,7 +168,12 @@ namespace BizHawk.Client.EmuHawk
 		//FREVBHFYL?
 		private void FunctionView_Copy(object sender, EventArgs e)
 		{
-			var itm = _filteredList[FunctionView.selectedItem];
+			if (FunctionView.SelectedIndices.Count == 0)
+			{
+				return;
+			}
+
+			var itm = _filteredList[FunctionView.SelectedIndices[0]];
 			var sb = new StringBuilder($"//{itm.Library}.{itm.Name}{itm.ParameterList}"); //comment style not an accident: the 'declaration' is not legal lua, so use of -- to comment it shouldn't suggest it. right?
 			if (itm.Example != null)
 			{
@@ -215,13 +182,15 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			if (sb.Length > 0)
+			{
 				Clipboard.SetText(sb.ToString());
+			}
 		}
 		
 		private void UpdateList()
 		{
 			GenerateFilteredList();
-			FunctionView.ItemCount = _filteredList.Count;
+			FunctionView.VirtualListSize = _filteredList.Count;
 		}
 
 		private void FilterBox_KeyUp(object sender, KeyEventArgs e)
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
index 6c8bf524d5..be641ceccb 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
@@ -332,8 +332,8 @@ namespace BizHawk.Client.EmuHawk
 			var f = new StringFormat(StringFormat.GenericDefault);
 			var font = new Font(family, fontsize ?? 12, fstyle, GraphicsUnit.Pixel);
 			var boxBackground = Graphics.FromImage(Image);
-			
-		Size sizeOfText = boxBackground.MeasureString(message, font, 0, f).ToSize();
+
+			Size sizeOfText = boxBackground.MeasureString(message, font, 0, f).ToSize();
 
 			if (horizalign != null)
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
index 194c940646..b6c838e4c0 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs
@@ -46,7 +46,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			FunctionView.Items.Clear();
 			
-			var nlfs = GlobalWin.Tools.LuaConsole.LuaImp.GetRegisteredFunctions().OrderBy(x => x.Event).ThenBy(x => x.Name).ToList();
+			var nlfs = GlobalWin.Tools.LuaConsole.LuaImp.GetRegisteredFunctions().OrderBy(x => x.Event).ThenBy(x => x.Name);
 			foreach (var nlf in nlfs)
 			{
 				var item = new ListViewItem { Text = nlf.Event };
diff --git a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
index 3a0dc74500..8216a3666b 100644
--- a/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
+++ b/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml.Linq;
 
@@ -18,7 +16,7 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class MultiDiskBundler : Form, IToolFormAutoConfig
 	{
-		private XElement _currentXml = null;
+		private XElement _currentXml;
 
 		[RequiredService]
 		public IEmulator Emulator { get; set; }
@@ -35,7 +33,6 @@ namespace BizHawk.Client.EmuHawk
 
 			if (!Global.Game.IsNullInstance &&  !GlobalWin.MainForm.CurrentlyOpenRom.EndsWith(".xml"))
 			{
-				string currentRom = GlobalWin.MainForm.CurrentlyOpenRom;
 				if (GlobalWin.MainForm.CurrentlyOpenRom.Contains("|"))
 				{
 					var pieces = GlobalWin.MainForm.CurrentlyOpenRom.Split('|');
@@ -50,12 +47,12 @@ namespace BizHawk.Client.EmuHawk
 					NameBox.Text = Path.ChangeExtension(GlobalWin.MainForm.CurrentlyOpenRom, ".xml");
 				}
 
-				 if (SystemDropDown.Items.Contains(Emulator.SystemId))
-				 {
-					 SystemDropDown.SelectedItem = Emulator.SystemId;
-				 }
+				if (SystemDropDown.Items.Contains(Emulator.SystemId))
+				{
+					SystemDropDown.SelectedItem = Emulator.SystemId;
+				}
 
-				 FileSelectors.First().SetName(GlobalWin.MainForm.CurrentlyOpenRom);
+				FileSelectors.First().SetName(GlobalWin.MainForm.CurrentlyOpenRom);
 			}
 		}
 
@@ -83,10 +80,7 @@ namespace BizHawk.Client.EmuHawk
 			return true;
 		}
 
-		public bool UpdateBefore
-		{
-			get { return true; }
-		}
+		public bool UpdateBefore => true;
 
 		#endregion
 
@@ -115,8 +109,8 @@ namespace BizHawk.Client.EmuHawk
 				DialogResult = DialogResult.OK;
 				Close();
 
-                var lra = new MainForm.LoadRomArgs { OpenAdvanced = new OpenAdvanced_OpenRom { Path = fileInfo.FullName } };
-                GlobalWin.MainForm.LoadRom(fileInfo.FullName, lra);
+				var lra = new MainForm.LoadRomArgs { OpenAdvanced = new OpenAdvanced_OpenRom { Path = fileInfo.FullName } };
+				GlobalWin.MainForm.LoadRom(fileInfo.FullName, lra);
 			}
 		}
 
@@ -132,18 +126,18 @@ namespace BizHawk.Client.EmuHawk
 				Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top
 			};
 
-            var mdf = new MultiDiskFileSelector
-            {
-                Location = UIHelper.Scale(new Point(7, 12)),
-                Width = groupBox.ClientSize.Width - UIHelper.ScaleX(13),
-                Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top                
+			var mdf = new MultiDiskFileSelector
+			{
+				Location = UIHelper.Scale(new Point(7, 12)),
+				Width = groupBox.ClientSize.Width - UIHelper.ScaleX(13),
+				Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top
 			};
 
 			mdf.NameChanged += FileSelector_NameChanged;
-            mdf.SystemString = SystemDropDown.SelectedText;
+			mdf.SystemString = SystemDropDown.SelectedText;
 
 
-            groupBox.Controls.Add(mdf);
+			groupBox.Controls.Add(mdf);
 
 			FileSelectorPanel.Controls.Add(groupBox);
 		}
@@ -186,9 +180,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			try
 			{
-				var fileSelectors = FileSelectors.ToList();
-
-				var names = fileSelectors.Select(f => f.GetName());
+				var names = FileSelectors.Select(f => f.GetName());
 
 				var name = NameBox.Text;
 
@@ -238,11 +230,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private static string ConvertToTag(string name)
-		{
-			return new Regex("[^A-Za-z0-9]").Replace(name, "");
-		}
-
 		private void NameBox_TextChanged(object sender, EventArgs e)
 		{
 			Recalculate();
diff --git a/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs b/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs
index 6b4e0d07f4..5b5e514046 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/BarcodeEntry.cs
@@ -1,14 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using BizHawk.Emulation.Cores.Nintendo.NES;
-using BizHawk.Common;
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
@@ -16,7 +8,7 @@ namespace BizHawk.Client.EmuHawk
 	public partial class BarcodeEntry : Form, IToolForm
 	{
 		[RequiredService]
-		private DatachBarcode reader { get; set; }
+		private DatachBarcode Reader { get; set; }
 
 		public BarcodeEntry()
 		{
@@ -45,17 +37,13 @@ namespace BizHawk.Client.EmuHawk
 			return true;
 		}
 
-		public bool UpdateBefore
-		{
-			get { return false; }
-		}
+		public bool UpdateBefore => false;
 
 		#endregion
 
 		private void textBox1_TextChanged(object sender, EventArgs e)
 		{
-			string why;
-			if (!DatachBarcode.ValidString(textBox1.Text, out why))
+			if (!DatachBarcode.ValidString(textBox1.Text, out var why))
 			{
 				label3.Text = $"Invalid: {why}";
 				label3.Visible = true;
@@ -70,7 +58,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void button1_Click(object sender, EventArgs e)
 		{
-			reader.Transfer(textBox1.Text);
+			Reader.Transfer(textBox1.Text);
 		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
index 0b6912c602..516456a7f3 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
@@ -41,12 +41,9 @@ namespace BizHawk.Client.EmuHawk
 		private int? _value;
 		private int? _compare;
 
-		public int? Address { get { return _address; } }
-		public int? Value { get { return _value; } }
-		public int? Compare { get { return _compare; } }
-
 		public bool AskSaveChanges() { return true; }
-		public bool UpdateBefore { get { return false; } }
+		public bool UpdateBefore => false;
+
 		public void Restart()
 		{
 			if (Emulator.SystemId != "NES")
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs b/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
index 2c0cfcb7ed..e5c2a12963 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
@@ -1,15 +1,9 @@
 using System;
-using System.Xml;
 using System.Xml.XPath;
 using System.Xml.Linq;
-using System.Linq;
 using System.IO;
-using System.Text;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Windows.Forms;
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Nintendo.NES;
 using BizHawk.Emulation.Common;
 
@@ -27,7 +21,7 @@ namespace BizHawk.Client.EmuHawk
 		}
 
 		public bool AskSaveChanges() { return true; }
-		public bool UpdateBefore { get { return true; } }
+		public bool UpdateBefore => true;
 
 		public void Restart()
 		{
@@ -48,12 +42,12 @@ namespace BizHawk.Client.EmuHawk
 
 		//http://www.phy.mtu.edu/~suits/notefreqs.html
 		//begins at C0. ends at B8
-		static readonly float[] freqtbl = new[] {0,
+		static readonly float[] freqtbl = {0,
 			16.35f,17.32f,18.35f,19.45f,20.6f,21.83f,23.12f,24.5f,25.96f,27.5f,29.14f,30.87f,32.7f,34.65f,36.71f,38.89f,41.2f,43.65f,46.25f,49f,51.91f,55f,58.27f,61.74f,65.41f,69.3f,73.42f,77.78f,82.41f,87.31f,92.5f,98f,103.83f,110f,116.54f,123.47f,130.81f,138.59f,146.83f,155.56f,164.81f,174.61f,185f,196f,207.65f,220f,233.08f,246.94f,261.63f,277.18f,293.66f,311.13f,329.63f,349.23f,369.99f,392f,415.3f,440f,466.16f,493.88f,523.25f,554.37f,587.33f,622.25f,659.25f,698.46f,739.99f,783.99f,830.61f,880f,932.33f,987.77f,1046.5f,1108.73f,1174.66f,1244.51f,1318.51f,1396.91f,1479.98f,1567.98f,1661.22f,1760f,1864.66f,1975.53f,2093f,2217.46f,2349.32f,2489.02f,2637.02f,2793.83f,2959.96f,3135.96f,3322.44f,3520f,3729.31f,3951.07f,4186.01f,4434.92f,4698.63f,4978.03f,5274.04f,5587.65f,5919.91f,6271.93f,6644.88f,7040f,7458.62f,7902.13f,
 			1000000
 		};
 
-		static readonly string[] noteNames = new[] { "C-", "C#", "D-", "D#", "E-", "F-", "F#", "G-", "G#", "A-", "A#", "B-" };
+		static readonly string[] noteNames = { "C-", "C#", "D-", "D#", "E-", "F-", "F#", "G-", "G#", "A-", "A#", "B-" };
 
 		string NameForNote(int note)
 		{
@@ -115,8 +109,10 @@ namespace BizHawk.Client.EmuHawk
 		private void btnExport_Click(object sender, EventArgs e)
 		{
 			//acquire target
-			var sfd = new SaveFileDialog();
-			sfd.Filter = "XRNS (*.xrns)|*.xrns";
+			var sfd = new SaveFileDialog
+			{
+				Filter = "XRNS (*.xrns)|*.xrns"
+			};
 			if (sfd.ShowDialog() != System.Windows.Forms.DialogResult.OK)
 				return;
 
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs
index 1856b0206a..2f8d37f9fd 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Nintendo.NES;
 using BizHawk.Emulation.Common;
 
@@ -21,8 +19,8 @@ namespace BizHawk.Client.EmuHawk
 		[ConfigPersist]
 		private int RefreshRateConfig
 		{
-			get { return RefreshRate.Value; }
-			set { RefreshRate.Value = value; }
+			get => RefreshRate.Value;
+			set => RefreshRate.Value = value;
 		}
 
 		int scanline;
@@ -40,7 +38,7 @@ namespace BizHawk.Client.EmuHawk
 		#region Public API
 
 		public bool AskSaveChanges() { return true; }
-		public bool UpdateBefore { get { return true; } }
+		public bool UpdateBefore => true;
 
 		public void Restart()
 		{
@@ -238,10 +236,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void NESNameTableViewer_FormClosed(object sender, FormClosedEventArgs e)
 		{
-			if (_ppu != null)
-			{
-				_ppu.RemoveCallback1();
-			}
+			_ppu?.RemoveCallback1();
 		}
 
 		private void ScanlineTextbox_TextChanged(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs b/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs
index e4238baa17..ec28b1c2cd 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.Linq;
 using System.Windows.Forms;
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Nintendo.NES;
 using BizHawk.Emulation.Common;
-using System.Collections.Generic;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -33,15 +30,15 @@ namespace BizHawk.Client.EmuHawk
 		[ConfigPersist]
 		private int RefreshRateConfig
 		{
-			get { return RefreshRate.Value; }
-			set { RefreshRate.Value = value; }
+			get => RefreshRate.Value;
+			set => RefreshRate.Value = value;
 		}
 
-		private bool _chrromview = false;
+		private bool _chrromview;
 		[ConfigPersist]
 		private bool ChrRomView
 		{
-			get { return _chrromview; }
+			get => _chrromview;
 			set { _chrromview = value; CalculateFormSize(); }
 		}
 
@@ -61,7 +58,7 @@ namespace BizHawk.Client.EmuHawk
 		#region Public API
 
 		public bool AskSaveChanges() { return true; }
-		public bool UpdateBefore { get { return true; } }
+		public bool UpdateBefore => true;
 
 		public void NewUpdate(ToolFormUpdateType type) { }
 		public void UpdateValues()
@@ -790,16 +787,13 @@ namespace BizHawk.Client.EmuHawk
 
 		private void NesPPU_FormClosed(object sender, FormClosedEventArgs e)
 		{
-			if (_ppu != null)
-			{
-				_ppu.RemoveCallback2();
-			}
+			_ppu?.RemoveCallback2();
 		}
 
 		#endregion
 
 		MemoryDomain CHRROM;
-		byte[] chrromcache = new byte[8192];
+		readonly byte[] chrromcache = new byte[8192];
 
 		private void cHRROMTileViewerToolStripMenuItem_Click(object sender, EventArgs e)
 		{
diff --git a/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs
index 12f7a126db..0f8b22c0a7 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs
@@ -12,12 +12,9 @@ namespace BizHawk.Client.EmuHawk
 	{
 		public class Palette
 		{
-			public int Address { get; private set; }
+			public int Address { get; }
 			public int Value { get; set; }
-			public Color Color
-			{
-				get { return Color.FromArgb(Value); }
-			}
+			public Color Color => Color.FromArgb(Value);
 
 			public Palette(int address)
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs
index 3ca6f07d52..fe7d3aaea5 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/SpriteViewer.cs
@@ -29,10 +29,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void Display(Graphics g)
 		{
-			unchecked
-			{
-				g.DrawImage(sprites, 1, 1);
-			}
+			g.DrawImage(sprites, 1, 1);
 		}
 
 		private void SpriteViewer_Paint(object sender, PaintEventArgs e)
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs
index 10e69b4186..ad8ebbfc67 100644
--- a/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs
+++ b/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
@@ -16,14 +15,8 @@ namespace BizHawk.Client.EmuHawk
 		[ConfigPersist]
 		private int RefreshRateConfig
 		{
-			get
-			{
-				return RefreshRate.Value;
-			}
-			set
-			{
-				RefreshRate.Value = Math.Max(Math.Min(value, RefreshRate.Maximum), RefreshRate.Minimum);
-			}
+			get => RefreshRate.Value;
+			set => RefreshRate.Value = Math.Max(Math.Min(value, RefreshRate.Maximum), RefreshRate.Minimum);
 		}
 
 		private int _vdcType;
@@ -41,7 +34,7 @@ namespace BizHawk.Client.EmuHawk
 		#region Public API
 
 		public bool AskSaveChanges() { return true; }
-		public bool UpdateBefore { get { return true; } }
+		public bool UpdateBefore => true;
 
 		public unsafe void Generate()
 		{
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs
index b32faac779..95032064a9 100644
--- a/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs
+++ b/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs
@@ -1,18 +1,10 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 using BizHawk.Common.BufferExtensions;
-using BizHawk.Client.Common;
-
 using BizHawk.Emulation.Cores.PCEngine;
-using BizHawk.Emulation.Common.Components;
 using BizHawk.Emulation.Common;
 
 using ICSharpCode.SharpZipLib.Zip;
@@ -33,7 +25,7 @@ namespace BizHawk.Client.EmuHawk
 			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
 		}
 
-		byte[] waveformTemp = new byte[32 * 2];
+		readonly byte[] waveformTemp = new byte[32 * 2];
 
 		protected override void OnShown(EventArgs e)
 		{
@@ -161,9 +153,9 @@ namespace BizHawk.Client.EmuHawk
 			public short[] waveform;
 		}
 
-		PSGEntry[] LastSamples = new PSGEntry[8];
-		List<PSGEntry> PSGEntries = new List<PSGEntry>();
-		Dictionary<string, PSGEntry> PSGEntryTable = new Dictionary<string, PSGEntry>();
+		readonly PSGEntry[] LastSamples = new PSGEntry[8];
+		readonly List<PSGEntry> PSGEntries = new List<PSGEntry>();
+		readonly Dictionary<string, PSGEntry> PSGEntryTable = new Dictionary<string, PSGEntry>();
 
 		public void Restart()
 		{
@@ -174,14 +166,11 @@ namespace BizHawk.Client.EmuHawk
 			return true;
 		}
 
-		public bool UpdateBefore
-		{
-			get { return false; }
-		}
+		public bool UpdateBefore => false;
 
 
 		//32*16 samples, 16bit, mono, 8khz (but we'll change the sample rate)
-		static readonly byte[] emptyWav = new byte[] {
+		static readonly byte[] emptyWav = {
 			0x52, 0x49, 0x46, 0x46, 0x24, 0x04, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6D, 0x74, 0x20, 
 			0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0xE0, 0x2E, 0x00, 0x00, 0xC0, 0x5D, 0x00, 0x00, 
 			0x02, 0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61, 0x00, 0x04, 0x00, 0x00, 
diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
index 2a94623389..53f00f7edb 100644
--- a/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
+++ b/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Cores.PCEngine;
@@ -50,7 +48,7 @@ namespace BizHawk.Client.EmuHawk
 			// Do nothing
 		}
 
-		unsafe static void Draw16x16(byte* src, int* dest, int pitch, int* pal)
+		static unsafe void Draw16x16(byte* src, int* dest, int pitch, int* pal)
 		{
 			int inc = pitch - 16;
 			dest -= inc;
@@ -62,7 +60,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		unsafe static void Draw8x8(byte* src, int* dest, int pitch, int* pal)
+		static unsafe void Draw8x8(byte* src, int* dest, int pitch, int* pal)
 		{
 			int inc = pitch - 8;
 			dest -= inc;
@@ -125,7 +123,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		unsafe static void DrawPalette(Bitmap bmp, int* pal)
+		static unsafe void DrawPalette(Bitmap bmp, int* pal)
 		{
 			var lockdata = bmp.LockBits(new Rectangle(0, 0, 256, 256), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
 
@@ -165,10 +163,7 @@ namespace BizHawk.Client.EmuHawk
 			return true;
 		}
 
-		public bool UpdateBefore
-		{
-			get { return true; }
-		}
+		public bool UpdateBefore => true;
 
 		#endregion
 
diff --git a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
index 760bb758b5..847ae7f61d 100644
--- a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
+++ b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
@@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk
 	{
 		[RequiredService]
 		private SMS sms { get; set; }
-		private VDP vdp { get { return sms.Vdp; } }
+		private VDP vdp => sms.Vdp;
 
 		int palindex = 0;
 
@@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk
 			bmpViewBG.ChangeBitmapSize(256, 256);
 		}
 
-		unsafe static void Draw8x8(byte* src, int* dest, int pitch, int* pal)
+		static unsafe void Draw8x8(byte* src, int* dest, int pitch, int* pal)
 		{
 			int inc = pitch - 8;
 			dest -= inc;
@@ -43,7 +43,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		unsafe static void Draw8x8hv(byte* src, int* dest, int pitch, int* pal, bool hflip, bool vflip)
+		static unsafe void Draw8x8hv(byte* src, int* dest, int pitch, int* pal, bool hflip, bool vflip)
 		{
 			int incx = hflip ? -1 : 1;
 			int incy = vflip ? -pitch : pitch;
@@ -169,10 +169,7 @@ namespace BizHawk.Client.EmuHawk
 			return true;
 		}
 
-		public bool UpdateBefore
-		{
-			get { return true; }
-		}
+		public bool UpdateBefore => true;
 
 		private void bmpViewPalette_MouseClick(object sender, MouseEventArgs e)
 		{
diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs
index 4b703e762c..7c6535b182 100644
--- a/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs
+++ b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs
@@ -40,9 +40,9 @@ namespace BizHawk.Client.EmuHawk
 {
 	public unsafe partial class SNESGraphicsDebugger : Form, IToolFormAutoConfig
 	{
-		List<DisplayTypeItem> displayTypeItems = new List<DisplayTypeItem>();
+		readonly List<DisplayTypeItem> displayTypeItems = new List<DisplayTypeItem>();
 
-		public bool UpdateBefore { get { return false; } }
+		public bool UpdateBefore => false;
 		public bool AskSaveChanges() { return true; }
 
 		[RequiredService]
@@ -51,8 +51,8 @@ namespace BizHawk.Client.EmuHawk
 		[ConfigPersist]
 		public bool UseUserBackdropColor
 		{
-			get { return checkBackdropColor.Checked; }
-			set { checkBackdropColor.Checked = value; }
+			get => checkBackdropColor.Checked;
+			set => checkBackdropColor.Checked = value;
 		}
 		[ConfigPersist]
 		public int UserBackdropColor { get; set; }
@@ -116,8 +116,7 @@ namespace BizHawk.Client.EmuHawk
 		protected override void OnClosed(EventArgs e)
 		{
 			base.OnClosed(e);
-			if (currentSnesCore != null)
-				currentSnesCore.ScanlineHookManager.Unregister(this);
+			currentSnesCore?.ScanlineHookManager.Unregister(this);
 			currentSnesCore = null;
 		}
 
@@ -224,7 +223,7 @@ namespace BizHawk.Client.EmuHawk
 
 		void RegenerateData()
 		{
-			if (gd != null) gd.Dispose();
+			gd?.Dispose();
 			gd = null;
 			if (currentSnesCore == null) return;
 			gd = NewDecoder();
@@ -345,7 +344,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		eDisplayType CurrDisplaySelection { get { return (comboDisplayType.SelectedValue as eDisplayType?).Value; } }
+		eDisplayType CurrDisplaySelection => (comboDisplayType.SelectedValue as eDisplayType?).Value;
 
 		//todo - something smarter to cycle through bitmaps without repeatedly trashing them (use the dispose callback on the viewer)
 		private void RenderView()
@@ -527,8 +526,8 @@ namespace BizHawk.Client.EmuHawk
 
 		class PaletteTypeItem
 		{
-			public SnesColors.ColorType Type { get; private set; }
-			public string Descr { get; private set; }
+			public SnesColors.ColorType Type { get; }
+			public string Descr { get; }
 			public PaletteTypeItem(string descr, SnesColors.ColorType type)
 			{
 				Type = type;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
index bacdef1f33..da6880ddde 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.Designer.cs
@@ -54,9 +54,6 @@
 			// 
 			// BookmarksBranchesGroupBox
 			// 
-			this.BookmarksBranchesGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
 			this.BookmarksBranchesGroupBox.Controls.Add(this.UndoBranchButton);
 			this.BookmarksBranchesGroupBox.Controls.Add(this.JumpToBranchButton);
 			this.BookmarksBranchesGroupBox.Controls.Add(this.UpdateBranchButton);
@@ -64,7 +61,8 @@
 			this.BookmarksBranchesGroupBox.Controls.Add(this.AddBranchButton);
 			this.BookmarksBranchesGroupBox.Controls.Add(this.LoadBranchButton);
 			this.BookmarksBranchesGroupBox.Controls.Add(this.BranchView);
-			this.BookmarksBranchesGroupBox.Location = new System.Drawing.Point(3, 0);
+			this.BookmarksBranchesGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.BookmarksBranchesGroupBox.Location = new System.Drawing.Point(0, 0);
 			this.BookmarksBranchesGroupBox.Name = "BookmarksBranchesGroupBox";
 			this.BookmarksBranchesGroupBox.Size = new System.Drawing.Size(198, 278);
 			this.BookmarksBranchesGroupBox.TabIndex = 0;
@@ -76,10 +74,10 @@
 			this.UndoBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.UndoBranchButton.Enabled = false;
 			this.UndoBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
-			this.UndoBranchButton.Location = new System.Drawing.Point(159, 249);
+			this.UndoBranchButton.Location = new System.Drawing.Point(156, 247);
 			this.UndoBranchButton.Name = "UndoBranchButton";
-			this.UndoBranchButton.Size = new System.Drawing.Size(23, 23);
-			this.UndoBranchButton.TabIndex = 10;
+			this.UndoBranchButton.Size = new System.Drawing.Size(24, 24);
+			this.UndoBranchButton.TabIndex = 6;
 			this.UndoBranchButton.UseVisualStyleBackColor = true;
 			this.UndoBranchButton.Click += new System.EventHandler(this.UndoBranchToolStripMenuItem_Click);
 			// 
@@ -88,10 +86,10 @@
 			this.JumpToBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.JumpToBranchButton.Enabled = false;
 			this.JumpToBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo;
-			this.JumpToBranchButton.Location = new System.Drawing.Point(130, 249);
+			this.JumpToBranchButton.Location = new System.Drawing.Point(126, 247);
 			this.JumpToBranchButton.Name = "JumpToBranchButton";
-			this.JumpToBranchButton.Size = new System.Drawing.Size(23, 23);
-			this.JumpToBranchButton.TabIndex = 9;
+			this.JumpToBranchButton.Size = new System.Drawing.Size(24, 24);
+			this.JumpToBranchButton.TabIndex = 5;
 			this.toolTip1.SetToolTip(this.JumpToBranchButton, "Jump To Branch Frame");
 			this.JumpToBranchButton.UseVisualStyleBackColor = true;
 			this.JumpToBranchButton.Click += new System.EventHandler(this.JumpToBranchToolStripMenuItem_Click);
@@ -101,9 +99,9 @@
 			this.UpdateBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.UpdateBranchButton.Enabled = false;
 			this.UpdateBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
-			this.UpdateBranchButton.Location = new System.Drawing.Point(99, 249);
+			this.UpdateBranchButton.Location = new System.Drawing.Point(96, 247);
 			this.UpdateBranchButton.Name = "UpdateBranchButton";
-			this.UpdateBranchButton.Size = new System.Drawing.Size(25, 23);
+			this.UpdateBranchButton.Size = new System.Drawing.Size(24, 24);
 			this.UpdateBranchButton.TabIndex = 4;
 			this.toolTip1.SetToolTip(this.UpdateBranchButton, "Update Branch");
 			this.UpdateBranchButton.UseVisualStyleBackColor = true;
@@ -113,10 +111,10 @@
 			// 
 			this.AddWithTextBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.AddWithTextBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit;
-			this.AddWithTextBranchButton.Location = new System.Drawing.Point(37, 249);
+			this.AddWithTextBranchButton.Location = new System.Drawing.Point(36, 247);
 			this.AddWithTextBranchButton.Name = "AddWithTextBranchButton";
-			this.AddWithTextBranchButton.Size = new System.Drawing.Size(25, 23);
-			this.AddWithTextBranchButton.TabIndex = 3;
+			this.AddWithTextBranchButton.Size = new System.Drawing.Size(24, 24);
+			this.AddWithTextBranchButton.TabIndex = 2;
 			this.toolTip1.SetToolTip(this.AddWithTextBranchButton, "Add Branch with Text");
 			this.AddWithTextBranchButton.UseVisualStyleBackColor = true;
 			this.AddWithTextBranchButton.Click += new System.EventHandler(this.AddBranchWithTexToolStripMenuItem_Click);
@@ -125,10 +123,10 @@
 			// 
 			this.AddBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.AddBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
-			this.AddBranchButton.Location = new System.Drawing.Point(6, 249);
+			this.AddBranchButton.Location = new System.Drawing.Point(6, 247);
 			this.AddBranchButton.Name = "AddBranchButton";
-			this.AddBranchButton.Size = new System.Drawing.Size(25, 23);
-			this.AddBranchButton.TabIndex = 2;
+			this.AddBranchButton.Size = new System.Drawing.Size(24, 24);
+			this.AddBranchButton.TabIndex = 1;
 			this.toolTip1.SetToolTip(this.AddBranchButton, "Add Branch");
 			this.AddBranchButton.UseVisualStyleBackColor = true;
 			this.AddBranchButton.Click += new System.EventHandler(this.AddBranchToolStripMenuItem_Click);
@@ -138,10 +136,10 @@
 			this.LoadBranchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.LoadBranchButton.Enabled = false;
 			this.LoadBranchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Debugger;
-			this.LoadBranchButton.Location = new System.Drawing.Point(68, 249);
+			this.LoadBranchButton.Location = new System.Drawing.Point(66, 247);
 			this.LoadBranchButton.Name = "LoadBranchButton";
-			this.LoadBranchButton.Size = new System.Drawing.Size(25, 23);
-			this.LoadBranchButton.TabIndex = 1;
+			this.LoadBranchButton.Size = new System.Drawing.Size(24, 24);
+			this.LoadBranchButton.TabIndex = 3;
 			this.toolTip1.SetToolTip(this.LoadBranchButton, "Load Branch");
 			this.LoadBranchButton.UseVisualStyleBackColor = true;
 			this.LoadBranchButton.Click += new System.EventHandler(this.LoadBranchToolStripMenuItem_Click);
@@ -150,7 +148,7 @@
 			// 
 			this.BranchView.AllowColumnReorder = false;
 			this.BranchView.AllowColumnResize = false;
-			this.BranchView.AllowRightClickSelecton = true;
+			this.BranchView.AllowRightClickSelection = true;
 			this.BranchView.AlwaysScroll = false;
 			this.BranchView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
@@ -193,14 +191,14 @@
             this.toolStripSeparator2,
             this.RemoveBranchContextMenuItem});
 			this.BranchesContextMenu.Name = "BranchesContextMenu";
-			this.BranchesContextMenu.Size = new System.Drawing.Size(153, 208);
+			this.BranchesContextMenu.Size = new System.Drawing.Size(147, 186);
 			this.BranchesContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.BranchesContextMenu_Opening);
 			// 
 			// AddBranchContextMenu
 			// 
 			this.AddBranchContextMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
 			this.AddBranchContextMenu.Name = "AddBranchContextMenu";
-			this.AddBranchContextMenu.Size = new System.Drawing.Size(152, 22);
+			this.AddBranchContextMenu.Size = new System.Drawing.Size(146, 22);
 			this.AddBranchContextMenu.Text = "Add";
 			this.AddBranchContextMenu.Click += new System.EventHandler(this.AddBranchToolStripMenuItem_Click);
 			// 
@@ -208,7 +206,7 @@
 			// 
 			this.AddBranchWithTextContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit;
 			this.AddBranchWithTextContextMenuItem.Name = "AddBranchWithTextContextMenuItem";
-			this.AddBranchWithTextContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.AddBranchWithTextContextMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.AddBranchWithTextContextMenuItem.Text = "Add with Text";
 			this.AddBranchWithTextContextMenuItem.Click += new System.EventHandler(this.AddBranchWithTexToolStripMenuItem_Click);
 			// 
@@ -216,7 +214,7 @@
 			// 
 			this.LoadBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Debugger;
 			this.LoadBranchContextMenuItem.Name = "LoadBranchContextMenuItem";
-			this.LoadBranchContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.LoadBranchContextMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.LoadBranchContextMenuItem.Text = "Load";
 			this.LoadBranchContextMenuItem.Click += new System.EventHandler(this.LoadBranchToolStripMenuItem_Click);
 			// 
@@ -224,7 +222,7 @@
 			// 
 			this.UpdateBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot;
 			this.UpdateBranchContextMenuItem.Name = "UpdateBranchContextMenuItem";
-			this.UpdateBranchContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.UpdateBranchContextMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.UpdateBranchContextMenuItem.Text = "&Update";
 			this.UpdateBranchContextMenuItem.Click += new System.EventHandler(this.UpdateBranchToolStripMenuItem_Click);
 			// 
@@ -232,7 +230,7 @@
 			// 
 			this.EditBranchTextContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
 			this.EditBranchTextContextMenuItem.Name = "EditBranchTextContextMenuItem";
-			this.EditBranchTextContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.EditBranchTextContextMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.EditBranchTextContextMenuItem.Text = "Edit Text";
 			this.EditBranchTextContextMenuItem.Click += new System.EventHandler(this.EditBranchTextToolStripMenuItem_Click);
 			// 
@@ -240,7 +238,7 @@
 			// 
 			this.JumpToBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo;
 			this.JumpToBranchContextMenuItem.Name = "JumpToBranchContextMenuItem";
-			this.JumpToBranchContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.JumpToBranchContextMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.JumpToBranchContextMenuItem.Text = "Jump To";
 			this.JumpToBranchContextMenuItem.Click += new System.EventHandler(this.JumpToBranchToolStripMenuItem_Click);
 			// 
@@ -249,20 +247,20 @@
 			this.UndoBranchToolStripMenuItem.Enabled = false;
 			this.UndoBranchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
 			this.UndoBranchToolStripMenuItem.Name = "UndoBranchToolStripMenuItem";
-			this.UndoBranchToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.UndoBranchToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.UndoBranchToolStripMenuItem.Text = "Undo";
 			this.UndoBranchToolStripMenuItem.Click += new System.EventHandler(this.UndoBranchToolStripMenuItem_Click);
 			// 
 			// toolStripSeparator2
 			// 
 			this.toolStripSeparator2.Name = "toolStripSeparator2";
-			this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator2.Size = new System.Drawing.Size(143, 6);
 			// 
 			// RemoveBranchContextMenuItem
 			// 
 			this.RemoveBranchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
 			this.RemoveBranchContextMenuItem.Name = "RemoveBranchContextMenuItem";
-			this.RemoveBranchContextMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.RemoveBranchContextMenuItem.Size = new System.Drawing.Size(146, 22);
 			this.RemoveBranchContextMenuItem.Text = "Remove";
 			this.RemoveBranchContextMenuItem.Click += new System.EventHandler(this.RemoveBranchToolStripMenuItem_Click);
 			// 
@@ -271,7 +269,7 @@
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
 			this.Controls.Add(this.BookmarksBranchesGroupBox);
 			this.Name = "BookmarksBranchesBox";
-			this.Size = new System.Drawing.Size(204, 281);
+			this.Size = new System.Drawing.Size(198, 278);
 			this.BookmarksBranchesGroupBox.ResumeLayout(false);
 			this.BranchesContextMenu.ResumeLayout(false);
 			this.ResumeLayout(false);
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index fd6d903991..049d8c006d 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -63,19 +63,19 @@ namespace BizHawk.Client.EmuHawk
 
 			BranchView.AllColumns.AddRange(new[]
 			{
-				new InputRoll.RollColumn
+				new RollColumn
 				{
 					Name = BranchNumberColumnName,
 					Text = "#",
 					Width = 30
 				},
-				new InputRoll.RollColumn
+				new RollColumn
 				{
 					Name = FrameColumnName,
 					Text = "Frame",
 					Width = 64
 				},
-				new InputRoll.RollColumn
+				new RollColumn
 				{
 					Name = UserTextColumnName,
 					Text = "UserText",
@@ -89,7 +89,7 @@ namespace BizHawk.Client.EmuHawk
 
 		#region Query callbacks
 
-		private void QueryItemText(int index, InputRoll.RollColumn column, out string text, ref int offsetX, ref int offsetY)
+		private void QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
 			text = "";
 
@@ -112,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void QueryItemBkColor(int index, InputRoll.RollColumn column, ref Color color)
+		private void QueryItemBkColor(int index, RollColumn column, ref Color color)
 		{
 			TasBranch branch = GetBranch(index);
 			if (branch != null)
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
index fef9164076..57eb976625 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
@@ -44,7 +44,9 @@
 			this.ScrollToMarkerButton = new System.Windows.Forms.Button();
 			this.AddMarkerWithTextButton = new System.Windows.Forms.Button();
 			this.MarkerView = new BizHawk.Client.EmuHawk.InputRoll();
+			this.MarkersGroupBox = new System.Windows.Forms.GroupBox();
 			this.MarkerContextMenu.SuspendLayout();
+			this.MarkersGroupBox.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// MarkerContextMenu
@@ -57,14 +59,14 @@
             this.toolStripSeparator1,
             this.RemoveMarkerToolStripMenuItem});
 			this.MarkerContextMenu.Name = "MarkerContextMenu";
-			this.MarkerContextMenu.Size = new System.Drawing.Size(126, 120);
+			this.MarkerContextMenu.Size = new System.Drawing.Size(119, 120);
 			this.MarkerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MarkerContextMenu_Opening);
 			// 
 			// JumpToMarkerToolStripMenuItem
 			// 
 			this.JumpToMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo;
 			this.JumpToMarkerToolStripMenuItem.Name = "JumpToMarkerToolStripMenuItem";
-			this.JumpToMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+			this.JumpToMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
 			this.JumpToMarkerToolStripMenuItem.Text = "Jump To";
 			this.JumpToMarkerToolStripMenuItem.Click += new System.EventHandler(this.JumpToMarkerToolStripMenuItem_Click);
 			// 
@@ -72,7 +74,7 @@
 			// 
 			this.ScrollToMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ScrollTo;
 			this.ScrollToMarkerToolStripMenuItem.Name = "ScrollToMarkerToolStripMenuItem";
-			this.ScrollToMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+			this.ScrollToMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
 			this.ScrollToMarkerToolStripMenuItem.Text = "Scroll To";
 			this.ScrollToMarkerToolStripMenuItem.Click += new System.EventHandler(this.ScrollToMarkerToolStripMenuItem_Click);
 			// 
@@ -80,7 +82,7 @@
 			// 
 			this.EditMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
 			this.EditMarkerToolStripMenuItem.Name = "EditMarkerToolStripMenuItem";
-			this.EditMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+			this.EditMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
 			this.EditMarkerToolStripMenuItem.Text = "Edit";
 			this.EditMarkerToolStripMenuItem.Click += new System.EventHandler(this.EditMarkerToolStripMenuItem_Click);
 			// 
@@ -88,20 +90,20 @@
 			// 
 			this.AddMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
 			this.AddMarkerToolStripMenuItem.Name = "AddMarkerToolStripMenuItem";
-			this.AddMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+			this.AddMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
 			this.AddMarkerToolStripMenuItem.Text = "Add";
 			this.AddMarkerToolStripMenuItem.Click += new System.EventHandler(this.AddMarkerToolStripMenuItem_Click);
 			// 
 			// toolStripSeparator1
 			// 
 			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(122, 6);
+			this.toolStripSeparator1.Size = new System.Drawing.Size(115, 6);
 			// 
 			// RemoveMarkerToolStripMenuItem
 			// 
 			this.RemoveMarkerToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
 			this.RemoveMarkerToolStripMenuItem.Name = "RemoveMarkerToolStripMenuItem";
-			this.RemoveMarkerToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
+			this.RemoveMarkerToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
 			this.RemoveMarkerToolStripMenuItem.Text = "Remove";
 			this.RemoveMarkerToolStripMenuItem.Click += new System.EventHandler(this.RemoveMarkerToolStripMenuItem_Click);
 			// 
@@ -110,10 +112,10 @@
 			this.JumpToMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.JumpToMarkerButton.Enabled = false;
 			this.JumpToMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.JumpTo;
-			this.JumpToMarkerButton.Location = new System.Drawing.Point(61, 174);
+			this.JumpToMarkerButton.Location = new System.Drawing.Point(66, 247);
 			this.JumpToMarkerButton.Name = "JumpToMarkerButton";
-			this.JumpToMarkerButton.Size = new System.Drawing.Size(23, 23);
-			this.JumpToMarkerButton.TabIndex = 8;
+			this.JumpToMarkerButton.Size = new System.Drawing.Size(24, 24);
+			this.JumpToMarkerButton.TabIndex = 3;
 			this.toolTip1.SetToolTip(this.JumpToMarkerButton, "Jump To Marker Frame");
 			this.JumpToMarkerButton.UseVisualStyleBackColor = true;
 			this.JumpToMarkerButton.Click += new System.EventHandler(this.JumpToMarkerToolStripMenuItem_Click);
@@ -123,10 +125,10 @@
 			this.EditMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.EditMarkerButton.Enabled = false;
 			this.EditMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil;
-			this.EditMarkerButton.Location = new System.Drawing.Point(119, 174);
+			this.EditMarkerButton.Location = new System.Drawing.Point(126, 247);
 			this.EditMarkerButton.Name = "EditMarkerButton";
-			this.EditMarkerButton.Size = new System.Drawing.Size(23, 23);
-			this.EditMarkerButton.TabIndex = 9;
+			this.EditMarkerButton.Size = new System.Drawing.Size(24, 24);
+			this.EditMarkerButton.TabIndex = 5;
 			this.toolTip1.SetToolTip(this.EditMarkerButton, "Edit Marker Text");
 			this.EditMarkerButton.UseVisualStyleBackColor = true;
 			this.EditMarkerButton.Click += new System.EventHandler(this.EditMarkerToolStripMenuItem_Click);
@@ -135,10 +137,10 @@
 			// 
 			this.AddMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.AddMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.add;
-			this.AddMarkerButton.Location = new System.Drawing.Point(3, 174);
+			this.AddMarkerButton.Location = new System.Drawing.Point(6, 247);
 			this.AddMarkerButton.Name = "AddMarkerButton";
-			this.AddMarkerButton.Size = new System.Drawing.Size(23, 23);
-			this.AddMarkerButton.TabIndex = 6;
+			this.AddMarkerButton.Size = new System.Drawing.Size(24, 24);
+			this.AddMarkerButton.TabIndex = 1;
 			this.toolTip1.SetToolTip(this.AddMarkerButton, "Add Marker to Emulated Frame");
 			this.AddMarkerButton.UseVisualStyleBackColor = true;
 			this.AddMarkerButton.Click += new System.EventHandler(this.AddMarkerToolStripMenuItem_Click);
@@ -148,10 +150,10 @@
 			this.RemoveMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.RemoveMarkerButton.Enabled = false;
 			this.RemoveMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
-			this.RemoveMarkerButton.Location = new System.Drawing.Point(148, 174);
+			this.RemoveMarkerButton.Location = new System.Drawing.Point(156, 247);
 			this.RemoveMarkerButton.Name = "RemoveMarkerButton";
-			this.RemoveMarkerButton.Size = new System.Drawing.Size(23, 23);
-			this.RemoveMarkerButton.TabIndex = 7;
+			this.RemoveMarkerButton.Size = new System.Drawing.Size(24, 24);
+			this.RemoveMarkerButton.TabIndex = 6;
 			this.toolTip1.SetToolTip(this.RemoveMarkerButton, "Remove Marker");
 			this.RemoveMarkerButton.UseVisualStyleBackColor = true;
 			this.RemoveMarkerButton.Click += new System.EventHandler(this.RemoveMarkerToolStripMenuItem_Click);
@@ -161,10 +163,10 @@
 			this.ScrollToMarkerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.ScrollToMarkerButton.Enabled = false;
 			this.ScrollToMarkerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ScrollTo;
-			this.ScrollToMarkerButton.Location = new System.Drawing.Point(90, 174);
+			this.ScrollToMarkerButton.Location = new System.Drawing.Point(96, 247);
 			this.ScrollToMarkerButton.Name = "ScrollToMarkerButton";
-			this.ScrollToMarkerButton.Size = new System.Drawing.Size(23, 23);
-			this.ScrollToMarkerButton.TabIndex = 10;
+			this.ScrollToMarkerButton.Size = new System.Drawing.Size(24, 24);
+			this.ScrollToMarkerButton.TabIndex = 4;
 			this.toolTip1.SetToolTip(this.ScrollToMarkerButton, "Scroll View To Marker Frame");
 			this.ScrollToMarkerButton.UseVisualStyleBackColor = true;
 			this.ScrollToMarkerButton.Click += new System.EventHandler(this.ScrollToMarkerToolStripMenuItem_Click);
@@ -173,10 +175,10 @@
 			// 
 			this.AddMarkerWithTextButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
 			this.AddMarkerWithTextButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AddEdit;
-			this.AddMarkerWithTextButton.Location = new System.Drawing.Point(32, 174);
+			this.AddMarkerWithTextButton.Location = new System.Drawing.Point(36, 247);
 			this.AddMarkerWithTextButton.Name = "AddMarkerWithTextButton";
-			this.AddMarkerWithTextButton.Size = new System.Drawing.Size(23, 23);
-			this.AddMarkerWithTextButton.TabIndex = 11;
+			this.AddMarkerWithTextButton.Size = new System.Drawing.Size(24, 24);
+			this.AddMarkerWithTextButton.TabIndex = 2;
 			this.toolTip1.SetToolTip(this.AddMarkerWithTextButton, "Add Marker with Text to Emulated Frame");
 			this.AddMarkerWithTextButton.UseVisualStyleBackColor = true;
 			this.AddMarkerWithTextButton.Click += new System.EventHandler(this.AddMarkerWithTextToolStripMenuItem_Click);
@@ -185,7 +187,7 @@
 			// 
 			this.MarkerView.AllowColumnReorder = false;
 			this.MarkerView.AllowColumnResize = false;
-			this.MarkerView.AllowRightClickSelecton = true;
+			this.MarkerView.AllowRightClickSelection = true;
 			this.MarkerView.AlwaysScroll = false;
 			this.MarkerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
@@ -197,33 +199,48 @@
 			this.MarkerView.HideWasLagFrames = false;
 			this.MarkerView.HorizontalOrientation = false;
 			this.MarkerView.LagFramesToHide = 0;
-			this.MarkerView.Location = new System.Drawing.Point(3, 3);
+			this.MarkerView.LetKeysModifySelection = false;
+			this.MarkerView.Location = new System.Drawing.Point(6, 19);
 			this.MarkerView.MaxCharactersInHorizontal = 1;
 			this.MarkerView.MultiSelect = false;
 			this.MarkerView.Name = "MarkerView";
 			this.MarkerView.RowCount = 0;
 			this.MarkerView.ScrollSpeed = 1;
-			this.MarkerView.Size = new System.Drawing.Size(195, 165);
-			this.MarkerView.TabIndex = 5;
+			this.MarkerView.SeekingCutoffInterval = 0;
+			this.MarkerView.Size = new System.Drawing.Size(186, 224);
+			this.MarkerView.SuspendHotkeys = false;
+			this.MarkerView.TabIndex = 0;
 			this.MarkerView.TabStop = false;
 			this.MarkerView.SelectedIndexChanged += new System.EventHandler(this.MarkerView_SelectedIndexChanged);
 			this.MarkerView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseClick);
 			this.MarkerView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseDoubleClick);
 			// 
+			// MarkersGroupBox
+			// 
+			this.MarkersGroupBox.Controls.Add(this.MarkerView);
+			this.MarkersGroupBox.Controls.Add(this.AddMarkerButton);
+			this.MarkersGroupBox.Controls.Add(this.AddMarkerWithTextButton);
+			this.MarkersGroupBox.Controls.Add(this.RemoveMarkerButton);
+			this.MarkersGroupBox.Controls.Add(this.ScrollToMarkerButton);
+			this.MarkersGroupBox.Controls.Add(this.EditMarkerButton);
+			this.MarkersGroupBox.Controls.Add(this.JumpToMarkerButton);
+			this.MarkersGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.MarkersGroupBox.Location = new System.Drawing.Point(0, 0);
+			this.MarkersGroupBox.Name = "MarkersGroupBox";
+			this.MarkersGroupBox.Size = new System.Drawing.Size(198, 278);
+			this.MarkersGroupBox.TabIndex = 0;
+			this.MarkersGroupBox.TabStop = false;
+			this.MarkersGroupBox.Text = "Markers";
+			// 
 			// MarkerControl
 			// 
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-			this.Controls.Add(this.AddMarkerWithTextButton);
-			this.Controls.Add(this.MarkerView);
-			this.Controls.Add(this.EditMarkerButton);
-			this.Controls.Add(this.JumpToMarkerButton);
-			this.Controls.Add(this.ScrollToMarkerButton);
-			this.Controls.Add(this.RemoveMarkerButton);
-			this.Controls.Add(this.AddMarkerButton);
+			this.Controls.Add(this.MarkersGroupBox);
 			this.Name = "MarkerControl";
-			this.Size = new System.Drawing.Size(201, 200);
+			this.Size = new System.Drawing.Size(198, 278);
 			this.Load += new System.EventHandler(this.MarkerControl_Load);
 			this.MarkerContextMenu.ResumeLayout(false);
+			this.MarkersGroupBox.ResumeLayout(false);
 			this.ResumeLayout(false);
 
 		}
@@ -245,6 +262,6 @@
 		private System.Windows.Forms.ToolStripMenuItem JumpToMarkerToolStripMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
 		private System.Windows.Forms.Button AddMarkerWithTextButton;
-
+		private System.Windows.Forms.GroupBox MarkersGroupBox;
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
index 14b9acce8a..20473abe85 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
@@ -21,13 +21,13 @@ namespace BizHawk.Client.EmuHawk
 
 			MarkerView.AllColumns.AddRange(new[]
 			{
-				new InputRoll.RollColumn
+				new RollColumn
 				{
 					Name = "FrameColumn",
 					Text = "Frame",
 					Width = 52
 				},
-				new InputRoll.RollColumn
+				new RollColumn
 				{
 					Name = "LabelColumn",
 					Text = "",
@@ -45,7 +45,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public InputRoll MarkerInputRoll => MarkerView;
 
-		private void MarkerView_QueryItemBkColor(int index, InputRoll.RollColumn column, ref Color color)
+		private void MarkerView_QueryItemBkColor(int index, RollColumn column, ref Color color)
 		{
 			var prev = Markers.PreviousOrCurrent(Tastudio.Emulator.Frame);
 
@@ -70,18 +70,10 @@ namespace BizHawk.Client.EmuHawk
 						color = column.Name == "LabelColumn" ? TAStudio.GreenZone_FrameCol : TAStudio.GreenZone_InputLog;
 					}
 				}
-				else
-				{
-					color = Color.White;
-				}
-			}
-			else
-			{
-				color = Color.White;
 			}
 		}
 
-		private void MarkerView_QueryItemText(int index, InputRoll.RollColumn column, out string text, ref int offsetX, ref int offsetY)
+		private void MarkerView_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
 			text = "";
 
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs
index 2319cf7923..8b2042936e 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.Designer.cs
@@ -45,9 +45,6 @@
 			// 
 			// PlaybackGroupBox
 			// 
-			this.PlaybackGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
 			this.PlaybackGroupBox.Controls.Add(this.RecordingModeCheckbox);
 			this.PlaybackGroupBox.Controls.Add(this.AutoRestoreCheckbox);
 			this.PlaybackGroupBox.Controls.Add(this.TurboSeekCheckbox);
@@ -57,9 +54,10 @@
 			this.PlaybackGroupBox.Controls.Add(this.PauseButton);
 			this.PlaybackGroupBox.Controls.Add(this.RewindButton);
 			this.PlaybackGroupBox.Controls.Add(this.PreviousMarkerButton);
-			this.PlaybackGroupBox.Location = new System.Drawing.Point(3, 3);
+			this.PlaybackGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.PlaybackGroupBox.Location = new System.Drawing.Point(0, 0);
 			this.PlaybackGroupBox.Name = "PlaybackGroupBox";
-			this.PlaybackGroupBox.Size = new System.Drawing.Size(252, 104);
+			this.PlaybackGroupBox.Size = new System.Drawing.Size(198, 104);
 			this.PlaybackGroupBox.TabIndex = 0;
 			this.PlaybackGroupBox.TabStop = false;
 			this.PlaybackGroupBox.Text = "Playback";
@@ -174,7 +172,7 @@
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
 			this.Controls.Add(this.PlaybackGroupBox);
 			this.Name = "PlaybackBox";
-			this.Size = new System.Drawing.Size(258, 110);
+			this.Size = new System.Drawing.Size(198, 104);
 			this.PlaybackGroupBox.ResumeLayout(false);
 			this.PlaybackGroupBox.PerformLayout();
 			this.ResumeLayout(false);
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Callbacks.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Callbacks.cs
index b93e0f2a1a..a9dff4b5ec 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Callbacks.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Callbacks.cs
@@ -15,21 +15,6 @@ namespace BizHawk.Client.EmuHawk
 		public Action<int> BranchSavedCallback { get; set; }
 		public Action<int> BranchRemovedCallback { get; set; }
 
-		private Color? GetColorOverride(int index, InputRoll.RollColumn column)
-		{
-			return QueryItemBgColorCallback?.Invoke(index, column.Name);
-		}
-
-		private string GetTextOverride(int index, InputRoll.RollColumn column)
-		{
-			return QueryItemTextCallback?.Invoke(index, column.Name);
-		}
-
-		private Bitmap GetIconOverride(int index, InputRoll.RollColumn column)
-		{
-			return QueryItemIconCallback?.Invoke(index, column.Name);
-		}
-
 		private void GreenzoneInvalidated(int index)
 		{
 			GreenzoneInvalidatedCallback?.Invoke(index);
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index c104438c8e..279a0980d9 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -193,14 +193,12 @@ namespace BizHawk.Client.EmuHawk
 			this.StartFromNowSeparator = new System.Windows.Forms.ToolStripSeparator();
 			this.StartNewProjectFromNowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.StartANewProjectFromSaveRamMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
 			this.BookMarkControl = new BizHawk.Client.EmuHawk.BookmarksBranchesBox();
 			this.BranchesMarkersSplit = new System.Windows.Forms.SplitContainer();
 			this.MainVertialSplit = new System.Windows.Forms.SplitContainer();
 			this.TASMenu.SuspendLayout();
 			this.TasStatusStrip.SuspendLayout();
 			this.RightClickMenu.SuspendLayout();
-			this.groupBox1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).BeginInit();
 			this.BranchesMarkersSplit.Panel1.SuspendLayout();
 			this.BranchesMarkersSplit.Panel2.SuspendLayout();
@@ -819,7 +817,7 @@ namespace BizHawk.Client.EmuHawk
 			this.LoadBranchOnDoubleclickMenuItem.Name = "LoadBranchOnDoubleclickMenuItem";
 			this.LoadBranchOnDoubleclickMenuItem.Size = new System.Drawing.Size(244, 22);
 			this.LoadBranchOnDoubleclickMenuItem.Text = "Load Branch on double-click";
-			this.LoadBranchOnDoubleclickMenuItem.Click += new System.EventHandler(this.LoadBranchOnDoubleclickMenuItem_Click);
+			this.LoadBranchOnDoubleclickMenuItem.Click += new System.EventHandler(this.LoadBranchOnDoubleClickMenuItem_Click);
 			// 
 			// OsdInBranchScreenshotsMenuItem
 			// 
@@ -839,7 +837,7 @@ namespace BizHawk.Client.EmuHawk
 			this.AutopauseAtEndOfMovieMenuItem.Name = "AutopauseAtEndOfMovieMenuItem";
 			this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(244, 22);
 			this.AutopauseAtEndOfMovieMenuItem.Text = "Autopause at end of Movie";
-			this.AutopauseAtEndOfMovieMenuItem.Click += new System.EventHandler(this.AutopauseAtEndMenuItem_Click);
+			this.AutopauseAtEndOfMovieMenuItem.Click += new System.EventHandler(this.AutoPauseAtEndMenuItem_Click);
 			// 
 			// sepToolStripMenuItem
 			// 
@@ -1264,7 +1262,7 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			this.TasView.AllowColumnReorder = false;
 			this.TasView.AllowColumnResize = false;
-			this.TasView.AllowRightClickSelecton = false;
+			this.TasView.AllowRightClickSelection = false;
 			this.TasView.AlwaysScroll = false;
 			this.TasView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
@@ -1341,20 +1339,18 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.TasPlaybackBox.Location = new System.Drawing.Point(3, 4);
+			this.TasPlaybackBox.Location = new System.Drawing.Point(4, 4);
 			this.TasPlaybackBox.Name = "TasPlaybackBox";
-			this.TasPlaybackBox.Size = new System.Drawing.Size(204, 111);
+			this.TasPlaybackBox.Size = new System.Drawing.Size(200, 108);
 			this.TasPlaybackBox.TabIndex = 5;
 			this.TasPlaybackBox.Tastudio = null;
 			// 
 			// MarkerControl
 			// 
-			this.MarkerControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.MarkerControl.Location = new System.Drawing.Point(2, 16);
+			this.MarkerControl.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.MarkerControl.Location = new System.Drawing.Point(0, 0);
 			this.MarkerControl.Name = "MarkerControl";
-			this.MarkerControl.Size = new System.Drawing.Size(194, 193);
+			this.MarkerControl.Size = new System.Drawing.Size(200, 224);
 			this.MarkerControl.TabIndex = 6;
 			this.MarkerControl.Tastudio = null;
 			// 
@@ -1572,31 +1568,16 @@ namespace BizHawk.Client.EmuHawk
 			this.StartANewProjectFromSaveRamMenuItem.Text = "Start a new project from SaveRam";
 			this.StartANewProjectFromSaveRamMenuItem.Click += new System.EventHandler(this.StartANewProjectFromSaveRamMenuItem_Click);
 			// 
-			// groupBox1
-			// 
-			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.groupBox1.Controls.Add(this.MarkerControl);
-			this.groupBox1.Location = new System.Drawing.Point(-2, 3);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(204, 215);
-			this.groupBox1.TabIndex = 7;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Markers";
-			// 
 			// BookMarkControl
 			// 
-			this.BookMarkControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+			this.BookMarkControl.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.BookMarkControl.HoverInterval = 1;
 			this.BookMarkControl.LoadedCallback = null;
-			this.BookMarkControl.Location = new System.Drawing.Point(-2, 5);
+			this.BookMarkControl.Location = new System.Drawing.Point(0, 0);
 			this.BookMarkControl.Name = "BookMarkControl";
 			this.BookMarkControl.RemovedCallback = null;
 			this.BookMarkControl.SavedCallback = null;
-			this.BookMarkControl.Size = new System.Drawing.Size(204, 173);
+			this.BookMarkControl.Size = new System.Drawing.Size(200, 184);
 			this.BookMarkControl.TabIndex = 8;
 			this.BookMarkControl.Tastudio = null;
 			// 
@@ -1605,7 +1586,7 @@ namespace BizHawk.Client.EmuHawk
 			this.BranchesMarkersSplit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.BranchesMarkersSplit.Location = new System.Drawing.Point(3, 121);
+			this.BranchesMarkersSplit.Location = new System.Drawing.Point(4, 116);
 			this.BranchesMarkersSplit.Name = "BranchesMarkersSplit";
 			this.BranchesMarkersSplit.Orientation = System.Windows.Forms.Orientation.Horizontal;
 			// 
@@ -1615,9 +1596,9 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			// BranchesMarkersSplit.Panel2
 			// 
-			this.BranchesMarkersSplit.Panel2.Controls.Add(this.groupBox1);
-			this.BranchesMarkersSplit.Size = new System.Drawing.Size(204, 404);
-			this.BranchesMarkersSplit.SplitterDistance = 179;
+			this.BranchesMarkersSplit.Panel2.Controls.Add(this.MarkerControl);
+			this.BranchesMarkersSplit.Size = new System.Drawing.Size(200, 412);
+			this.BranchesMarkersSplit.SplitterDistance = 184;
 			this.BranchesMarkersSplit.TabIndex = 9;
 			this.BranchesMarkersSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.BranchesMarkersSplit_SplitterMoved);
 			// 
@@ -1641,7 +1622,7 @@ namespace BizHawk.Client.EmuHawk
 			this.MainVertialSplit.Size = new System.Drawing.Size(507, 528);
 			this.MainVertialSplit.SplitterDistance = 295;
 			this.MainVertialSplit.TabIndex = 10;
-			this.MainVertialSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.MainVertialSplit_SplitterMoved);
+			this.MainVertialSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.MainVerticalSplit_SplitterMoved);
 			// 
 			// TAStudio
 			// 
@@ -1663,14 +1644,12 @@ namespace BizHawk.Client.EmuHawk
 			this.Load += new System.EventHandler(this.Tastudio_Load);
 			this.DragDrop += new System.Windows.Forms.DragEventHandler(this.TAStudio_DragDrop);
 			this.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper);
-			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TAStudio_KeyDown);
 			this.MouseLeave += new System.EventHandler(this.TAStudio_MouseLeave);
 			this.TASMenu.ResumeLayout(false);
 			this.TASMenu.PerformLayout();
 			this.TasStatusStrip.ResumeLayout(false);
 			this.TasStatusStrip.PerformLayout();
 			this.RightClickMenu.ResumeLayout(false);
-			this.groupBox1.ResumeLayout(false);
 			this.BranchesMarkersSplit.Panel1.ResumeLayout(false);
 			this.BranchesMarkersSplit.Panel2.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.BranchesMarkersSplit)).EndInit();
@@ -1772,7 +1751,6 @@ namespace BizHawk.Client.EmuHawk
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator19;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator21;
 		private System.Windows.Forms.ToolStripMenuItem DefaultStateSettingsMenuItem;
-		private System.Windows.Forms.GroupBox groupBox1;
 		private System.Windows.Forms.ToolStripMenuItem CancelSeekContextMenuItem;
 		private System.Windows.Forms.ToolStripSeparator StartFromNowSeparator;
 		private System.Windows.Forms.ToolStripMenuItem StartNewProjectFromNowMenuItem;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index e8dbe1376d..edc4fc761b 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -18,12 +18,12 @@ namespace BizHawk.Client.EmuHawk
 		private bool _boolPaintState;
 		private float _floatPaintState;
 		private float _floatBackupState;
-		private bool _patternPaint = false;
+		private bool _patternPaint;
 		private bool _startCursorDrag;
 		private bool _startSelectionDrag;
 		private bool _selectionDragState;
-		private bool _supressContextMenu;
-		private int _startrow;
+		private bool _suppressContextMenu;
+		private int _startRow;
 
 		// Editing analog input
 		private string _floatEditColumn = "";
@@ -99,7 +99,7 @@ namespace BizHawk.Client.EmuHawk
 			TastudioPlayMode(); // suspend rec mode until seek ends, to allow mouse editing
 			Mainform.UnpauseEmulator();
 
-			if (!_seekBackgroundWorker.IsBusy && diff.Value > TasView.VisibleRows)
+			if (!_seekBackgroundWorker.IsBusy && diff > TasView.VisibleRows)
 			{
 				_seekBackgroundWorker.RunWorkerAsync();
 			}
@@ -129,22 +129,22 @@ namespace BizHawk.Client.EmuHawk
 
 		#region Query callbacks
 
-		// public static Color CurrentFrame_FrameCol = Color.FromArgb(0xCFEDFC); Why?
-		public static Color CurrentFrame_InputLog => Color.FromArgb(0x00B5E7F7);
-		public static Color SeekFrame_InputLog => Color.FromArgb(0x70B5E7F7);
+		// public static Color CurrentFrame_FrameCol = Color.FromArgb(0xCF, 0xED, 0xFC); Why?
+		public static Color CurrentFrame_InputLog => Color.FromArgb(0xB5, 0xE7, 0xF7);
+		public static Color SeekFrame_InputLog => Color.FromArgb(0x70, 0xB5, 0xE7, 0xF7);
 
-		public static Color GreenZone_FrameCol => Color.FromArgb(0xDDFFDD);
-		public static Color GreenZone_InputLog => Color.FromArgb(0xD2F9D3);
-		public static Color GreenZone_InputLog_Stated => Color.FromArgb(0xC4F7C8);
-		public static Color GreenZone_InputLog_Invalidated => Color.FromArgb(0xE0FBE0);
+		public static Color GreenZone_FrameCol => Color.FromArgb(0xDD, 0xFF, 0xDD);
+		public static Color GreenZone_InputLog => Color.FromArgb(0xD2, 0xF9, 0xD3);
+		public static Color GreenZone_InputLog_Stated => Color.FromArgb(0xC4, 0xF7, 0xC8);
+		public static Color GreenZone_InputLog_Invalidated => Color.FromArgb(0xE0, 0xFB, 0xE0);
 
-		public static Color LagZone_FrameCol => Color.FromArgb(0xFFDCDD);
-		public static Color LagZone_InputLog => Color.FromArgb(0xF4DADA);
-		public static Color LagZone_InputLog_Stated => Color.FromArgb(0xF0D0D2);
-		public static Color LagZone_InputLog_Invalidated => Color.FromArgb(0xF7E5E5);
+		public static Color LagZone_FrameCol => Color.FromArgb(0xFF, 0xDC, 0xDD);
+		public static Color LagZone_InputLog => Color.FromArgb(0xF4, 0xDA, 0xDA);
+		public static Color LagZone_InputLog_Stated => Color.FromArgb(0xF0, 0xD0, 0xD2);
+		public static Color LagZone_InputLog_Invalidated => Color.FromArgb(0xF7, 0xE5, 0xE5);
 
-		public static Color Marker_FrameCol => Color.FromArgb(0xF7FFC9);
-		public static Color AnalogEdit_Col => Color.FromArgb(0x909070); // SuuperW: When editing an analog value, it will be a gray color.
+		public static Color Marker_FrameCol => Color.FromArgb(0xF7, 0xFF, 0xC9);
+		public static Color AnalogEdit_Col => Color.FromArgb(0x90, 0x90, 0x70); // SuuperW: When editing an analog value, it will be a gray color.
 
 		private Bitmap ts_v_arrow_green_blue => Properties.Resources.ts_v_arrow_green_blue;
 		private Bitmap ts_h_arrow_green_blue => Properties.Resources.ts_h_arrow_green_blue;
@@ -157,9 +157,9 @@ namespace BizHawk.Client.EmuHawk
 		private Bitmap icon_anchor_lag => Properties.Resources.icon_anchor_lag;
 		private Bitmap icon_anchor => Properties.Resources.icon_anchor;
 
-		private void TasView_QueryItemIcon(int index, InputRoll.RollColumn column, ref Bitmap bitmap, ref int offsetX, ref int offsetY)
+		private void TasView_QueryItemIcon(int index, RollColumn column, ref Bitmap bitmap, ref int offsetX, ref int offsetY)
 		{
-			var overrideIcon = GetIconOverride(index, column);
+			var overrideIcon = QueryItemIconCallback?.Invoke(index, column.Name);
 
 			if (overrideIcon != null)
 			{
@@ -171,6 +171,12 @@ namespace BizHawk.Client.EmuHawk
 
 			if (columnName == CursorColumnName)
 			{
+				if (TasView.HorizontalOrientation)
+				{
+					offsetX = 2;
+					offsetY = 5;
+				}
+
 				if (index == Emulator.Frame && index == Mainform.PauseOnFrame)
 				{
 					bitmap = TasView.HorizontalOrientation ?
@@ -214,9 +220,9 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void TasView_QueryItemBkColor(int index, InputRoll.RollColumn column, ref Color color)
+		private void TasView_QueryItemBkColor(int index, RollColumn column, ref Color color)
 		{
-			Color? overrideColor = GetColorOverride(index, column);
+			Color? overrideColor = QueryItemBgColorCallback?.Invoke(index, column.Name);
 
 			if (overrideColor.HasValue)
 			{
@@ -228,7 +234,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (columnName == CursorColumnName)
 			{
-				color = Color.FromArgb(0xFEFFFF);
+				color = Color.FromArgb(0xFE, 0xFF, 0xFF);
 			}
 
 			if (columnName == FrameColumnName)
@@ -239,21 +245,20 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					color = Color.FromArgb(0x60FFFFFF);
+					color = Color.FromArgb(0x60, 0xFF, 0xFF, 0xFF);
 				}
 			}
-			else if (FloatEditingMode &&
-				(index == _floatEditRow || _extraFloatRows.Contains(index)) &&
-				columnName == _floatEditColumn)
+			else if (FloatEditingMode
+				&& (index == _floatEditRow || _extraFloatRows.Contains(index))
+				&& columnName == _floatEditColumn)
 			{
-				// SuuperW: Analog editing is indicated by a color change.
 				color = AnalogEdit_Col;
 			}
 
 			int player = Emulator.ControllerDefinition.PlayerNumber(columnName);
 			if (player != 0 && player % 2 == 0)
 			{
-				color = Color.FromArgb(0x0D000000);
+				color = Color.FromArgb(0x0D, 0x00, 0x00, 0x00);
 			}
 		}
 
@@ -292,13 +297,13 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				color = Color.FromArgb(0xFFFEEE);
+				color = Color.FromArgb(0xFF, 0xFE, 0xEE);
 			}
 		}
 
-		private void TasView_QueryItemText(int index, InputRoll.RollColumn column, out string text, ref int offsetX, ref int offsetY)
+		private void TasView_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
-			var overrideText = GetTextOverride(index, column);
+			var overrideText = QueryItemTextCallback?.Invoke(index, column.Name);
 			if (overrideText != null)
 			{
 				text = overrideText;
@@ -320,7 +325,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else if (columnName == FrameColumnName)
 				{
-					offsetX = 7;
+					offsetX = TasView.HorizontalOrientation ? 2 : 7;
 					text = index.ToString().PadLeft(CurrentTasMovie.InputLogLength.ToString().Length, '0');
 				}
 				else
@@ -333,7 +338,7 @@ namespace BizHawk.Client.EmuHawk
 					else if (index < CurrentTasMovie.InputLogLength)
 					{
 						text = CurrentTasMovie.DisplayValue(index, columnName);
-						if (column.Type == InputRoll.RollColumn.InputType.Float)
+						if (column.Type == ColumnType.Float)
 						{
 							// feos: this could be cashed, but I don't notice any slowdown this way either
 							ControllerDefinition.FloatRange range = Global.MovieSession.MovieControllerAdapter.Definition.FloatRanges
@@ -533,7 +538,6 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			// SuuperW: Moved these.
 			if (TasView.CurrentCell?.RowIndex == null || TasView.CurrentCell.Column == null)
 			{
 				return;
@@ -601,7 +605,7 @@ namespace BizHawk.Client.EmuHawk
 						_selectionDragState = TasView.SelectedRows.Contains(frame);
 					}
 				}
-				else if (TasView.CurrentCell.Column.Type != InputRoll.RollColumn.InputType.Text) // User changed input
+				else if (TasView.CurrentCell.Column.Type != ColumnType.Text) // User changed input
 				{
 					bool wasPaused = Mainform.EmulatorPaused;
 
@@ -616,7 +620,7 @@ namespace BizHawk.Client.EmuHawk
 							BoolPatterns[ControllerType.BoolButtons.IndexOf(buttonName)].Reset();
 							//BoolPatterns[ControllerType.BoolButtons.IndexOf(buttonName)].GetNextValue();
 							_patternPaint = true;
-							_startrow = TasView.CurrentCell.RowIndex.Value;
+							_startRow = TasView.CurrentCell.RowIndex.Value;
 							_boolPaintState = !CurrentTasMovie.BoolIsPressed(frame, buttonName);
 						}
 						else if (Control.ModifierKeys == Keys.Shift && Control.ModifierKeys != Keys.Alt)
@@ -804,16 +808,16 @@ namespace BizHawk.Client.EmuHawk
 			_floatEditYPos = -1;
 			_leftButtonHeld = false;
 
-			if (!FloatEditingMode && CurrentTasMovie.ChangeLog != null)
+			if (!FloatEditingMode)
 			{
-				CurrentTasMovie.ChangeLog.EndBatch();
+				CurrentTasMovie.ChangeLog?.EndBatch();
 			}
 		}
 
 		private void TasView_MouseUp(object sender, MouseEventArgs e)
 		{
 			if (e.Button == MouseButtons.Right && !TasView.IsPointingAtColumnHeader &&
-				!_supressContextMenu && TasView.SelectedRows.Any() && !_leftButtonHeld)
+				!_suppressContextMenu && TasView.SelectedRows.Any() && !_leftButtonHeld)
 			{
 				if (Global.MovieSession.Movie.FrameCount < TasView.SelectedRows.Max())
 				{
@@ -852,7 +856,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			_supressContextMenu = false;
+			_suppressContextMenu = false;
 
 			DoTriggeredAutoRestoreIfNeeded();
 		}
@@ -861,14 +865,14 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (TasView.RightButtonHeld && TasView.CurrentCell.RowIndex.HasValue)
 			{
-				_supressContextMenu = true;
+				_suppressContextMenu = true;
 				int notch = e.Delta / 120;
 				if (notch > 1)
 				{
 					notch *= 2;
 				}
 
-				// warning: tastudio rewind hotkey/button logic is copypasted from here!
+				// warning: tastudio rewind hotkey/button logic is copy pasted from here!
 				if (Mainform.IsSeeking && !Mainform.EmulatorPaused)
 				{
 					Mainform.PauseOnFrame -= notch;
@@ -965,7 +969,7 @@ namespace BizHawk.Client.EmuHawk
 				endVal = e.OldCell.RowIndex.Value;
 				if(_patternPaint)
 				{
-					endVal = _startrow;
+					endVal = _startRow;
 				}
 			}
 
@@ -1104,7 +1108,7 @@ namespace BizHawk.Client.EmuHawk
 				{
 					JumpToGreenzone();
 					_triggerAutoRestore = true;
-					_supressContextMenu = true;
+					_suppressContextMenu = true;
 				}
 			}
 
@@ -1115,8 +1119,6 @@ namespace BizHawk.Client.EmuHawk
 
 				if (e.OldCell.RowIndex.HasValue && e.NewCell.RowIndex.HasValue)
 				{
-					
-
 					for (int i = startVal; i <= endVal; i++) // Inclusive on both ends (drawing up or down)
 					{
 						bool setVal = _boolPaintState;
@@ -1354,14 +1356,9 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else if (e.KeyCode == Keys.OemMinus || e.KeyCode == Keys.Subtract)
 			{
-				if (_floatTypedValue.StartsWith("-"))
-				{
-					_floatTypedValue = _floatTypedValue.Substring(1);
-				}
-				else
-				{
-					_floatTypedValue = $"-{_floatTypedValue}";
-				}
+				_floatTypedValue = _floatTypedValue.StartsWith("-")
+					? _floatTypedValue.Substring(1)
+					: $"-{_floatTypedValue}";
 			}
 			else if (e.KeyCode == Keys.Back)
 			{
@@ -1476,7 +1473,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void TasView_KeyDown(object sender, KeyEventArgs e)
 		{
-			// taseditor uses Ctrl for selection and Shift for framecourser
+			// taseditor uses Ctrl for selection and Shift for frame cursor
 			if (!e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.PageUp) // Shift + Page Up
 			{
 				GoToPreviousMarker();
@@ -1493,14 +1490,6 @@ namespace BizHawk.Client.EmuHawk
 			{
 				GoToFrame(CurrentTasMovie.InputLogLength-1);
 			}
-			else if (!e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.Up) // Shift + Up
-			{
-				//GoToPreviousFrame();
-			}
-			else if (!e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.Down) // Shift + Down
-			{
-				//GoToNextFrame();
-			}
 
 			if (FloatEditingMode
 				&& e.KeyCode != Keys.Right
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index 4b62b355ca..6e5933349b 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -102,7 +101,7 @@ namespace BizHawk.Client.EmuHawk
 			if (string.IsNullOrEmpty(CurrentTasMovie.Filename)
 				|| CurrentTasMovie.Filename == DefaultTasProjName())
 			{
-				SaveAsTas(sender, e);
+				SaveAsTas();
 			}
 			else
 			{
@@ -134,7 +133,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void SaveAsTas(object sender, EventArgs e)
+		private void SaveAsTas()
 		{
 			_autosaveTimer.Stop();
 			GlobalWin.Sound.StopSound();
@@ -177,7 +176,7 @@ namespace BizHawk.Client.EmuHawk
 		// call this one from the menu only
 		private void SaveAsTasMenuItem_Click(object sender, EventArgs e)
 		{
-			SaveAsTas(sender, e);
+			SaveAsTas();
 			if (Settings.BackupPerFileSave)
 			{
 				SaveBackupMenuItem_Click(sender, e);
@@ -189,7 +188,7 @@ namespace BizHawk.Client.EmuHawk
 			if (string.IsNullOrEmpty(CurrentTasMovie.Filename)
 				|| CurrentTasMovie.Filename == DefaultTasProjName())
 			{
-				SaveAsTas(sender, e);
+				SaveAsTas();
 			}
 			else
 			{
@@ -332,8 +331,8 @@ namespace BizHawk.Client.EmuHawk
 
 			ReselectClipboardMenuItem.Enabled =
 				PasteMenuItem.Enabled =
-				PasteInsertMenuItem.Enabled =
-				Clipboard.GetDataObject().GetDataPresent(DataFormats.StringFormat) && TasView.AnyRowsSelected;
+				PasteInsertMenuItem.Enabled = TasView.AnyRowsSelected
+				&& Clipboard.GetDataObject().GetDataPresent(DataFormats.StringFormat);
 
 			ClearGreenzoneMenuItem.Enabled =
 				CurrentTasMovie != null && CurrentTasMovie.TasStateManager.Any();
@@ -484,9 +483,8 @@ namespace BizHawk.Client.EmuHawk
 			{
 				// TODO: if highlighting 2 rows and pasting 3, only paste 2 of them
 				// FCEUX Taseditor doesn't do this, but I think it is the expected behavior in editor programs
-				var wasPaused = Mainform.EmulatorPaused;
 
-				// copy paste from PasteInsertMenuItem_Click!
+				// TODO: copy paste from PasteInsertMenuItem_Click!
 				IDataObject data = Clipboard.GetDataObject();
 				if (data.GetDataPresent(DataFormats.StringFormat))
 				{
@@ -504,10 +502,8 @@ namespace BizHawk.Client.EmuHawk
 								{
 									return;
 								}
-								else
-								{
-									_tasClipboard.Add(new TasClipboardEntry(i, line));
-								}
+
+								_tasClipboard.Add(new TasClipboardEntry(i, line));
 							}
 
 							var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame;
@@ -531,8 +527,6 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (TasView.AnyRowsSelected)
 			{
-				var wasPaused = Mainform.EmulatorPaused;
-
 				// copy paste from PasteMenuItem_Click!
 				IDataObject data = Clipboard.GetDataObject();
 				if (data.GetDataPresent(DataFormats.StringFormat))
@@ -578,7 +572,6 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (TasView.AnyRowsSelected)
 			{
-				var wasPaused = Mainform.EmulatorPaused;
 				var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame;
 				var rollBackFrame = TasView.FirstSelectedIndex.Value;
 
@@ -603,7 +596,6 @@ namespace BizHawk.Client.EmuHawk
 				Clipboard.SetDataObject(sb.ToString());
 				CurrentTasMovie.RemoveFrames(list);
 				SetSplicer();
-				////TasView.DeselectAll(); feos: what if I want to continuously cut?
 
 				if (needsToRollback)
 				{
@@ -678,13 +670,12 @@ namespace BizHawk.Client.EmuHawk
 			if (TasView.AnyRowsSelected)
 			{
 				var wasPaused = Mainform.EmulatorPaused;
-				var framesToInsert = TasView.SelectedRows.ToList();
+				var framesToInsert = TasView.SelectedRows;
 				var insertionFrame = Math.Min(TasView.LastSelectedIndex.Value + 1, CurrentTasMovie.InputLogLength);
 				var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame;
 
 				var inputLog = framesToInsert
-					.Select(frame => CurrentTasMovie.GetInputLogEntry(frame))
-					.ToList();
+					.Select(frame => CurrentTasMovie.GetInputLogEntry(frame));
 
 				CurrentTasMovie.InsertInput(insertionFrame, inputLog);
 
@@ -781,11 +772,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void RemoveMarkersMenuItem_Click(object sender, EventArgs e)
 		{
-			IEnumerable<TasMovieMarker> markers = CurrentTasMovie.Markers.Where(m => TasView.SelectedRows.Contains(m.Frame));
-			foreach (TasMovieMarker m in markers.ToList())
-			{
-				CurrentTasMovie.Markers.Remove(m);
-			}
+			CurrentTasMovie.Markers.RemoveAll(m => TasView.SelectedRows.Contains(m.Frame));
 			MarkerControl.ShrinkSelection();
 			RefreshDialog();
 		}
@@ -988,7 +975,7 @@ namespace BizHawk.Client.EmuHawk
 			Settings.EmptyMarkers ^= true;
 		}
 
-		private void AutopauseAtEndMenuItem_Click(object sender, EventArgs e)
+		private void AutoPauseAtEndMenuItem_Click(object sender, EventArgs e)
 		{
 			Settings.AutoPause ^= true;
 		}
@@ -1053,7 +1040,7 @@ namespace BizHawk.Client.EmuHawk
 			Settings.OldControlSchemeForBranches ^= true;
 		}
 
-		private void LoadBranchOnDoubleclickMenuItem_Click(object sender, EventArgs e)
+		private void LoadBranchOnDoubleClickMenuItem_Click(object sender, EventArgs e)
 		{
 			Settings.LoadBranchOnDoubleClick ^= true;
 		}
@@ -1118,47 +1105,48 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SelectedRendererSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
-			if (OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows)
-			{
-				if (Global.Config.TasStudioRenderer != InputRollRenderer)
-				{
-					switch (Global.Config.TasStudioRenderer)
-					{
-						case 0:
-							SetRenderer0.Text = "GDI (Pending TAStudio Restart)";
-							SetRenderer0.Enabled = false;
-							SetRenderer0.Checked = true;
-							SetRenderer1.Text = "GDI+ (Experimental)";
-							SetRenderer1.Checked = false;
-							break;
-						case 1:
-							SetRenderer1.Text = "GDI+ (Pending TAStudio Restart)";
-							SetRenderer1.Enabled = false;
-							SetRenderer1.Checked = true;
-							SetRenderer0.Text = "GDI";
-							SetRenderer0.Checked = false;
-							break;
-					}
-				}
-				else
-				{
-					SetRenderer0.Text = "GDI";
-					SetRenderer0.Enabled = true;
-					SetRenderer1.Text = "GDI+ (Experimental)";
-					SetRenderer1.Enabled = true;
-					SetRenderer0.Checked = Global.Config.TasStudioRenderer == 0;
-					SetRenderer1.Checked = Global.Config.TasStudioRenderer == 1;
-				}
-			}
-			else
-			{
-				SetRenderer0.Checked = false;
-				SetRenderer0.Enabled = false;
-				SetRenderer0.Visible = false;
-				SetRenderer1.Checked = true;
-				SetRenderer1.Enabled = false;
-				SetRenderer1.Visible = true;
-			}
+			// TODO: Merge TODO: adelikat: delete all this and the UI that goes with it
+			//if (OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows)
+			//{
+			//	if (Global.Config.TasStudioRenderer != InputRollRenderer)
+			//	{
+			//		switch (Global.Config.TasStudioRenderer)
+			//		{
+			//			case 0:
+			//				SetRenderer0.Text = "GDI (Pending TAStudio Restart)";
+			//				SetRenderer0.Enabled = false;
+			//				SetRenderer0.Checked = true;
+			//				SetRenderer1.Text = "GDI+ (Experimental)";
+			//				SetRenderer1.Checked = false;
+			//				break;
+			//			case 1:
+			//				SetRenderer1.Text = "GDI+ (Pending TAStudio Restart)";
+			//				SetRenderer1.Enabled = false;
+			//				SetRenderer1.Checked = true;
+			//				SetRenderer0.Text = "GDI";
+			//				SetRenderer0.Checked = false;
+			//				break;
+			//		}
+			//	}
+			//	else
+			//	{
+			//		SetRenderer0.Text = "GDI";
+			//		SetRenderer0.Enabled = true;
+			//		SetRenderer1.Text = "GDI+ (Experimental)";
+			//		SetRenderer1.Enabled = true;
+			//		SetRenderer0.Checked = Global.Config.TasStudioRenderer == 0;
+			//		SetRenderer1.Checked = Global.Config.TasStudioRenderer == 1;
+			//	}
+			//}
+			//else
+			//{
+			//	SetRenderer0.Checked = false;
+			//	SetRenderer0.Enabled = false;
+			//	SetRenderer0.Visible = false;
+			//	SetRenderer1.Checked = true;
+			//	SetRenderer1.Enabled = false;
+			//	SetRenderer1.Visible = true;
+			//}
 		}
 
 		private void HideLagFramesSubMenu_DropDownOpened(object sender, EventArgs e)
@@ -1212,10 +1200,12 @@ namespace BizHawk.Client.EmuHawk
 		private void SetRenderer_Click(object sender, EventArgs e)
 		{
 			var incoming = (int)(sender as ToolStripMenuItem).Tag;
-			if (incoming != InputRollRenderer)
-			{
-				MessageBox.Show("Changing the input roll renderer requires a\nmanual restart of TAStudio", "Renderer Change Warning", MessageBoxButtons.OK, MessageBoxIcon.Information);
-			}
+
+			// Merge adelikat: TODO: what does this do???
+			//if (incoming != InputRollRenderer)
+			//{
+			//	MessageBox.Show("Changing the input roll renderer requires a\nmanual restart of TAStudio", "Renderer Change Warning", MessageBoxButtons.OK, MessageBoxIcon.Information);
+			//}
 			Global.Config.TasStudioRenderer = incoming;
 		}
 
@@ -1304,8 +1294,9 @@ namespace BizHawk.Client.EmuHawk
 			ColumnsSubMenu.DropDownItems.Clear();
 
 			var columns = TasView.AllColumns
-				.Where(x => !string.IsNullOrWhiteSpace(x.Text))
-				.Where(x => x.Name != "FrameColumn");
+				.Where(c => !string.IsNullOrWhiteSpace(c.Text))
+				.Where(c => c.Name != "FrameColumn")
+				.ToList();
 
 			int workingHeight = Screen.FromControl(this).WorkingArea.Height;
 			int rowHeight = ColumnsSubMenu.Height + 4;
@@ -1313,14 +1304,14 @@ namespace BizHawk.Client.EmuHawk
 			int keyCount = columns.Count(c => c.Name.StartsWith("Key "));
 			int keysMenusCount = (int)Math.Ceiling((double)keyCount / maxRows);
 
-			ToolStripMenuItem[] keysMenus = new ToolStripMenuItem[keysMenusCount];
+			var keysMenus = new ToolStripMenuItem[keysMenusCount];
 
 			for (int i = 0; i < keysMenus.Length; i++)
 			{
 				keysMenus[i] = new ToolStripMenuItem();
 			}
 
-			ToolStripMenuItem[] playerMenus = new ToolStripMenuItem[Emulator.ControllerDefinition.PlayerCount + 1];
+			var playerMenus = new ToolStripMenuItem[Emulator.ControllerDefinition.PlayerCount + 1];
 			playerMenus[0] = ColumnsSubMenu;
 
 			for (int i = 1; i < playerMenus.Length; i++)
@@ -1328,9 +1319,9 @@ namespace BizHawk.Client.EmuHawk
 				playerMenus[i] = new ToolStripMenuItem($"Player {i}");
 			}
 
-			foreach (InputRoll.RollColumn column in columns)
+			foreach (var column in columns)
 			{
-				ToolStripMenuItem menuItem = new ToolStripMenuItem
+				var menuItem = new ToolStripMenuItem
 				{
 					Text = $"{column.Text} ({column.Name})",
 					Checked = column.Visible,
@@ -1340,13 +1331,13 @@ namespace BizHawk.Client.EmuHawk
 
 				menuItem.CheckedChanged += (o, ev) =>
 				{
-					ToolStripMenuItem sender = o as ToolStripMenuItem;
+					ToolStripMenuItem sender = (ToolStripMenuItem)o;
 					TasView.AllColumns.Find(c => c.Name == (string)sender.Tag).Visible = sender.Checked;
 					TasView.AllColumns.ColumnsChanged();
 					CurrentTasMovie.FlagChanges();
 					RefreshTasView();
 					ColumnsSubMenu.ShowDropDown();
-					(sender.OwnerItem as ToolStripMenuItem).ShowDropDown();
+					((ToolStripMenuItem)sender.OwnerItem).ShowDropDown();
 				};
 
 				if (column.Name.StartsWith("Key "))
@@ -1373,11 +1364,11 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			for (int i = 0; i < keysMenus.Length; i++)
+			foreach (var menu in keysMenus)
 			{
-				string text = $"Keys ({keysMenus[i].DropDownItems[0].Tag} - {keysMenus[i].DropDownItems[keysMenus[i].DropDownItems.Count - 1].Tag})";
-				keysMenus[i].Text = text.Replace("Key ", "");
-				ColumnsSubMenu.DropDownItems.Add(keysMenus[i]);
+				string text = $"Keys ({menu.DropDownItems[0].Tag} - {menu.DropDownItems[menu.DropDownItems.Count - 1].Tag})";
+				menu.Text = text.Replace("Key ", "");
+				ColumnsSubMenu.DropDownItems.Add(menu);
 			}
 
 			for (int i = 1; i < playerMenus.Length; i++)
@@ -1405,13 +1396,12 @@ namespace BizHawk.Client.EmuHawk
 					Checked = false
 				};
 
-				for (int i = 0; i < keysMenus.Length; i++)
+				foreach (var menu in keysMenus)
 				{
-					ToolStripMenuItem dummyObject = keysMenus[i];
+					var dummyObject1 = menu;
 					item.CheckedChanged += (o, ev) =>
 					{
-						ToolStripMenuItem sender = o as ToolStripMenuItem;
-						foreach (ToolStripMenuItem menuItem in dummyObject.DropDownItems)
+						foreach (ToolStripMenuItem menuItem in dummyObject1.DropDownItems)
 						{
 							menuItem.Checked ^= true;
 						}
@@ -1438,7 +1428,6 @@ namespace BizHawk.Client.EmuHawk
 					ToolStripMenuItem dummyObject = playerMenus[i];
 					item.CheckedChanged += (o, ev) =>
 					{
-						ToolStripMenuItem sender = o as ToolStripMenuItem;
 						foreach (ToolStripMenuItem menuItem in dummyObject.DropDownItems)
 						{
 							menuItem.Checked ^= true;
@@ -1453,23 +1442,19 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			ColumnsSubMenu.DropDownItems.Add(new ToolStripSeparator());
-			var defaults = new ToolStripMenuItem
-			{
-				Name = "RestoreDefaultColumnConfiguration",
-				Text = "Restore defaults"
-			};
+			TasView.AllColumns.ColumnsChanged();
+		}
 
-			defaults.Click += (o, ev) =>
-			{
-				TasView.AllColumns.Clear();
+		[RestoreDefaults]
+		private void RestoreDefaults()
+		{
+			TasView.AllColumns.Clear();
 				SetUpColumns();
 				RefreshTasView();
 				CurrentTasMovie.FlagChanges();
-			};
 
-			ColumnsSubMenu.DropDownItems.Add(defaults);
-			TasView.AllColumns.ColumnsChanged();
+			MainVertialSplit.SplitterDistance = _defaultMainSplitDistance;
+			BranchesMarkersSplit.SplitterDistance = _defaultBranchMarkerSplitDistance;
 		}
 
 		#endregion
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs
index 92cfc9f365..ff83c74f67 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs
@@ -78,11 +78,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public void GoToNextFrame()
-		{
-			GoToFrame(Emulator.Frame + 1);
-		}
-
 		public void GoToPreviousMarker()
 		{
 			if (Emulator.Frame > 0)
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 67035181b3..a2949ed6c6 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -8,15 +7,12 @@ using System.ComponentModel;
 
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.IEmulatorExtensions;
-using BizHawk.Emulation.Cores.Nintendo.SNES9X;
 
 using BizHawk.Client.Common;
 using BizHawk.Client.Common.MovieConversionExtensions;
 
 using BizHawk.Client.EmuHawk.WinFormExtensions;
 using BizHawk.Client.EmuHawk.ToolExtensions;
-using BizHawk.Common;
-using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -26,13 +22,6 @@ namespace BizHawk.Client.EmuHawk
 		public TasMovie CurrentTasMovie => Global.MovieSession.Movie as TasMovie;
 		private MainForm Mainform => GlobalWin.MainForm;
 
-		/// <summary>
-		/// Static settings so that InputRoll.cs can determine its renderer ahead of instantiation
-		/// 0:	GDI
-		/// 1:	GDI+
-		/// </summary>
-		public static int InputRollRenderer = OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows ? 0 : 1;
-
 		public bool IsInMenuLoop { get; private set; }
 		public string StatesPath => PathManager.MakeAbsolutePath(Global.Config.PathEntries["Global", "TAStudio states"].Path, null);
 
@@ -44,6 +33,9 @@ namespace BizHawk.Client.EmuHawk
 		private UndoHistoryForm _undoForm;
 		private Timer _autosaveTimer;
 
+		private readonly int _defaultMainSplitDistance;
+		private readonly int _defaultBranchMarkerSplitDistance;
+
 		/// <summary>
 		/// Gets a value that separates "restore last position" logic from seeking caused by navigation.
 		/// TASEditor never kills LastPositionFrame, and it only pauses on it, if it hasn't been greenzoned beforehand and middle mouse button was pressed.
@@ -121,13 +113,12 @@ namespace BizHawk.Client.EmuHawk
 		public TAStudio()
 		{
 			Settings = new TAStudioSettings();
-
-			// input roll renderer must be set before InputRoll initialisation
-			InputRollRenderer = OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows ? Global.Config.TasStudioRenderer : 1;
-
 			InitializeComponent();
 			InitializeSeekWorker();
 
+			_defaultMainSplitDistance = MainVertialSplit.SplitterDistance;
+			_defaultBranchMarkerSplitDistance = BranchesMarkersSplit.SplitterDistance;
+
 			// TODO: show this at all times or hide it when saving is done?
 			SavingProgressBar.Visible = false;
 
@@ -282,22 +273,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			// Remembering Split container logic
-			int defaultMainSplitDistance = MainVertialSplit.SplitterDistance;
-			int defaultBranchMarkerSplitDistance = BranchesMarkersSplit.SplitterDistance;
-
-			ToolStripMenuItem restoreDefaults = TASMenu.Items
-				.OfType<ToolStripMenuItem>()
-				.Single(t => t.Name == "SettingsSubMenu")
-				.DropDownItems
-				.OfType<ToolStripMenuItem>()
-				.Single(t => t.Text == "Restore &Defaults");
-
-			restoreDefaults.Click += (o, ev) =>
-			{
-				MainVertialSplit.SplitterDistance = defaultMainSplitDistance;
-				BranchesMarkersSplit.SplitterDistance = defaultBranchMarkerSplitDistance;
-			};
-
 			if (Settings.MainVerticalSplitDistance > 0)
 			{
 				try
@@ -306,7 +281,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				catch (Exception)
 				{
-					MainVertialSplit.SplitterDistance = defaultMainSplitDistance;
+					MainVertialSplit.SplitterDistance = _defaultMainSplitDistance;
 				}
 				
 			}
@@ -319,7 +294,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				catch (Exception)
 				{
-					BranchesMarkersSplit.SplitterDistance = defaultBranchMarkerSplitDistance;
+					BranchesMarkersSplit.SplitterDistance = _defaultBranchMarkerSplitDistance;
 				}
 			}
 
@@ -327,61 +302,18 @@ namespace BizHawk.Client.EmuHawk
 			_initialized = true;
 		}
 
+		private bool CanAutoload => Settings.RecentTas.AutoLoad && !string.IsNullOrEmpty(Settings.RecentTas.MostRecent);
+
 		private bool InitializeOnLoad()
 		{
 			Mainform.PauseOnFrame = null;
 			Mainform.PauseEmulator();
 
-			// Start Scenario 0: snes9x needs a nag (copied from RecordMovieMenuItem_Click())
-			if (Emulator is Snes9x)
+			// Start Scenario 0: core needs a nag
+			// But do not nag if auto-loading
+			if (!CanAutoload && !EmuHawkUtil.EnsureCoreIsAccurate(Emulator))
 			{
-				var box = new CustomControls.MsgBox(
-					"While the Snes9x core is faster, it is not nearly as accurate as bsnes. \nIt is recommended that you switch to the bsnes core for movie recording\nSwitch to bsnes?",
-					"Accuracy Warning",
-					MessageBoxIcon.Warning);
-
-				box.SetButtons(
-					new[] { "Switch", "Continue" },
-					new[] { DialogResult.Yes, DialogResult.Cancel });
-
-				box.MaximumSize = new Size(475, 350);
-				box.SetMessageToAutoSize();
-				var result = box.ShowDialog();
-
-				if (result == DialogResult.Yes)
-				{
-					Global.Config.SNES_InSnes9x = false;
-					Mainform.RebootCore();
-				}
-				else if (result == DialogResult.Cancel)
-				{
-					//return false;
-				}
-			}
-			else if (Emulator is QuickNES) // Copy pasta of unsustainable logic, even better
-			{
-				var box = new CustomControls.MsgBox(
-					"While the QuickNes core is faster, it is not nearly as accurate as NesHawk. \nIt is recommended that you switch to the NesHawk core for movie recording\nSwitch to NesHawk?",
-					"Accuracy Warning",
-					MessageBoxIcon.Warning);
-
-				box.SetButtons(
-					new[] { "Switch", "Continue" },
-					new[] { DialogResult.Yes, DialogResult.Cancel });
-
-				box.MaximumSize = new Size(475, 350);
-				box.SetMessageToAutoSize();
-				var result = box.ShowDialog();
-
-				if (result == DialogResult.Yes)
-				{
-					Global.Config.NES_InQuickNES = false;
-					Mainform.RebootCore();
-				}
-				else if (result == DialogResult.Cancel)
-				{
-					//return false;
-				}
+				// Inaccurate core but allow the user to continue anyway
 			}
 
 			// Start Scenario 1: A regular movie is active
@@ -412,7 +344,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			// Start Scenario 3: No movie, but user wants to autoload their last project
-			else if (Settings.RecentTas.AutoLoad && !string.IsNullOrEmpty(Settings.RecentTas.MostRecent))
+			else if (CanAutoload)
 			{
 				bool result = LoadFile(new FileInfo(Settings.RecentTas.MostRecent));
 				if (!result)
@@ -463,23 +395,31 @@ namespace BizHawk.Client.EmuHawk
 		{
 			TasView.AllColumns.Clear();
 			AddColumn(CursorColumnName, "", 18);
-			AddColumn(FrameColumnName, "Frame#", 68);
+			AddColumn(
+				new RollColumn
+				{
+					Name = FrameColumnName,
+					Text = "Frame#",
+					Width = 68,
+					Type = ColumnType.Text,
+					Rotatable = true
+				});
 
 			var columnNames = GenerateColumnNames();
 			foreach (var kvp in columnNames)
 			{
-				InputRoll.RollColumn.InputType type;
+				ColumnType type;
 				int digits;
 				if (Global.MovieSession.MovieControllerAdapter.Definition.FloatControls.Contains(kvp.Key))
 				{
 					ControllerDefinition.FloatRange range = Global.MovieSession.MovieControllerAdapter.Definition.FloatRanges
 						[Global.MovieSession.MovieControllerAdapter.Definition.FloatControls.IndexOf(kvp.Key)];
-					type = InputRoll.RollColumn.InputType.Float;
+					type = ColumnType.Float;
 					digits = Math.Max(kvp.Value.Length, range.MaxDigits());
 				}
 				else
 				{
-					type = InputRoll.RollColumn.InputType.Boolean;
+					type = ColumnType.Boolean;
 					digits = kvp.Value.Length;
 				}
 
@@ -546,20 +486,22 @@ namespace BizHawk.Client.EmuHawk
 			SetUpToolStripColumns();
 		}
 
-		public void AddColumn(string columnName, string columnText, int columnWidth, InputRoll.RollColumn.InputType columnType = InputRoll.RollColumn.InputType.Boolean)
+		public void AddColumn(string columnName, string columnText, int columnWidth, ColumnType columnType = ColumnType.Boolean)
 		{
-			if (TasView.AllColumns[columnName] == null)
-			{
-				var column = new InputRoll.RollColumn
+			AddColumn(
+				new RollColumn
 				{
 					Name = columnName,
 					Text = columnText,
 					Width = columnWidth,
 					Type = columnType
-				};
+				});
+		}
 
+		private void AddColumn(RollColumn column)
+		{
+			if (TasView.AllColumns[column.Name] == null)
 				TasView.AllColumns.Add(column);
-			}
 		}
 
 		private void EngageTastudio()
@@ -960,8 +902,8 @@ namespace BizHawk.Client.EmuHawk
 				else
 				{
 					// GUI users may want to be protected from clobbering their video when skipping around...
-					// well, users who are rewinding arent. (that gets done through the seeking system in the call above)
-					// users who are clicking around.. I dont know.
+					// well, users who are rewinding aren't. (that gets done through the seeking system in the call above)
+					// users who are clicking around.. I don't know.
 				}
 			}
 		}
@@ -1103,11 +1045,6 @@ namespace BizHawk.Client.EmuHawk
 			SetTextProperty();
 		}
 
-		private void LuaConsole_DragEnter(object sender, DragEventArgs e)
-		{
-			e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;
-		}
-
 		private void TAStudio_DragDrop(object sender, DragEventArgs e)
 		{
 			if (!AskSaveChanges())
@@ -1183,13 +1120,7 @@ namespace BizHawk.Client.EmuHawk
 			return false;
 		}
 
-		private void TAStudio_KeyDown(object sender, KeyEventArgs e)
-		{
-			//if (e.KeyCode == Keys.F)
-			//	TasPlaybackBox.FollowCursor ^= true;
-		}
-
-		private void MainVertialSplit_SplitterMoved(object sender, SplitterEventArgs e)
+		private void MainVerticalSplit_SplitterMoved(object sender, SplitterEventArgs e)
 		{
 			Settings.MainVerticalSplitDistance = MainVertialSplit.SplitterDistance;
 		}
@@ -1236,12 +1167,7 @@ namespace BizHawk.Client.EmuHawk
 		// Stupid designer
 		protected void DragEnterWrapper(object sender, DragEventArgs e)
 		{
-			base.GenericDragEnter(sender, e);
-		}
-
-		private void TasPlaybackBox_Load(object sender, EventArgs e)
-		{
-
+			GenericDragEnter(sender, e);
 		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs
index 2e4168040e..14b81b3ec1 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.Designer.cs
@@ -40,9 +40,7 @@
 			this.AutoScrollCheck = new System.Windows.Forms.CheckBox();
 			this.MaxStepsNum = new System.Windows.Forms.NumericUpDown();
 			this.label1 = new System.Windows.Forms.Label();
-			this.HistoryView = new BizHawk.Client.EmuHawk.VirtualListView();
-			this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.HistoryView = new InputRoll();
 			this.RightClickMenu.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.MaxStepsNum)).BeginInit();
 			this.SuspendLayout();
@@ -168,35 +166,19 @@
 			this.HistoryView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.HistoryView.BlazingFast = false;
-			this.HistoryView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader1,
-            this.columnHeader2});
-			this.HistoryView.HideSelection = false;
-			this.HistoryView.ItemCount = 0;
+			this.HistoryView.RowCount = 0;
 			this.HistoryView.Location = new System.Drawing.Point(10, 10);
 			this.HistoryView.MultiSelect = false;
 			this.HistoryView.Name = "HistoryView";
-			this.HistoryView.SelectAllInProgress = false;
-			this.HistoryView.selectedItem = -1;
 			this.HistoryView.Size = new System.Drawing.Size(369, 213);
 			this.HistoryView.TabIndex = 2;
-			this.HistoryView.UseCompatibleStateImageBehavior = false;
 			this.HistoryView.UseCustomBackground = true;
-			this.HistoryView.View = System.Windows.Forms.View.Details;
 			this.HistoryView.DoubleClick += new System.EventHandler(this.HistoryView_DoubleClick);
 			this.HistoryView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.HistoryView_MouseDown);
 			this.HistoryView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.HistoryView_MouseUp);
-			// 
-			// columnHeader1
-			// 
-			this.columnHeader1.Text = "ID";
-			this.columnHeader1.Width = 40;
-			// 
-			// columnHeader2
-			// 
-			this.columnHeader2.Text = "Undo Step";
-			this.columnHeader2.Width = 322;
+			this.HistoryView.AllowColumnReorder = false;
+			this.HistoryView.AllowColumnResize = false;
+			this.HistoryView.FullRowSelect = true;
 			// 
 			// UndoHistoryForm
 			// 
@@ -225,9 +207,7 @@
 
 		private System.Windows.Forms.Button ClearButton;
 		private System.Windows.Forms.Button UndoButton;
-		private VirtualListView HistoryView;
-		private System.Windows.Forms.ColumnHeader columnHeader1;
-		private System.Windows.Forms.ColumnHeader columnHeader2;
+		private InputRoll HistoryView;
 		private System.Windows.Forms.Button RedoButton;
 		private System.Windows.Forms.ContextMenuStrip RightClickMenu;
 		private System.Windows.Forms.ToolStripMenuItem undoHereToolStripMenuItem;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs
index 5b37c6f46d..7e5ed8f466 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
 using BizHawk.Client.Common;
 
@@ -7,6 +8,9 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class UndoHistoryForm : Form
 	{
+		private const string IdColumnName = "ID";
+		private const string UndoColumnName = "Undo Step";
+		
 		private readonly TAStudio _tastudio;
 		private string _lastUndoAction;
 		private TasMovieChangeLog Log => _tastudio.CurrentTasMovie.ChangeLog;
@@ -19,30 +23,30 @@ namespace BizHawk.Client.EmuHawk
 			HistoryView.QueryItemText += HistoryView_QueryItemText;
 			HistoryView.QueryItemBkColor += HistoryView_QueryItemBkColor;
 
-			HistoryView.Columns[1].Width = 280;
+			HistoryView.AllColumns.Clear();
+			HistoryView.AllColumns.AddRange(new[]
+			{
+				new RollColumn { Name = IdColumnName, Text = IdColumnName, Width = 40, Type = ColumnType.Text },
+				new RollColumn { Name = UndoColumnName, Text = UndoColumnName, Width = 280, Type = ColumnType.Text }
+			});
 
 			MaxStepsNum.Value = Log.MaxSteps;
 		}
 
-		private void HistoryView_QueryItemText(int row, int column, out string text)
+		private void HistoryView_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
-			text = column == 1
-				? Log.Names[row]
-				: row.ToString();
+			text = column.Name == UndoColumnName
+				? Log.Names[index]
+				: index.ToString();
 		}
 
-		private void HistoryView_QueryItemBkColor(int row, int column, ref Color color)
+		private void HistoryView_QueryItemBkColor(int index, RollColumn column, ref Color color)
 		{
-			if (column == 0)
-			{
-				return;
-			}
-
-			if (row == Log.UndoIndex)
+			if (index == Log.UndoIndex)
 			{
 				color = TAStudio.GreenZone_InputLog;
 			}
-			else if (row > Log.UndoIndex)
+			else if (index > Log.UndoIndex)
 			{
 				color = TAStudio.LagZone_InputLog;
 			}
@@ -50,12 +54,12 @@ namespace BizHawk.Client.EmuHawk
 
 		public void UpdateValues()
 		{
-			HistoryView.ItemCount = Log.Names.Count;
+			HistoryView.RowCount = Log.Names.Count;
 			if (AutoScrollCheck.Checked && _lastUndoAction != Log.NextUndoStepName)
 			{
-				HistoryView.ensureVisible(Log.UndoIndex);
-				HistoryView.clearSelection();
-				HistoryView.SelectItem(Log.UndoIndex - 1, true);
+				HistoryView.ScrollToIndex(Log.UndoIndex);
+				HistoryView.DeselectAll();
+				HistoryView.SelectRow(Log.UndoIndex - 1, true);
 			}
 
 			_lastUndoAction = Log.NextUndoStepName;
@@ -81,9 +85,13 @@ namespace BizHawk.Client.EmuHawk
 			_tastudio.RefreshDialog();
 		}
 
+		private int SelectedItem => HistoryView.SelectedRows.Any()
+			? HistoryView.SelectedRows.First()
+			: -1;
+
 		private void HistoryView_DoubleClick(object sender, EventArgs e)
 		{
-			if (Log.UndoIndex <= HistoryView.selectedItem)
+			if (Log.UndoIndex <= SelectedItem)
 			{
 				return;
 			}
@@ -92,7 +100,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				Log.Undo();
 			}
-			while (Log.UndoIndex > HistoryView.selectedItem);
+			while (Log.UndoIndex > SelectedItem);
 
 			UpdateValues();
 		}
@@ -105,9 +113,9 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else if (e.Button == MouseButtons.Left)
 			{
-				if (HistoryView.selectedItem == -1)
+				if (SelectedItem == -1)
 				{
-					HistoryView.SelectItem(_hackSelect, true);
+					HistoryView.SelectRow(_hackSelect, true);
 				}
 			}
 		}
@@ -117,13 +125,12 @@ namespace BizHawk.Client.EmuHawk
 
 		private void HistoryView_MouseDown(object sender, MouseEventArgs e)
 		{
-			HistoryView.SelectItem((e.Y / HistoryView.LineHeight) + HistoryView.VScrollPos - 1, true);
-			_hackSelect = HistoryView.selectedItem;
+			_hackSelect = SelectedItem;
 		}
 
 		private void UndoHereMenuItem_Click(object sender, EventArgs e)
 		{
-			if (HistoryView.selectedItem == -1 || Log.UndoIndex < HistoryView.selectedItem)
+			if (SelectedItem == -1 || Log.UndoIndex < SelectedItem)
 			{
 				return;
 			}
@@ -132,14 +139,14 @@ namespace BizHawk.Client.EmuHawk
 			{
 				Log.Undo();
 			}
-			while (Log.UndoIndex >= HistoryView.selectedItem);
+			while (Log.UndoIndex >= SelectedItem);
 
 			UpdateValues();
 		}
 
 		private void RedoHereMenuItem_Click(object sender, EventArgs e)
 		{
-			if (HistoryView.selectedItem == -1 || Log.UndoIndex >= HistoryView.selectedItem)
+			if (SelectedItem == -1 || Log.UndoIndex >= SelectedItem)
 			{
 				return;
 			}
@@ -148,16 +155,16 @@ namespace BizHawk.Client.EmuHawk
 			{
 				Log.Redo();
 			}
-			while (Log.UndoIndex < HistoryView.selectedItem);
+			while (Log.UndoIndex < SelectedItem);
 
 			UpdateValues();
 		}
 
 		private void ClearHistoryToHereMenuItem_Click(object sender, EventArgs e)
 		{
-			if (HistoryView.selectedItem != -1)
+			if (SelectedItem != -1)
 			{
-				Log.ClearLog(HistoryView.selectedItem);
+				Log.ClearLog(SelectedItem);
 			}
 
 			UpdateValues();
diff --git a/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs b/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
index 43f0147c6b..05f3c4e27e 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Common;
@@ -105,53 +103,6 @@ namespace BizHawk.Client.EmuHawk
 			e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;
 		}
 
-		protected void LoadColumnInfo(VirtualListView listView, ToolDialogSettings.ColumnList columns)
-		{
-			listView.Columns.Clear();
-
-			var cl = columns
-				.Where(c => c.Visible)
-				.OrderBy(c => c.Index);
-
-			foreach (var column in cl)
-			{
-				listView.AddColumn(column);
-			}
-		}
-
-		protected void LoadColumnInfo(PlatformAgnosticVirtualListView listView, ToolDialogSettings.ColumnList columns)
-		{
-			listView.AllColumns.Clear();
-
-			var cl = columns
-				.Where(c => c.Visible)
-				.OrderBy(c => c.Index);
-
-			foreach (var column in cl)
-			{
-				string colText = column.Name.Replace("Column", "");
-				listView.AddColumn(column.Name, colText, column.Width, PlatformAgnosticVirtualListView.ListColumn.InputType.Text);
-			}
-		}
-
-		protected void SaveColumnInfo(VirtualListView listview, ToolDialogSettings.ColumnList columns)
-		{
-			foreach (ColumnHeader column in listview.Columns)
-			{
-				columns[column.Name].Index = column.DisplayIndex;
-				columns[column.Name].Width = column.Width;
-			}
-		}
-
-		protected void SaveColumnInfo(PlatformAgnosticVirtualListView listview, ToolDialogSettings.ColumnList columns)
-		{
-			foreach (var column in listview.AllColumns)
-			{
-				columns[column.Name].Index = listview.AllColumns.IndexOf(column);
-				columns[column.Name].Width = column.Width.Value;
-			}
-		}
-
 		protected void RefreshFloatingWindowControl(bool floatingWindow)
 		{
 			Owner = floatingWindow ? null : GlobalWin.MainForm;
diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 3e05148647..9a382d2d11 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -9,7 +9,6 @@ using System.Windows.Forms;
 
 using BizHawk.Client.ApiHawk;
 using BizHawk.Client.Common;
-using BizHawk.Client.EmuHawk;
 using BizHawk.Client.EmuHawk.CoreExtensions;
 using BizHawk.Common;
 using BizHawk.Common.ReflectionExtensions;
@@ -42,7 +41,7 @@ namespace BizHawk.Client.EmuHawk
 		/// <param name="toolType">Type of tool you want to load</param>
 		/// <param name="focus">Define if the tool form has to get the focus or not (Default is true)</param>
 		/// <returns>An instantiated <see cref="IToolForm"/></returns>
-		/// <exception cref="ArgumentException">Raised if <paramref name="toolType"/> can't be casted into IToolForm </exception>
+		/// <exception cref="ArgumentException">Raised if <paramref name="toolType"/> can't cast into IToolForm </exception>
 		internal IToolForm Load(Type toolType, bool focus = true)
 		{
 			if (!typeof(IToolForm).IsAssignableFrom(toolType))
@@ -148,8 +147,7 @@ namespace BizHawk.Client.EmuHawk
 			// custom settings
 			if (HasCustomConfig(newTool))
 			{
-				Dictionary<string, object> settings;
-				if (!Global.Config.CustomToolSettings.TryGetValue(toolType, out settings))
+				if (!Global.Config.CustomToolSettings.TryGetValue(toolType, out var settings))
 				{
 					settings = new Dictionary<string, object>();
 					Global.Config.CustomToolSettings[toolType] = settings;
@@ -323,6 +321,11 @@ namespace BizHawk.Client.EmuHawk
 				settings.RestoreDefaults();
 				RefreshSettings(form, dest, settings, idx);
 				form.Size = oldsize;
+
+				form.GetType()
+					.GetMethodsWithAttrib(typeof(RestoreDefaultsAttribute))
+					.FirstOrDefault()
+					?.Invoke(form, new object[0]);
 			};
 		}
 
@@ -358,7 +361,7 @@ namespace BizHawk.Client.EmuHawk
 					}
 					else if (!(val is bool) && prop.PropertyType.IsPrimitive)
 					{
-						// numeric constanst are similarly hosed
+						// numeric constants are similarly hosed
 						val = Convert.ChangeType(val, prop.PropertyType, System.Globalization.CultureInfo.InvariantCulture);
 					}
 
@@ -632,7 +635,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (MessageBox.Show(
 					"Are you sure want to load this external tool?\r\nAccept ONLY if you trust the source and if you know what you're doing. In any other case, choose no.",
-					"Confirmm loading", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+					"Confirm loading", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 				{
 					try
 					{
@@ -736,221 +739,68 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public bool IsAvailable<T>()
-		{
-			return IsAvailable(typeof(T));
-		}
+		private static readonly Lazy<List<string>> lazyAsmTypes = new Lazy<List<string>>(() =>
+			Assembly.ReflectionOnlyLoadFrom(Assembly.GetExecutingAssembly().Location)
+				.GetTypes()
+				.Select(t => t.AssemblyQualifiedName)
+				.ToList()
+		);
 
-		public bool IsAvailable(Type t)
+		public bool IsAvailable(Type tool)
 		{
-			if (!ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, t))
+			if (!ServiceInjector.IsAvailable(Global.Emulator.ServiceProvider, tool)
+				|| !lazyAsmTypes.Value.Contains(tool.AssemblyQualifiedName) // not a tool
+				|| (tool == typeof(LuaConsole) && OSTailoredCode.CurrentOS != OSTailoredCode.DistinctOS.Windows)) // simply doesn't work (for now)
 			{
 				return false;
 			}
 
-			var tool = Assembly
-					.GetExecutingAssembly()
-					.GetTypes()
-					.FirstOrDefault(type => type == t);
-
-			if (tool == null) // This isn't a tool, must not be available
+			ToolAttribute attr = tool.GetCustomAttributes(false).OfType<ToolAttribute>().SingleOrDefault();
+			if (attr == null)
 			{
-				return false;
+				return true; // no ToolAttribute on given type -> assumed all supported
 			}
 
-			var attr = tool.GetCustomAttributes(false)
-				.OfType<ToolAttribute>()
-				.FirstOrDefault();
-
-            // start with the assumption that if no supported systems are mentioned and no unsupported cores are mentioned
-            // then this is available for all
-            bool supported = true;
-            
-            if (attr?.SupportedSystems != null && attr.SupportedSystems.Any())
-			{
-                // supported systems are available
-                supported = attr.SupportedSystems.Contains(Global.Emulator.SystemId);
-
-                if (supported)
-                {
-                    // check for a core not supported override
-                    if (attr.UnsupportedCores.Contains(Global.Emulator.DisplayName()))
-                        supported = false; 
-                }
-			}
-            else if (attr?.UnsupportedCores != null && attr.UnsupportedCores.Any())
-            {
-                // no supported system specified, but unsupported cores are
-                if (attr.UnsupportedCores.Contains(Global.Emulator.DisplayName()))
-                    supported = false;
-            }
-
-			return supported;
+			var displayName = Global.Emulator.DisplayName();
+			var systemId = Global.Emulator.SystemId;
+			return !attr.UnsupportedCores.Contains(displayName) // not unsupported
+				&& (!attr.SupportedSystems.Any() || attr.SupportedSystems.Contains(systemId)); // supported (no supported list -> assumed all supported)
 		}
 
+		public bool IsAvailable<T>() => IsAvailable(typeof(T));
+
 		// Note: Referencing these properties creates an instance of the tool and persists it.  They should be referenced by type if this is not desired
 		#region Tools
 
-		public RamWatch RamWatch
+		private T GetTool<T>() where T : class, IToolForm, new()
 		{
-			get
+			T tool = _tools.OfType<T>().FirstOrDefault();
+			if (tool != null)
 			{
-				var tool = _tools.FirstOrDefault(t => t is RamWatch);
-				if (tool != null)
+				if (!tool.IsDisposed)
 				{
-					if (tool.IsDisposed)
-					{
-						_tools.Remove(tool);
-					}
-					else
-					{
-						return tool as RamWatch;
-					}
+					return tool;
 				}
-
-				var newTool = new RamWatch();
-				_tools.Add(newTool);
-				return newTool;
+				_tools.Remove(tool);
 			}
+			tool = new T();
+			_tools.Add(tool);
+			return tool;
 		}
 
-		public RamSearch RamSearch
-		{
-			get
-			{
-				var tool = _tools.FirstOrDefault(t => t is RamSearch);
-				if (tool != null)
-				{
-					if (tool.IsDisposed)
-					{
-						_tools.Remove(tool);
-					}
-					else
-					{
-						return tool as RamSearch;
-					}
-				}
+		public RamWatch RamWatch => GetTool<RamWatch>();
 
-				var newTool = new RamSearch();
-				_tools.Add(newTool);
-				return newTool;
-			}
-		}
+		public RamSearch RamSearch => GetTool<RamSearch>();
 
-		public Cheats Cheats
-		{
-			get
-			{
-				var tool = _tools.FirstOrDefault(t => t is Cheats);
-				if (tool != null)
-				{
-					if (tool.IsDisposed)
-					{
-						_tools.Remove(tool);
-					}
-					else
-					{
-						return tool as Cheats;
-					}
-				}
+		public Cheats Cheats => GetTool<Cheats>();
 
-				var newTool = new Cheats();
-				_tools.Add(newTool);
-				return newTool;
-			}
-		}
+		public HexEditor HexEditor => GetTool<HexEditor>();
 
-		public HexEditor HexEditor
-		{
-			get
-			{
-				var tool = _tools.FirstOrDefault(t => t is HexEditor);
-				if (tool != null)
-				{
-					if (tool.IsDisposed)
-					{
-						_tools.Remove(tool);
-					}
-					else
-					{
-						return tool as HexEditor;
-					}
-				}
+		public VirtualpadTool VirtualPad => GetTool<VirtualpadTool>();
 
-				var newTool = new HexEditor();
-				_tools.Add(newTool);
-				return newTool;
-			}
-		}
+		public SNESGraphicsDebugger SNESGraphicsDebugger => GetTool<SNESGraphicsDebugger>();
 
-		public VirtualpadTool VirtualPad
-		{
-			get
-			{
-				var tool = _tools.FirstOrDefault(t => t is VirtualpadTool);
-				if (tool != null)
-				{
-					if (tool.IsDisposed)
-					{
-						_tools.Remove(tool);
-					}
-					else
-					{
-						return tool as VirtualpadTool;
-					}
-				}
-
-				var newTool = new VirtualpadTool();
-				_tools.Add(newTool);
-				return newTool;
-			}
-		}
-
-		public SNESGraphicsDebugger SNESGraphicsDebugger
-		{
-			get
-			{
-				var tool = _tools.FirstOrDefault(t => t is SNESGraphicsDebugger);
-				if (tool != null)
-				{
-					if (tool.IsDisposed)
-					{
-						_tools.Remove(tool);
-					}
-					else
-					{
-						return tool as SNESGraphicsDebugger;
-					}
-				}
-
-				var newTool = new SNESGraphicsDebugger();
-				_tools.Add(newTool);
-				return newTool;
-			}
-		}
-
-		public LuaConsole LuaConsole
-		{
-			get
-			{
-				var tool = _tools.FirstOrDefault(t => t is LuaConsole);
-				if (tool != null)
-				{
-					if (tool.IsDisposed)
-					{
-						_tools.Remove(tool);
-					}
-					else
-					{
-						return tool as LuaConsole;
-					}
-				}
-
-				var newTool = new LuaConsole();
-				_tools.Add(newTool);
-				return newTool;
-			}
-		}
+		public LuaConsole LuaConsole => GetTool<LuaConsole>();
 
 		public TAStudio TAStudio
 		{
@@ -962,22 +812,7 @@ namespace BizHawk.Client.EmuHawk
 					System.Diagnostics.Debug.Fail("TAStudio does not exist!");
 				}
 
-				var tool = _tools.FirstOrDefault(t => t is TAStudio);
-				if (tool != null)
-				{
-					if (tool.IsDisposed)
-					{
-						_tools.Remove(tool);
-					}
-					else
-					{
-						return tool as TAStudio;
-					}
-				}
-
-				var newTool = new TAStudio();
-				_tools.Add(newTool);
-				return newTool;
+				return GetTool<TAStudio>();
 			}
 		}
 
diff --git a/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs
index 132ce7a40e..50a93f6507 100644
--- a/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs
@@ -31,9 +31,7 @@
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TraceLogger));
 			this.TracerBox = new System.Windows.Forms.GroupBox();
-			this.TraceView = new BizHawk.Client.EmuHawk.PlatformAgnosticVirtualListView();
-			this.Disasm = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.Registers = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.TraceView = new InputRoll();
 			this.TraceContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.CopyContextMenu = new System.Windows.Forms.ToolStripMenuItem();
 			this.SelectAllContextMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -57,7 +55,6 @@
 			this.ToWindowRadio = new System.Windows.Forms.RadioButton();
 			this.LoggingEnabled = new System.Windows.Forms.CheckBox();
 			this.SegmentSizeMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.AutoScrollMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.TracerBox.SuspendLayout();
 			this.TraceContextMenu.SuspendLayout();
 			this.menuStrip1.SuspendLayout();
@@ -79,54 +76,22 @@
 			// 
 			// TraceView
 			// 
-			this.TraceView.AllowColumnReorder = false;
-			this.TraceView.AllowColumnResize = false;
-			this.TraceView.AllowRightClickSelecton = false;
 			this.TraceView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.TraceView.BlazingFast = false;
-			this.TraceView.BorderColor = System.Drawing.Color.DarkGray;
-			this.TraceView.BorderSize = 1;
-			this.TraceView.CellBackgroundColor = System.Drawing.Color.White;
-			this.TraceView.CellBackgroundHighlightColor = System.Drawing.Color.Blue;
-			this.TraceView.CellFont = new System.Drawing.Font("Arial", 8F);
-			this.TraceView.CellFontColor = System.Drawing.Color.Black;
-			this.TraceView.CellHeightPadding = 0;
-			this.TraceView.ColumnHeaderBackgroundColor = System.Drawing.Color.LightGray;
-			this.TraceView.ColumnHeaderBackgroundHighlightColor = System.Drawing.SystemColors.HighlightText;
-			this.TraceView.ColumnHeaderFont = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
-			this.TraceView.ColumnHeaderFontColor = System.Drawing.Color.Black;
-			this.TraceView.ColumnHeaderOutlineColor = System.Drawing.Color.Black;
 			this.TraceView.ContextMenuStrip = this.TraceContextMenu;
 			this.TraceView.Font = new System.Drawing.Font("Courier New", 8F);
 			this.TraceView.FullRowSelect = true;
-			this.TraceView.GridLineColor = System.Drawing.SystemColors.ControlLight;
-			this.TraceView.HideSelection = false;
-			this.TraceView.LetKeysModifySelection = false;
+			this.TraceView.GridLines = true;
+			this.TraceView.RowCount = 0;
 			this.TraceView.Location = new System.Drawing.Point(8, 18);
-			this.TraceView.MultiSelect = false;
 			this.TraceView.Name = "TraceView";
-			this.TraceView.ScrollSpeed = 1;
-			this.TraceView.SeekingCutoffInterval = 0;
 			this.TraceView.Size = new System.Drawing.Size(603, 414);
-			this.TraceView.SuspendHotkeys = false;
 			this.TraceView.TabIndex = 4;
 			this.TraceView.TabStop = false;
-			this.TraceView.UseCompatibleStateImageBehavior = false;
-			this.TraceView.View = System.Windows.Forms.View.Details;
-			this.TraceView.VirtualListSize = 0;
-			this.TraceView.VirtualMode = false;
-			// 
-			// Disasm
-			// 
-			this.Disasm.Text = "Disasm";
-			this.Disasm.Width = 239;
-			// 
-			// Registers
-			// 
-			this.Registers.Text = "Registers";
-			this.Registers.Width = 357;
+			this.TraceView.UseCustomBackground = true;
+			this.TraceView.AllowColumnResize = true;
+			this.TraceView.AllowColumnReorder = false;
 			// 
 			// TraceContextMenu
 			// 
@@ -243,8 +208,7 @@
 			// 
 			this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.MaxLinesMenuItem,
-            this.SegmentSizeMenuItem,
-            this.AutoScrollMenuItem});
+            this.SegmentSizeMenuItem});
 			this.OptionsSubMenu.Name = "OptionsSubMenu";
 			this.OptionsSubMenu.Size = new System.Drawing.Size(58, 20);
 			this.OptionsSubMenu.Text = "&Settings";
@@ -256,14 +220,6 @@
 			this.MaxLinesMenuItem.Text = "&Set Max Lines...";
 			this.MaxLinesMenuItem.Click += new System.EventHandler(this.MaxLinesMenuItem_Click);
 			// 
-			// AutoScrollMenuItem
-			// 
-			this.AutoScrollMenuItem.CheckOnClick = true;
-			this.AutoScrollMenuItem.Name = "AutoScrollMenuItem";
-			this.AutoScrollMenuItem.Size = new System.Drawing.Size(180, 22);
-			this.AutoScrollMenuItem.Text = "Auto Scroll";
-			this.AutoScrollMenuItem.Click += new System.EventHandler(this.AutoScrollMenuItem_Click);
-			// 
 			// groupBox2
 			// 
 			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
@@ -396,8 +352,7 @@
 		private System.Windows.Forms.GroupBox groupBox2;
 		private System.Windows.Forms.CheckBox LoggingEnabled;
 		private System.Windows.Forms.ToolStripMenuItem OptionsSubMenu;
-		private BizHawk.Client.EmuHawk.PlatformAgnosticVirtualListView TraceView;
-		public System.Windows.Forms.ColumnHeader Disasm;
+		private InputRoll TraceView;
 		private System.Windows.Forms.ToolStripMenuItem MaxLinesMenuItem;
 		private System.Windows.Forms.RadioButton ToFileRadio;
 		private System.Windows.Forms.RadioButton ToWindowRadio;
@@ -406,7 +361,6 @@
 		private System.Windows.Forms.ToolStripMenuItem EditSubMenu;
 		private System.Windows.Forms.ToolStripMenuItem CopyMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem SelectAllMenuItem;
-		private System.Windows.Forms.ColumnHeader Registers;
 		private System.Windows.Forms.ToolStripMenuItem ClearMenuItem;
 		private System.Windows.Forms.ContextMenuStrip TraceContextMenu;
 		private System.Windows.Forms.ToolStripMenuItem CopyContextMenu;
@@ -414,6 +368,5 @@
 		private System.Windows.Forms.ToolStripMenuItem ClearContextMenu;
 		private System.Windows.Forms.Button OpenLogFile;
 		private System.Windows.Forms.ToolStripMenuItem SegmentSizeMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem AutoScrollMenuItem;
 	}
-}
+}
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
index f53b0ee5da..1c0cb24a42 100644
--- a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
+++ b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs
@@ -24,20 +24,20 @@ namespace BizHawk.Client.EmuHawk
 		private int FileSizeCap { get; set; }
 
 		[ConfigPersist]
-		private int DisasmColumnWidth { 
-			get { return this.Disasm.Width; }
-			set { this.Disasm.Width = value; }
-		}
-
-		[ConfigPersist]
-		private int RegistersColumnWidth
+		private List<RollColumn> Columns
 		{
-			get { return this.Registers.Width; }
-			set { this.Registers.Width = value; }
-		}
+			get { return TraceView.AllColumns; }
+			set
+			{
+				TraceView.AllColumns.Clear();
+				foreach (var column in value)
+				{
+					TraceView.AllColumns.Add(column);
+				}
 
-		[ConfigPersist]
-		public override bool AutoScroll { get; set; }
+				TraceView.AllColumns.ColumnsChanged();
+			}
+		}
 
 		private FileInfo _logFile;
 		private FileInfo LogFile
@@ -50,7 +50,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private List<TraceInfo> _instructions = new List<TraceInfo>();
+		private readonly List<TraceInfo> _instructions = new List<TraceInfo>();
 		private StreamWriter _streamWriter;
 		private bool _splitFile;
 		private string _baseName;
@@ -58,12 +58,13 @@ namespace BizHawk.Client.EmuHawk
 		private int _segmentCount;
 		private ulong _currentSize;
 
+		private const string DisasmColumnName = "Disasm";
+		private const string RegistersColumnName = "Registers";
 		public TraceLogger()
 		{
 			InitializeComponent();
 
 			TraceView.QueryItemText += TraceView_QueryItemText;
-			TraceView.VirtualMode = true;
 
 			Closing += (o, e) =>
 			{
@@ -76,32 +77,21 @@ namespace BizHawk.Client.EmuHawk
 			FileSizeCap = 150; // make 1 frame of tracelog for n64/psx fit in
 			_splitFile = FileSizeCap != 0;
 
-			SetupTraceViewSettings();
-		}
-
-		private void SetupColumns()
-		{
 			TraceView.AllColumns.Clear();
-			TraceView.AddColumn("Disasm", "Disasm", 239, PlatformAgnosticVirtualListView.ListColumn.InputType.Text);
-			TraceView.AddColumn("Registers", "Registers", 357, PlatformAgnosticVirtualListView.ListColumn.InputType.Text);
-		}
-
-		private void SetupTraceViewSettings()
-		{
-			TraceView.MultiSelect = true;
-			TraceView.CellWidthPadding = 3;
-			TraceView.CellHeightPadding = 2;
-			TraceView.ScrollSpeed = 5;
-			TraceView.AllowColumnResize = true;
-			TraceView.AllowColumnReorder = true;
-			TraceView.ColumnHeaderFont = new System.Drawing.Font("Courier New", 8F);
-			TraceView.ColumnHeaderFontColor = System.Drawing.Color.Black;
-			TraceView.ColumnHeaderBackgroundColor = System.Drawing.Color.White;
-			TraceView.ColumnHeaderBackgroundHighlightColor = System.Drawing.Color.LightSteelBlue;
-			TraceView.ColumnHeaderOutlineColor = System.Drawing.Color.White;
-			TraceView.CellFont = new System.Drawing.Font("Courier New", 8F);
-			TraceView.CellFontColor = System.Drawing.Color.Black;
-			TraceView.CellBackgroundColor = System.Drawing.Color.White;
+			TraceView.AllColumns.Add(new RollColumn
+			{
+				Name = DisasmColumnName,
+				Text = DisasmColumnName,
+				Width = 239,
+				Type = ColumnType.Text
+			});
+			TraceView.AllColumns.Add(new RollColumn
+			{
+				Name = RegistersColumnName,
+				Text = RegistersColumnName,
+				Width = 357,
+				Type = ColumnType.Text
+			});
 		}
 
 		public bool UpdateBefore
@@ -119,18 +109,17 @@ namespace BizHawk.Client.EmuHawk
 			//Tracer.Enabled = LoggingEnabled.Checked;
 		}
 
-		private void TraceView_QueryItemText(int index, int column, out string text)
+		private void TraceView_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
 			text = "";
 			if (index < _instructions.Count)
 			{
-				var test = TraceView.AllColumns;
-				switch (TraceView.GetOriginalColumnIndex(column))
+				switch (column.Name)
 				{
-					case 0:
+					case DisasmColumnName:
 						text = _instructions[index].Disassembly.TrimEnd();
 						break;
-					case 1:
+					case RegistersColumnName:
 						text = _instructions[index].RegisterInfo;
 						break;
 				}
@@ -142,10 +131,8 @@ namespace BizHawk.Client.EmuHawk
 			ClearList();
 			OpenLogFile.Enabled = false;
 			LoggingEnabled.Checked = false;
-			AutoScrollMenuItem.Checked = AutoScroll;
 			Tracer.Sink = null;
 			SetTracerBoxTitle();
-			SetupColumns();
 		}
 
 		class CallbackSink : ITraceSink
@@ -166,17 +153,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (ToWindowRadio.Checked)
 				{
-					// setting to zero first fixes an exception when scrolling the view
-					// how or why I don't know
-					// it's hidden behind an internal class ListViewNativeItemCollection
-					TraceView.VirtualListSize = 0;
-					TraceView.VirtualListSize = _instructions.Count;
-					if (GlobalWin.MainForm.EmulatorPaused)
-					{
-						if (AutoScroll && _instructions.Count != 0)
-							TraceView.ScrollToIndex(_instructions.IndexOf(_instructions.Last()));
-						TraceView.Refresh();
-					}
+					TraceView.RowCount = _instructions.Count;
 				}
 				else
 				{
@@ -191,14 +168,9 @@ namespace BizHawk.Client.EmuHawk
 					//connect tracer to sink for next frame
 					if (ToWindowRadio.Checked)
 					{
-						if (AutoScroll && _instructions.Count != 0)
+						Tracer.Sink = new CallbackSink
 						{
-							TraceView.ScrollToIndex(_instructions.IndexOf(_instructions.Last()));
-						}
-						TraceView.Refresh();
-						Tracer.Sink = new CallbackSink()
-						{
-							putter = (info) =>
+							putter = info =>
 							{
 								if (_instructions.Count >= MaxLines)
 								{
@@ -207,6 +179,7 @@ namespace BizHawk.Client.EmuHawk
 								_instructions.Add(info);
 							}
 						};
+						_instructions.Clear();
 					}
 					else
 					{
@@ -250,7 +223,7 @@ namespace BizHawk.Client.EmuHawk
 		private void ClearList()
 		{
 			_instructions.Clear();
-			TraceView.ItemCount = 0;
+			TraceView.RowCount = 0;
 			SetTracerBoxTitle();
 		}
 
@@ -273,7 +246,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				_instructions.RemoveRange(0, _instructions.Count - MaxLines);
 			}
-			TraceView.ItemCount = _instructions.Count;
+			TraceView.RowCount = _instructions.Count;
 		}
 
 		private void SetTracerBoxTitle()
@@ -371,7 +344,6 @@ namespace BizHawk.Client.EmuHawk
 
 		private void CopyMenuItem_Click(object sender, EventArgs e)
 		{
-//			var indices = TraceView.SelectedIndices;
 			var indices = TraceView.SelectedRows.ToList();
 
 			if (indices.Count > 0)
@@ -389,7 +361,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			for (var i = 0; i < _instructions.Count; i++)
 			{
-				TraceView.SelectItem(i, true);
+				TraceView.SelectRow(i, true);
 			}
 		}
 
@@ -432,11 +404,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void AutoScrollMenuItem_Click(object sender, EventArgs e)
-		{
-			AutoScroll = ((ToolStripMenuItem)sender as ToolStripMenuItem).Checked;
-		}
-
 		#endregion
 
 		#region Dialog and ListView Events
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
index 1540935632..b8d2103c93 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 using System.Drawing;
 
@@ -19,24 +18,16 @@ namespace BizHawk.Client.EmuHawk
 			PadControls.ForEach(c => c.UpdateValues());
 		}
 
-		private List<IVirtualPadControl> PadControls
-		{
-			get
-			{
-				return PadBox.Controls
-					.OfType<IVirtualPadControl>()
-					.ToList();
-			}
-		}
+		private List<IVirtualPadControl> PadControls =>
+			PadBox.Controls
+				.OfType<IVirtualPadControl>()
+				.ToList();
 
-		public string PadSchemaDisplayName { get { return _schema.DisplayName; } }
+		public string PadSchemaDisplayName => _schema.DisplayName;
 
 		public bool ReadOnly
 		{
-			get
-			{
-				return _readOnly;
-			}
+			get => _readOnly;
 
 			set
 			{
@@ -136,10 +127,10 @@ namespace BizHawk.Client.EmuHawk
 
 		public void ClearBoolean()
 		{
-			PadControls
-				.OfType<VirtualPadButton>()
-				.ToList()
-				.ForEach(p => p.Clear());
+			foreach (var p in PadControls.OfType<VirtualPadButton>())
+			{
+				p.Clear();
+			}
 		}
 
 		public void Set(IController controller)
@@ -149,28 +140,28 @@ namespace BizHawk.Client.EmuHawk
 
 		public void SetPrevious(IController previous)
 		{
-			PadControls
-				.OfType<VirtualPadAnalogStick>()
-				.ToList()
-				.ForEach(c => c.SetPrevious(previous));
+			foreach (var c in PadControls.OfType<VirtualPadAnalogStick>())
+			{
+				c.SetPrevious(previous);
+			}
 		}
 
 		public void BumpAnalog(int? x, int? y)
 		{
-			PadControls
-				.OfType<VirtualPadAnalogStick>()
-				.ToList()
-				.ForEach(a => a.Bump(x, y));
+			foreach (var a in PadControls.OfType<VirtualPadAnalogStick>())
+			{
+				a.Bump(x, y);
+			}
 
-			PadControls
-				.OfType<VirtualPadAnalogButton>()
-				.ToList()
-				.ForEach(a => a.Bump(x));
+			foreach (var a in PadControls.OfType<VirtualPadAnalogButton>())
+			{
+				a.Bump(x);
+			}
 
-			PadControls
-				.OfType<VirtualPadTargetScreen>()
-				.ToList()
-				.ForEach(a => a.Bump(x, y));
+			foreach (var a in PadControls.OfType<VirtualPadTargetScreen>())
+			{
+				a.Bump(x, y);
+			}
 		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
index 44ca4ac00b..4e303320bb 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
@@ -23,15 +22,10 @@ namespace BizHawk.Client.EmuHawk
 		
 		private bool _readOnly;
 
-		private List<VirtualPad> Pads
-		{
-			get
-			{
-				return ControllerPanel.Controls
-					.OfType<VirtualPad>()
-					.ToList();
-			}
-		}
+		private List<VirtualPad> Pads =>
+			ControllerPanel.Controls
+				.OfType<VirtualPad>()
+				.ToList();
 
 		public bool Readonly
 		{
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
index ddc2b76b4e..617fd78021 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
@@ -17,10 +17,7 @@ namespace BizHawk.Client.EmuHawk
 		private bool _isSet = false;
 		private bool IsSet
 		{
-			get
-			{
-				return _isSet;
-			}
+			get => _isSet;
 
 			set
 			{
@@ -62,10 +59,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool ReadOnly
 		{
-			get
-			{
-				return _readonly;
-			}
+			get => _readonly;
 
 			set
 			{
@@ -102,10 +96,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public string DisplayName
 		{
-			get
-			{
-				return _displayName;
-			}
+			get => _displayName;
 
 			set
 			{
@@ -119,10 +110,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public int MaxValue
 		{
-			get
-			{
-				return _maxValue;
-			}
+			get => _maxValue;
 
 			set
 			{
@@ -137,10 +125,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public int MinValue
 		{
-			get
-			{
-				return _minValue;
-			}
+			get => _minValue;
 
 			set
 			{
@@ -155,10 +140,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public Orientation Orientation
 		{
-			get
-			{
-				return AnalogTrackBar.Orientation;
-			}
+			get => AnalogTrackBar.Orientation;
 
 			set
 			{
@@ -207,10 +189,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public int CurrentValue
 		{
-			get
-			{
-				return AnalogTrackBar.Value;
-			}
+			get => AnalogTrackBar.Value;
 
 			set
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
index 0237b74de7..026489f496 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Common;
 using BizHawk.Client.Common;
-using System.Windows;
 using BizHawk.Common.NumberExtensions;
 
 namespace BizHawk.Client.EmuHawk
@@ -31,8 +29,8 @@ namespace BizHawk.Client.EmuHawk
 			manualTheta.ValueChanged += PolarNumeric_Changed;
 		}
 
-		public float[] RangeX = new float[] { -128f, 0.0f, 127f };
-		public float[] RangeY = new float[] { -128f, 0.0f, 127f };
+		public float[] RangeX = { -128f, 0.0f, 127f };
+		public float[] RangeY = { -128f, 0.0f, 127f };
 		private bool ReverseX;
 		private bool ReverseY;
 
@@ -112,10 +110,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool ReadOnly
 		{
-			get
-			{
-				return _readonly;
-			}
+			get => _readonly;
 
 			set
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs
index 3540991722..216b902f25 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs
@@ -57,10 +57,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool ReadOnly
 		{
-			get
-			{
-				return _readonly;
-			}
+			get => _readonly;
 
 			set
 			{
@@ -123,10 +120,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool RightClicked
 		{
-			get
-			{
-				return !ReadOnly && _rightClicked;
-			}
+			get => !ReadOnly && _rightClicked;
 
 			set
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs
index a998f2e866..ca4a99c50b 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.Designer.cs
@@ -51,7 +51,6 @@
 			this.groupBox1.TabIndex = 1;
 			this.groupBox1.TabStop = false;
 			this.groupBox1.Text = "Discs";
-			this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);
 			// 
 			// lvDiscs
 			// 
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
index 2bdf09fc35..6366e785f8 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
@@ -1,10 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 using BizHawk.Client.Common;
@@ -29,7 +24,7 @@ namespace BizHawk.Client.EmuHawk
 		object _ownerEmulator;
 		public object OwnerEmulator
 		{
-			get { return _ownerEmulator; }
+			get => _ownerEmulator;
 			set
 			{
 				_ownerEmulator = value;
@@ -59,8 +54,7 @@ namespace BizHawk.Client.EmuHawk
 			int idx = 0;
 			foreach (var button in buttons)
 			{
-				var lvi = new ListViewItem();
-				lvi.Text = idx.ToString();
+				var lvi = new ListViewItem { Text = idx.ToString() };
 				lvi.SubItems.Add(button);
 				lvDiscs.Items.Add(lvi);
 				idx++;
@@ -105,9 +99,9 @@ namespace BizHawk.Client.EmuHawk
 
 					enableDiscs = btnOpen.Checked;
 
-					//since user hasnt ever needed to set the disc, make sure it's set here
-					//UPDATE: do it below
-					//Global.StickyXORAdapter.SetFloat(_discSelectName, psx.CurrentDiscIndexMounted);	
+					// since user hasn't ever needed to set the disc, make sure it's set here
+					// UPDATE: do it below
+					//Global.StickyXORAdapter.SetFloat(_discSelectName, psx.CurrentDiscIndexMounted);
 				}
 				else
 				{
@@ -128,8 +122,8 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			//make sure we try to keep something selected here, for clarity.
-			//but maybe later we'll just make it so that unselecting means no disc and dont display the disc 0
+			// make sure we try to keep something selected here, for clarity.
+			// but maybe later we'll just make it so that unselecting means no disc and don't display the disc 0
 			if (lvDiscs.SelectedIndices.Count == 0)
 				lvDiscs.SelectedIndices.Add(0);
 		}
@@ -143,11 +137,6 @@ namespace BizHawk.Client.EmuHawk
 
 		#endregion //IVirtualPadControl
 
-		private void groupBox1_Enter(object sender, EventArgs e)
-		{
-
-		}
-
 		private void lvDiscs_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			//not a valid way to fight unselection, it results in craptons of ping-ponging logic and eventual malfunction
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
index 0710804b03..0ec7705863 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
@@ -76,10 +76,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool ReadOnly
 		{
-			get
-			{
-				return _readonly;
-			}
+			get => _readonly;
 
 			set
 			{
@@ -106,14 +103,11 @@ namespace BizHawk.Client.EmuHawk
 		#endregion
 
 		// Size of the extra controls to the right / bottom of the target panel at 96 DPI
-		private Size PaddingSize
-		{
-			get { return new Size(0, 30); }
-		}
+		private Size PaddingSize => new Size(0, 30);
 
 		public Size TargetSize
 		{
-			get { return TargetPanel.Size; }
+			get => TargetPanel.Size;
 			set
 			{
 				TargetPanel.Size = value;
@@ -171,11 +165,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public int X
 		{
-			get
-			{
-				return _overrideX ?? (int)(Global.StickyXORAdapter.GetFloat(XName) / MultiplierX);
-			}
-
+			get => _overrideX ?? (int)(Global.StickyXORAdapter.GetFloat(XName) / MultiplierX);
 			set
 			{
 				if (value < 0)
@@ -198,11 +188,7 @@ namespace BizHawk.Client.EmuHawk
 		}
 		public int Y
 		{
-			get
-			{
-				return _overrideY ?? (int)(Global.StickyXORAdapter.GetFloat(YName) / MultiplierY);
-			}
-
+			get => _overrideY ?? (int)(Global.StickyXORAdapter.GetFloat(YName) / MultiplierY);
 			set
 			{
 				if (value < 0)
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/components/AnalogStickPanel.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/components/AnalogStickPanel.cs
index e85d267ea9..acb6c08f37 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/components/AnalogStickPanel.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/components/AnalogStickPanel.cs
@@ -16,10 +16,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public int X
 		{
-			get
-			{
-				return _x;
-			}
+			get => _x;
 			set
 			{
 				_x = RangeX.Constrain(value);
@@ -29,10 +26,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public int Y
 		{
-			get
-			{
-				return _y;
-			}
+			get => _y;
 			set
 			{
 				_y = RangeY.Constrain(value);
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs
index bd99f5a605..e5322fd38a 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs
@@ -32,12 +32,7 @@
 			System.Windows.Forms.ToolStripMenuItem SearchMenuItem;
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RamSearch));
 			this.TotalSearchLabel = new System.Windows.Forms.Label();
-			this.WatchListView = new BizHawk.Client.EmuHawk.PlatformAgnosticVirtualListView();
-			this.AddressColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.ValueColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.PreviousColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.ChangesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.WatchListView = new InputRoll();
 			this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.DoSearchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.NewSearchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -185,62 +180,29 @@
 			// WatchListView
 			// 
 			this.WatchListView.AllowColumnReorder = true;
+			this.WatchListView.AllowColumnResize = true;
 			this.WatchListView.AllowDrop = true;
 			this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.WatchListView.BlazingFast = false;
-			this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.AddressColumn,
-            this.ValueColumn,
-            this.PreviousColumn,
-            this.ChangesColumn,
-            this.DiffColumn});
 			this.WatchListView.ContextMenuStrip = this.ListViewContextMenu;
 			this.WatchListView.FullRowSelect = true;
 			this.WatchListView.GridLines = true;
-			this.WatchListView.HideSelection = false;
-			this.WatchListView.ItemCount = 0;
+			this.WatchListView.RowCount = 0;
 			this.WatchListView.Location = new System.Drawing.Point(9, 65);
 			this.WatchListView.Name = "WatchListView";
-			this.WatchListView.SelectAllInProgress = false;
-			this.WatchListView.selectedItem = -1;
 			this.WatchListView.Size = new System.Drawing.Size(230, 366);
 			this.WatchListView.TabIndex = 1;
-			this.WatchListView.UseCompatibleStateImageBehavior = false;
 			this.WatchListView.UseCustomBackground = true;
-			this.WatchListView.View = System.Windows.Forms.View.Details;
-			this.WatchListView.VirtualMode = true;
+			this.WatchListView.MultiSelect = true;
+			this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
 			this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged);
 			this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragDrop);
 			this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper);
 			this.WatchListView.Enter += new System.EventHandler(this.WatchListView_Enter);
+			this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
 			this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick);
 			// 
-			// AddressColumn
-			// 
-			this.AddressColumn.Text = "Address";
-			this.AddressColumn.Width = 61;
-			// 
-			// ValueColumn
-			// 
-			this.ValueColumn.Text = "Value";
-			this.ValueColumn.Width = 48;
-			// 
-			// PreviousColumn
-			// 
-			this.PreviousColumn.Text = "Prev";
-			this.PreviousColumn.Width = 48;
-			// 
-			// ChangesColumn
-			// 
-			this.ChangesColumn.Text = "Changes";
-			this.ChangesColumn.Width = 55;
-			// 
-			// DiffColumn
-			// 
-			this.DiffColumn.Text = "Diff";
-			// 
 			// ListViewContextMenu
 			// 
 			this.ListViewContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1419,11 +1381,7 @@
 		#endregion
 
 		private System.Windows.Forms.Label TotalSearchLabel;
-		BizHawk.Client.EmuHawk.PlatformAgnosticVirtualListView WatchListView;
-		private System.Windows.Forms.ColumnHeader AddressColumn;
-		private System.Windows.Forms.ColumnHeader ValueColumn;
-		private System.Windows.Forms.ColumnHeader PreviousColumn;
-		private System.Windows.Forms.ColumnHeader ChangesColumn;
+		InputRoll WatchListView;
 		private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem OpenMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem SaveAsMenuItem;
@@ -1527,7 +1485,6 @@
 		private WatchValueBox DifferenceBox;
 		private System.Windows.Forms.ToolStripMenuItem AutoSearchMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
-		private System.Windows.Forms.ColumnHeader DiffColumn;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
 		private System.Windows.Forms.ToolStripButton UndoToolBarButton;
 		private System.Windows.Forms.ToolStripButton RedoToolBarItem;
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
index 476e1113b4..6d455a25a9 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
@@ -51,41 +51,15 @@ namespace BizHawk.Client.EmuHawk
 			SetStyle(ControlStyles.UserPaint, true);
 			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
 			InitializeComponent();
-
-			SetupListViewSettings();
-
+			WatchListView.QueryItemText += ListView_QueryItemText;
+			WatchListView.QueryItemBkColor += ListView_QueryItemBkColor;
 			Closing += (o, e) => SaveConfigSettings();
 
 			_sortedColumn = "";
 			_sortReverse = false;
 
 			Settings = new RamSearchSettings();
-		}
-
-		private void SetupListViewSettings()
-		{
-			WatchListView.BorderColor = System.Drawing.Color.Black;
-			WatchListView.BorderSize = 1;
-			WatchListView.MultiSelect = true;
-			WatchListView.CellWidthPadding = 2;
-			WatchListView.CellHeightPadding = 1;
-			WatchListView.ScrollSpeed = 3;
-			WatchListView.AllowColumnResize = true;
-			WatchListView.AllowColumnReorder = true;
-			WatchListView.ColumnHeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 7.7F);
-			WatchListView.ColumnHeaderFontColor = System.Drawing.Color.Black;
-			WatchListView.ColumnHeaderBackgroundColor = System.Drawing.Color.White;
-			WatchListView.ColumnHeaderBackgroundHighlightColor = System.Drawing.Color.LightSteelBlue;
-			WatchListView.ColumnHeaderOutlineColor = System.Drawing.Color.LightGray;
-			WatchListView.CellFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular, GraphicsUnit.Point);
-			WatchListView.CellFontColor = System.Drawing.Color.Black;
-			WatchListView.CellBackgroundColor = System.Drawing.Color.White;
-
-			WatchListView.QueryItemText += ListView_QueryItemText;
-			WatchListView.QueryItemBkColor += ListView_QueryItemBkColor;
-			WatchListView.ColumnClick += WatchListView_ColumnClick;
-			WatchListView.KeyDown += WatchListView_KeyDown;
-			WatchListView.VirtualMode = true;
+			SetColumns();
 		}
 
 		[RequiredService]
@@ -136,15 +110,20 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ColumnToggleCallback()
 		{
-			SaveColumnInfo(WatchListView, Settings.Columns);
-			LoadColumnInfo(WatchListView, Settings.Columns);
+			Settings.Columns = WatchListView.AllColumns;
 		}
 
 		private void RamSearch_Load(object sender, EventArgs e)
 		{
+			// Hack for previous config settings
+			if (Settings.Columns.Any(c => string.IsNullOrWhiteSpace(c.Text)))
+			{
+				Settings = new RamSearchSettings();
+			}
+
 			TopMost = Settings.TopMost;
 
-			RamSearchMenu.Items.Add(Settings.Columns.GenerateColumnsMenu(ColumnToggleCallback));
+			RamSearchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback));
 
 			_settings = new RamSearchEngine.Settings(MemoryDomains);
 			_searches = new RamSearchEngine(_settings, MemoryDomains);
@@ -187,7 +166,7 @@ namespace BizHawk.Client.EmuHawk
 			ErrorIconButton.Visible = _searches.OutOfRangeAddress.Any();
 		}
 
-		private void ListView_QueryItemBkColor(int index, int column, ref Color color)
+		private void ListView_QueryItemBkColor(int index, RollColumn column, ref Color color)
 		{
 			if (_searches.Count > 0)
 			{
@@ -216,7 +195,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void ListView_QueryItemText(int index, int column, out string text)
+		private void ListView_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
 		{
 			text = "";
 
@@ -225,7 +204,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			var columnName = WatchListView.AllColumns[column].Name;
+			var columnName = column.Name;
 			switch (columnName)
 			{
 				case WatchList.ADDRESS:
@@ -263,7 +242,19 @@ namespace BizHawk.Client.EmuHawk
 
 			TopMost = Settings.TopMost;
 
-			LoadColumnInfo(WatchListView, Settings.Columns);
+			WatchListView.AllColumns.Clear();
+			SetColumns();
+		}
+
+		private void SetColumns()
+		{
+			foreach (var column in Settings.Columns)
+			{
+				if (WatchListView.AllColumns[column.Name] == null)
+				{
+					WatchListView.AllColumns.Add(column);
+				}
+			}
 		}
 
 		#endregion
@@ -275,7 +266,7 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		private void UpdateList()
 		{
-			WatchListView.ItemCount = _searches.Count;
+			WatchListView.RowCount = _searches.Count;
 			SetTotal();
 		}
 
@@ -305,9 +296,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 
 				_forcePreviewClear = false;
-				WatchListView.BlazingFast = true;
 				WatchListView.Invalidate();
-				WatchListView.BlazingFast = false;
 			}
 		}
 
@@ -337,7 +326,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SaveConfigSettings()
 		{
-			SaveColumnInfo(WatchListView, Settings.Columns);
+			Settings.Columns = WatchListView.AllColumns;
 
 			if (WindowState == FormWindowState.Normal)
 			{
@@ -576,15 +565,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private IEnumerable<int> SelectedIndices => WatchListView.SelectedRows;
 
-		private IEnumerable<Watch> SelectedItems
-		{
-			get { return SelectedIndices.Select(index => _searches[index]); }
-		}
+		private IEnumerable<Watch> SelectedItems => SelectedIndices.Select(index => _searches[index]);
 
-		private IEnumerable<Watch> SelectedWatches
-		{
-			get { return SelectedItems.Where(x => !x.IsSeparator); }
-		}
+		private IEnumerable<Watch> SelectedWatches => SelectedItems.Where(x => !x.IsSeparator);
 
 		private void SetRemovedMessage(int val)
 		{
@@ -782,8 +765,8 @@ namespace BizHawk.Client.EmuHawk
 		private void SetReboot(bool rebootNeeded)
 		{
 			RebootToolBarSeparator.Visible =
-					RebootToolbarButton.Visible =
-					rebootNeeded;
+				RebootToolbarButton.Visible =
+				rebootNeeded;
 		}
 
 		private void SetToDetailedMode()
@@ -794,10 +777,27 @@ namespace BizHawk.Client.EmuHawk
 			DifferenceRadio.Enabled = true;
 			DifferentByBox.Enabled = true;
 			ClearChangeCountsToolBarItem.Enabled = true;
-			WatchListView.AllColumns[WatchList.CHANGES].Width = Settings.Columns[WatchList.CHANGES].Width;
+
+			WatchListView.AllColumns[WatchList.CHANGES].Visible = true;
+			ChangesMenuItem.Checked = true;
+
+			ColumnToggleCallback();
 			SetReboot(true);
 		}
 
+		private ToolStripMenuItem ChangesMenuItem
+		{
+			get
+			{
+				var subMenu = (ToolStripMenuItem)RamSearchMenu.Items
+					.Cast<ToolStripItem>()
+					.Single(t => t.Name == "GeneratedColumnsSubMenu"); // TODO - make name a constant
+				return subMenu.DropDownItems
+					.Cast<ToolStripMenuItem>()
+					.Single(t => t.Name == WatchList.CHANGES);
+			}
+		}
+
 		private void SetToFastMode()
 		{
 			_settings.Mode = RamSearchEngine.Settings.SearchMode.Fast;
@@ -817,8 +817,10 @@ namespace BizHawk.Client.EmuHawk
 				PreviousValueRadio.Checked = true;
 			}
 
-			Settings.Columns[WatchList.CHANGES].Width = WatchListView.AllColumns[WatchList.CHANGES].Width.Value;
-			WatchListView.AllColumns[WatchList.CHANGES].Width = 0;
+			WatchListView.AllColumns[WatchList.CHANGES].Visible = false;
+			ChangesMenuItem.Checked = false;
+
+			ColumnToggleCallback();
 			SetReboot(true);
 		}
 
@@ -831,7 +833,7 @@ namespace BizHawk.Client.EmuHawk
 				_searches.RemoveRange(indices);
 
 				UpdateList();
-				WatchListView.ClearSelectedRows();
+				WatchListView.DeselectAll();
 				ToggleSearchDependentToolBarItems();
 			}
 		}
@@ -898,7 +900,7 @@ namespace BizHawk.Client.EmuHawk
 					InitialLocation = this.ChildPointToScreen(WatchListView)
 				};
 
-				poke.SetWatch(SelectedIndices.Select(t => _searches[t]).ToList());
+				poke.SetWatch(SelectedIndices.Select(t => _searches[t]));
 				poke.ShowHawkDialog();
 
 				UpdateList();
@@ -922,7 +924,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void GoToSpecifiedAddress()
 		{
-			WatchListView.ClearSelectedRows();
+			WatchListView.DeselectAll();
 			var prompt = new InputPrompt
 			{
 				Text = "Go to Address",
@@ -939,8 +941,8 @@ namespace BizHawk.Client.EmuHawk
 					{
 						if (_searches[index].Address == addr)
 						{
-							WatchListView.SelectItem(index, true);
-							WatchListView.ensureVisible();
+							WatchListView.SelectRow(index, true);
+							WatchListView.ScrollToIndex(index);
 							return; // Don't re-show dialog on success
 						}
 					}
@@ -966,13 +968,13 @@ namespace BizHawk.Client.EmuHawk
 		{
 			public RamSearchSettings()
 			{
-				Columns = new ColumnList
+				Columns = new List<RollColumn>
 				{
-					new Column { Name = WatchList.ADDRESS, Visible = true, Index = 0, Width = 60 },
-					new Column { Name = WatchList.VALUE, Visible = true, Index = 1, Width = 59 },
-					new Column { Name = WatchList.PREV, Visible = true, Index = 2, Width = 59 },
-					new Column { Name = WatchList.CHANGES, Visible = true, Index = 3, Width = 55 },
-					new Column { Name = WatchList.DIFF, Visible = false, Index = 4, Width = 59 },
+					new RollColumn { Text = "Address", Name = WatchList.ADDRESS, Visible = true, Width = 60, Type = ColumnType.Text },
+					new RollColumn { Text = "Value", Name = WatchList.VALUE, Visible = true, Width = 59, Type = ColumnType.Text },
+					new RollColumn { Text = "Prev", Name = WatchList.PREV, Visible = true, Width = 59, Type = ColumnType.Text },
+					new RollColumn { Text = "Changes", Name = WatchList.CHANGES, Visible = true, Width = 60, Type = ColumnType.Text },
+					new RollColumn { Text = "Diff", Name = WatchList.DIFF, Visible = false, Width = 59, Type = ColumnType.Text },
 				};
 
 				PreviewMode = true;
@@ -980,7 +982,7 @@ namespace BizHawk.Client.EmuHawk
 				AutoSearchTakeLagFramesIntoAccount = true;
 			}
 
-			public ColumnList Columns { get; }
+			public List<RollColumn> Columns { get; set; }
 			public bool PreviewMode { get; set; }
 			public bool AlwaysExcludeRamWatch { get; set; }
 			public bool AutoSearchTakeLagFramesIntoAccount { get; set; }
@@ -1408,9 +1410,9 @@ namespace BizHawk.Client.EmuHawk
 			RamSearchMenu.Items.Remove(
 				RamSearchMenu.Items
 					.OfType<ToolStripMenuItem>()
-					.First(x => x.Name == "GeneratedColumnsSubMenu"));
+					.Single(x => x.Name == "GeneratedColumnsSubMenu"));
 
-			RamSearchMenu.Items.Add(Settings.Columns.GenerateColumnsMenu(ColumnToggleCallback));
+			RamSearchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback));
 
 			_settings = new RamSearchEngine.Settings(MemoryDomains);
 			if (_settings.Mode == RamSearchEngine.Settings.SearchMode.Fast)
@@ -1419,7 +1421,9 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			RefreshFloatingWindowControl(Settings.FloatingWindow);
-			LoadColumnInfo(WatchListView, Settings.Columns);
+
+			WatchListView.AllColumns.Clear();
+			SetColumns();
 		}
 
 		#endregion
@@ -1731,19 +1735,12 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else if (e.KeyCode == Keys.Escape && !e.Control && !e.Alt && !e.Shift)
 			{
-				WatchListView.ClearSelectedRows();
+				WatchListView.DeselectAll();
 			}
-
-			base.OnKeyDown(e);
 		}
 
 		private void WatchListView_SelectedIndexChanged(object sender, EventArgs e)
 		{
-			if (WatchListView.SelectAllInProgress)
-			{
-				return;
-			}
-
 			RemoveToolBarItem.Enabled =
 				AddToRamWatchToolBarItem.Enabled =
 				SelectedIndices.Any();
@@ -1754,19 +1751,14 @@ namespace BizHawk.Client.EmuHawk
 				_searches.Domain.CanPoke();
 		}
 
-		private void WatchListView_VirtualItemsSelectionRangeChanged(object sender, ListViewVirtualItemsSelectionRangeChangedEventArgs e)
-		{
-			WatchListView_SelectedIndexChanged(sender, e);
-		}
-
 		private void WatchListView_Enter(object sender, EventArgs e)
 		{
 			WatchListView.Refresh();
 		}
 
-		private void WatchListView_ColumnClick(object sender, PlatformAgnosticVirtualListView.ColumnClickEventArgs e)
+		private void WatchListView_ColumnClick(object sender, InputRoll.ColumnClickEventArgs e)
 		{
-			var column = WatchListView.AllColumns[WatchListView.AllColumns.IndexOf(e.Column)];
+			var column = e.Column;
 			if (column.Name != _sortedColumn)
 			{
 				_sortReverse = false;
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs
index cafc1c6a6d..a353a41066 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs
@@ -112,15 +112,7 @@
             this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
             this.RestoreWindowSizeMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.WatchListView = new BizHawk.Client.EmuHawk.VirtualListView();
-            this.AddressColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.ValueColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.PrevColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.ChangesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.TypeColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.DomainColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.NotesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.WatchListView = new InputRoll();
             this.ListViewContextMenu.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
@@ -886,100 +878,35 @@
             // 
             // WatchListView
             // 
+            this.WatchListView.AllowColumnResize = true;
+            this.WatchListView.AllowColumnReorder = true;
+            this.WatchListView.FullRowSelect = true;
+            this.WatchListView.MultiSelect = true;
             this.WatchListView.AllowColumnReorder = true;
             this.WatchListView.AllowDrop = true;
             this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.WatchListView.AutoArrange = false;
-            this.WatchListView.BlazingFast = false;
-            this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.AddressColumn,
-            this.ValueColumn,
-            this.PrevColumn,
-            this.ChangesColumn,
-            this.DiffColumn,
-            this.TypeColumn,
-            this.DomainColumn,
-            this.NotesColumn});
             this.WatchListView.ContextMenuStrip = this.ListViewContextMenu;
             this.WatchListView.FullRowSelect = true;
             this.WatchListView.GridLines = true;
-            this.WatchListView.HideSelection = false;
-            this.WatchListView.ItemCount = 0;
             this.WatchListView.Location = new System.Drawing.Point(16, 76);
             this.WatchListView.Name = "WatchListView";
-            this.WatchListView.SelectAllInProgress = false;
-            this.WatchListView.selectedItem = -1;
-            this.WatchListView.Size = new System.Drawing.Size(332, 281);
+            this.WatchListView.Size = new System.Drawing.Size(363, 281);
             this.WatchListView.TabIndex = 2;
-            this.WatchListView.UseCompatibleStateImageBehavior = false;
             this.WatchListView.UseCustomBackground = true;
-            this.WatchListView.View = System.Windows.Forms.View.Details;
-            this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick);
+            this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick);
             this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged);
-            this.WatchListView.VirtualItemsSelectionRangeChanged += new System.Windows.Forms.ListViewVirtualItemsSelectionRangeChangedEventHandler(this.WatchListView_VirtualItemsSelectionRangeChanged);
             this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop);
             this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper);
             this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
             this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick);
             // 
-            // AddressColumn
-            // 
-            this.AddressColumn.Name = "AddressColumn";
-            this.AddressColumn.Text = "Address";
-            // 
-            // ValueColumn
-            // 
-            this.ValueColumn.Name = "ValueColumn";
-            this.ValueColumn.Text = "Value";
-            this.ValueColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.ValueColumn.Width = 59;
-            // 
-            // PrevColumn
-            // 
-            this.PrevColumn.Name = "PrevColumn";
-            this.PrevColumn.Text = "Prev";
-            this.PrevColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.PrevColumn.Width = 59;
-            // 
-            // ChangesColumn
-            // 
-            this.ChangesColumn.Name = "ChangesColumn";
-            this.ChangesColumn.Text = "Changes";
-            this.ChangesColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.ChangesColumn.Width = 54;
-            // 
-            // DiffColumn
-            // 
-            this.DiffColumn.Name = "DiffColumn";
-            this.DiffColumn.Text = "Diff";
-            this.DiffColumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.DiffColumn.Width = 59;
-            // 
-            // TypeColumn
-            // 
-            this.TypeColumn.Name = "TypeColumn";
-            this.TypeColumn.Text = "Type";
-            this.TypeColumn.Width = 55;
-            // 
-            // DomainColumn
-            // 
-            this.DomainColumn.Name = "DomainColumn";
-            this.DomainColumn.Text = "Domain";
-            this.DomainColumn.Width = 55;
-            // 
-            // NotesColumn
-            // 
-            this.NotesColumn.Name = "NotesColumn";
-            this.NotesColumn.Text = "Notes";
-            this.NotesColumn.Width = 128;
-            // 
             // RamWatch
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(364, 378);
+            this.ClientSize = new System.Drawing.Size(395, 378);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.WatchCountLabel);
             this.Controls.Add(this.toolStrip1);
@@ -1009,15 +936,7 @@
 
 		#endregion
 
-		private VirtualListView WatchListView;
-		private System.Windows.Forms.ColumnHeader AddressColumn;
-		private System.Windows.Forms.ColumnHeader ValueColumn;
-		private System.Windows.Forms.ColumnHeader PrevColumn;
-		private System.Windows.Forms.ColumnHeader ChangesColumn;
-		private System.Windows.Forms.ColumnHeader DiffColumn;
-		private System.Windows.Forms.ColumnHeader TypeColumn;
-		private System.Windows.Forms.ColumnHeader DomainColumn;
-		private System.Windows.Forms.ColumnHeader NotesColumn;
+		private InputRoll WatchListView;
 		private MenuStripEx RamWatchMenu;
 		private System.Windows.Forms.ToolStripMenuItem FileSubMenu;
 		private System.Windows.Forms.ToolStripMenuItem NewListMenuItem;
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index 18665e0382..71b1439ea7 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -42,7 +42,6 @@ namespace BizHawk.Client.EmuHawk
 
 			WatchListView.QueryItemText += WatchListView_QueryItemText;
 			WatchListView.QueryItemBkColor += WatchListView_QueryItemBkColor;
-			WatchListView.VirtualMode = true;
 			Closing += (o, e) =>
 			{
 				if (AskSaveChanges())
@@ -57,6 +56,20 @@ namespace BizHawk.Client.EmuHawk
 
 			_sortedColumn = "";
 			_sortReverse = false;
+
+
+			SetColumns();
+		}
+
+		private void SetColumns()
+		{
+			foreach (var column in Settings.Columns)
+			{
+				if (WatchListView.AllColumns[column.Name] == null)
+				{
+					WatchListView.AllColumns.Add(column);
+				}
+			}
 		}
 
 		[ConfigPersist]
@@ -66,49 +79,28 @@ namespace BizHawk.Client.EmuHawk
 		{
 			public RamWatchSettings()
 			{
-				Columns = new ColumnList
+				Columns = new List<RollColumn>
 				{
-					new Column { Name = WatchList.ADDRESS, Visible = true, Index = 0, Width = 60 },
-					new Column { Name = WatchList.VALUE, Visible = true, Index = 1, Width = 59 },
-					new Column { Name = WatchList.PREV, Visible = false, Index = 2, Width = 59 },
-					new Column { Name = WatchList.CHANGES, Visible = true, Index = 3, Width = 55 },
-					new Column { Name = WatchList.DIFF, Visible = false, Index = 4, Width = 59 },
-					new Column { Name = WatchList.TYPE, Visible = false, Index = 5, Width = 55 },
-					new Column { Name = WatchList.DOMAIN, Visible = true, Index = 6, Width = 55 },
-					new Column { Name = WatchList.NOTES, Visible = true, Index = 7, Width = 128 },
+					new RollColumn { Text = "Address", Name = WatchList.ADDRESS, Visible = true, Width = 60, Type = ColumnType.Text },
+					new RollColumn { Text = "Value", Name = WatchList.VALUE, Visible = true, Width = 59, Type = ColumnType.Text },
+					new RollColumn { Text = "Prev", Name = WatchList.PREV, Visible = false, Width = 59, Type = ColumnType.Text },
+					new RollColumn { Text = "Changes", Name = WatchList.CHANGES, Visible = true, Width = 60, Type = ColumnType.Text },
+					new RollColumn { Text = "Diff", Name = WatchList.DIFF, Visible = false, Width = 59, Type = ColumnType.Text },
+					new RollColumn { Text = "Type", Name = WatchList.TYPE, Visible = false, Width = 55, Type = ColumnType.Text },
+					new RollColumn { Text = "Domain", Name = WatchList.DOMAIN, Visible = true, Width = 55, Type = ColumnType.Text },
+					new RollColumn { Text = "Notes", Name = WatchList.NOTES, Visible = true, Width = 128, Type = ColumnType.Text }
 				};
 			}
 
-			public ColumnList Columns { get; set; }
+			public List<RollColumn> Columns { get; set; }
 		}
 
-		private IEnumerable<int> SelectedIndices => WatchListView.SelectedIndices.Cast<int>();
+		private IEnumerable<int> SelectedIndices => WatchListView.SelectedRows;
+		private IEnumerable<Watch> SelectedItems => SelectedIndices.Select(index => _watches[index]);
+		private IEnumerable<Watch> SelectedWatches => SelectedItems.Where(x => !x.IsSeparator);
+		private IEnumerable<Watch> SelectedSeparators => SelectedItems.Where(x => x.IsSeparator);
 
-		private IEnumerable<Watch> SelectedItems
-		{
-			get { return SelectedIndices.Select(index => _watches[index]); }
-		}
-
-		private IEnumerable<Watch> SelectedWatches
-		{
-			get { return SelectedItems.Where(x => !x.IsSeparator); }
-		}
-
-		private IEnumerable<Watch> SelectedSeparators
-		{
-			get
-			{
-				return SelectedItems.Where(x => x.IsSeparator);
-			}
-		}
-
-		public IEnumerable<Watch> Watches
-		{
-			get
-			{
-				return _watches.Where(x => !x.IsSeparator);
-			}
-		}
+		public IEnumerable<Watch> Watches => _watches.Where(x => !x.IsSeparator);
 
 		public bool UpdateBefore => false;
 
@@ -117,7 +109,7 @@ namespace BizHawk.Client.EmuHawk
 		public void AddWatch(Watch watch)
 		{
 			_watches.Add(watch);
-			WatchListView.ItemCount = _watches.Count;
+			WatchListView.RowCount = _watches.Count;
 			UpdateValues();
 			UpdateWatchCount();
 			Changes();
@@ -174,7 +166,7 @@ namespace BizHawk.Client.EmuHawk
 				else
 				{
 					Global.Config.RecentWatches.Add(path);
-					WatchListView.ItemCount = _watches.Count;
+					WatchListView.RowCount = _watches.Count;
 					UpdateWatchCount();
 					UpdateStatusBar();
 					_watches.Changes = false;
@@ -195,7 +187,7 @@ namespace BizHawk.Client.EmuHawk
 				if (result)
 				{
 					_watches.Load(file.FullName, append);
-					WatchListView.ItemCount = _watches.Count;
+					WatchListView.RowCount = _watches.Count;
 					UpdateWatchCount();
 					Global.Config.RecentWatches.Add(_watches.CurrentFileName);
 					UpdateStatusBar();
@@ -271,10 +263,8 @@ namespace BizHawk.Client.EmuHawk
 					return;
 				}
 
-				WatchListView.BlazingFast = true;
 				WatchListView.UseCustomBackground = NeedsBackground;
 				WatchListView.Invalidate();
-				WatchListView.BlazingFast = false;
 			}
 		}
 
@@ -387,7 +377,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void FullyUpdateWatchList()
 		{
-			WatchListView.ItemCount = _watches.Count;
+			WatchListView.RowCount = _watches.Count;
 			UpdateWatchCount();
 			UpdateStatusBar();
 			UpdateValues();
@@ -422,7 +412,7 @@ namespace BizHawk.Client.EmuHawk
 					if (duplicate)
 					{
 						_watches.AddRange(we.Watches);
-						WatchListView.ItemCount = _watches.Count;
+						WatchListView.RowCount = _watches.Count;
 						UpdateWatchCount();
 					}
 					else
@@ -514,7 +504,8 @@ namespace BizHawk.Client.EmuHawk
 				Size = Settings.WindowSize;
 			}
 
-			LoadColumnInfo(WatchListView, Settings.Columns);
+			WatchListView.AllColumns.Clear();
+			SetColumns();
 		}
 
 		private void NewWatchList(bool suppressAsk)
@@ -528,7 +519,7 @@ namespace BizHawk.Client.EmuHawk
 			if (result || suppressAsk)
 			{
 				_watches.Clear();
-				WatchListView.ItemCount = _watches.Count;
+				WatchListView.RowCount = _watches.Count;
 				UpdateWatchCount();
 				UpdateStatusBar();
 				_sortReverse = false;
@@ -541,9 +532,8 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void OrderColumn(int index)
+		private void OrderColumn(RollColumn column)
 		{
-			var column = WatchListView.Columns[index];
 			if (column.Name != _sortedColumn)
 			{
 				_sortReverse = false;
@@ -568,7 +558,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SaveConfigSettings()
 		{
-			SaveColumnInfo(WatchListView, Settings.Columns);
+			Settings.Columns = WatchListView.AllColumns;
 
 			if (WindowState == FormWindowState.Normal)
 			{
@@ -610,42 +600,38 @@ namespace BizHawk.Client.EmuHawk
 			WatchCountLabel.Text = _watches.WatchCount + (_watches.WatchCount == 1 ? " watch" : " watches");
 		}
 
-		private void WatchListView_QueryItemBkColor(int index, int column, ref Color color)
+		private void WatchListView_QueryItemBkColor(int index, RollColumn column, ref Color color)
 		{
 			if (index >= _watches.Count)
 			{
 				return;
 			}
 
-			if (column == 0)
-			{
-				if (_watches[index].IsSeparator)
-				{
-					color = BackColor;
-				}
-				else if (_watches[index].Address >= _watches[index].Domain.Size)
-				{
-					color = Color.PeachPuff;
-				}
-				else if (Global.CheatList.IsActive(_watches[index].Domain, _watches[index].Address))
-				{
-					color = Color.LightCyan;
-				}
-			}
-		}
-
-		private void WatchListView_QueryItemText(int index, int column, out string text)
-		{
-			text = "";
-
-			if (index >= _watches.Count)
-			{
-				return;
-			}
-
 			if (_watches[index].IsSeparator)
 			{
-				if (WatchListView.Columns[column].Name == WatchList.ADDRESS)
+				color = BackColor;
+			}
+			else if (_watches[index].Address >= _watches[index].Domain.Size)
+			{
+				color = Color.PeachPuff;
+			}
+			else if (Global.CheatList.IsActive(_watches[index].Domain, _watches[index].Address))
+			{
+				color = Color.LightCyan;
+			}
+		}
+
+		private void WatchListView_QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY)
+		{
+			text = "";
+			if (index >= _watches.Count)
+			{
+				return;
+			}
+
+			if (_watches[index].IsSeparator)
+			{
+				if (column.Name == WatchList.ADDRESS)
 				{
 					text = _watches[index].Notes;
 				}
@@ -653,9 +639,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			var columnName = WatchListView.Columns[column].Name;
-
-			switch (columnName)
+			switch (column.Name)
 			{
 				case WatchList.ADDRESS:
 					text = _watches[index].AddressString;
@@ -770,8 +754,8 @@ namespace BizHawk.Client.EmuHawk
 
 		private MemoryDomain CurrentDomain
 		{
-			get { return _currentDomain ?? MemoryDomains.MainMemory; }
-			set { _currentDomain = value; }
+			get => _currentDomain ?? MemoryDomains.MainMemory;
+			set => _currentDomain = value;
 		}
 
 		private void MemoryDomainsSubMenu_DropDownOpened(object sender, EventArgs e)
@@ -796,7 +780,7 @@ namespace BizHawk.Client.EmuHawk
 				_watches.Add(we.Watches[0]);
 				Changes();
 				UpdateWatchCount();
-				WatchListView.ItemCount = _watches.Count;
+				WatchListView.RowCount = _watches.Count;
 				UpdateValues();
 			}
 		}
@@ -816,7 +800,7 @@ namespace BizHawk.Client.EmuHawk
 					_watches.Remove(item);
 				}
 
-				WatchListView.ItemCount = _watches.Count;
+				WatchListView.RowCount = _watches.Count;
 				UpdateValues();
 				UpdateWatchCount();
 			}
@@ -870,7 +854,7 @@ namespace BizHawk.Client.EmuHawk
 				_watches.Add(SeparatorWatch.Instance);
 			}
 
-			WatchListView.ItemCount = _watches.Count;
+			WatchListView.RowCount = _watches.Count;
 			Changes();
 			UpdateWatchCount();
 		}
@@ -898,15 +882,15 @@ namespace BizHawk.Client.EmuHawk
 
 			Changes();
 
-			var indices = indexes.Select(t => t - 1).ToList();
+			var indices = indexes.Select(t => t - 1);
 
-			WatchListView.SelectedIndices.Clear();
+			WatchListView.DeselectAll();
 			foreach (var t in indices)
 			{
-				WatchListView.SelectItem(t, true);
+				WatchListView.SelectRow(t, true);
 			}
 
-			WatchListView.ItemCount = _watches.Count;
+			WatchListView.RowCount = _watches.Count;
 		}
 
 		private void MoveDownMenuItem_Click(object sender, EventArgs e)
@@ -924,16 +908,16 @@ namespace BizHawk.Client.EmuHawk
 				_watches.Insert(indices[i] + 1, watch);
 			}
 
-			var newIndices = indices.Select(t => t + 1).ToList();
+			var newIndices = indices.Select(t => t + 1);
 
-			WatchListView.SelectedIndices.Clear();
+			WatchListView.DeselectAll();
 			foreach (var t in newIndices)
 			{
-				WatchListView.SelectItem(t, true);
+				WatchListView.SelectRow(t, true);
 			}
 
 			Changes();
-			WatchListView.ItemCount = _watches.Count;
+			WatchListView.RowCount = _watches.Count;
 		}
 
 		private void MoveTopMenuItem_Click(object sender, EventArgs e)
@@ -954,13 +938,13 @@ namespace BizHawk.Client.EmuHawk
 
 			Changes();
 
-			WatchListView.SelectedIndices.Clear();
+			WatchListView.DeselectAll();
 			foreach (var t in indexes)
 			{
-				WatchListView.SelectItem(t, true);
+				WatchListView.SelectRow(t, true);
 			}
 
-			WatchListView.ItemCount = _watches.Count;
+			WatchListView.RowCount = _watches.Count;
 		}
 
 		private void MoveBottomMenuItem_Click(object sender, EventArgs e)
@@ -984,14 +968,14 @@ namespace BizHawk.Client.EmuHawk
 				newInd.Add(x);
 			}
 
-			WatchListView.SelectedIndices.Clear();
+			WatchListView.DeselectAll();
 			foreach (var t in newInd)
 			{
-				WatchListView.SelectItem(t, true);
+				WatchListView.SelectRow(t, true);
 			}
 
 			Changes();
-			WatchListView.ItemCount = _watches.Count;
+			WatchListView.RowCount = _watches.Count;
 		}
 
 		private void SelectAllMenuItem_Click(object sender, EventArgs e)
@@ -1078,12 +1062,14 @@ namespace BizHawk.Client.EmuHawk
 					.OfType<ToolStripMenuItem>()
 					.First(x => x.Name == "GeneratedColumnsSubMenu"));
 
-			RamWatchMenu.Items.Add(Settings.Columns.GenerateColumnsMenu(ColumnToggleCallback));
+			RamWatchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback));
 
 			Global.Config.DisplayRamWatch = false;
 
 			RefreshFloatingWindowControl(Settings.FloatingWindow);
-			LoadColumnInfo(WatchListView, Settings.Columns);
+
+			WatchListView.AllColumns.Clear();
+			SetColumns();
 		}
 
 		#endregion
@@ -1092,10 +1078,16 @@ namespace BizHawk.Client.EmuHawk
 
 		private void NewRamWatch_Load(object sender, EventArgs e)
 		{
+			// Hack for previous config settings
+			if (Settings.Columns.Any(c => string.IsNullOrWhiteSpace(c.Text)))
+			{
+				Settings = new RamWatchSettings();
+			}
+
 			TopMost = Settings.TopMost;
 			_watches = new WatchList(MemoryDomains, Emu.SystemId);
 			LoadConfigSettings();
-			RamWatchMenu.Items.Add(Settings.Columns.GenerateColumnsMenu(ColumnToggleCallback));
+			RamWatchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback));
 			UpdateStatusBar();
 
 			PokeAddressToolBarItem.Enabled =
@@ -1106,8 +1098,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ColumnToggleCallback()
 		{
-			SaveColumnInfo(WatchListView, Settings.Columns);
-			LoadColumnInfo(WatchListView, Settings.Columns);
+			Settings.Columns = WatchListView.AllColumns;
 		}
 
 		private void NewRamWatch_Activated(object sender, EventArgs e)
@@ -1122,7 +1113,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				_watches.Load(filePaths[0], append: false);
 				Global.Config.RecentWatches.Add(_watches.CurrentFileName);
-				WatchListView.ItemCount = _watches.Count;
+				WatchListView.RowCount = _watches.Count;
 			}
 		}
 
@@ -1133,7 +1124,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ListViewContextMenu_Opening(object sender, CancelEventArgs e)
 		{
-			var indexes = WatchListView.SelectedIndices;
+			var indexes = WatchListView.SelectedRows.ToList();
 
 			EditContextMenuItem.Visible =
 				RemoveContextMenuItem.Visible =
@@ -1259,11 +1250,6 @@ namespace BizHawk.Client.EmuHawk
 
 		private void WatchListView_SelectedIndexChanged(object sender, EventArgs e)
 		{
-			if (WatchListView.SelectAllInProgress)
-			{
-				return;
-			}
-
 			PokeAddressToolBarItem.Enabled =
 				FreezeAddressToolBarItem.Enabled =
 				SelectedIndices.Any() &&
@@ -1275,7 +1261,8 @@ namespace BizHawk.Client.EmuHawk
 			EditWatch();
 		}
 
-		private void WatchListView_ColumnClick(object sender, ColumnClickEventArgs e)
+		// InputRoll TODO
+		private void WatchListView_ColumnClick(object sender, InputRoll.ColumnClickEventArgs e)
 		{
 			OrderColumn(e.Column);
 		}
@@ -1284,14 +1271,14 @@ namespace BizHawk.Client.EmuHawk
 		{
 			var items = _watches
 				.Where(watch => watch.Address >= watch.Domain.Size)
-				.ToList();
+				.ToList(); // enumerate because _watches is about to be changed
 
 			foreach (var item in items)
 			{
 				_watches.Remove(item);
 			}
 
-			WatchListView.ItemCount = _watches.Count;
+			WatchListView.RowCount = _watches.Count;
 			UpdateValues();
 			UpdateWatchCount();
 			UpdateStatusBar();
@@ -1300,14 +1287,6 @@ namespace BizHawk.Client.EmuHawk
 		#endregion
 		#endregion
 
-		private void WatchListView_VirtualItemsSelectionRangeChanged(object sender, ListViewVirtualItemsSelectionRangeChangedEventArgs e)
-		{
-			PokeAddressToolBarItem.Enabled =
-				FreezeAddressToolBarItem.Enabled =
-				SelectedIndices.Any() &&
-				SelectedWatches.All(w => w.Domain.CanPoke());
-		}
-
 		// Stupid designer
 		protected void DragEnterWrapper(object sender, DragEventArgs e)
 		{
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
index 9e6a457be7..ef5484ea50 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
@@ -13,8 +13,6 @@ namespace BizHawk.Client.EmuHawk
 	{
 		public enum Mode { New, Duplicate, Edit }
 
-		private readonly List<Watch> _watchList = new List<Watch>();
-
 		public Emu.IMemoryDomains MemoryDomains { get; set; }
 
 		private Mode _mode = Mode.New;
@@ -23,7 +21,7 @@ namespace BizHawk.Client.EmuHawk
 		private bool _changedSize;
 		private bool _changedDisplayType;
 
-		public List<Watch> Watches => _watchList;
+		public List<Watch> Watches { get; } = new List<Watch>();
 
 		public Point InitialLocation { get; set;  } = new Point(0, 0);
 
@@ -63,7 +61,7 @@ namespace BizHawk.Client.EmuHawk
 					break;
 				case Mode.Duplicate:
 				case Mode.Edit:
-					switch (_watchList[0].Size)
+					switch (Watches[0].Size)
 					{
 						case WatchSize.Byte:
 							SizeDropDown.SelectedItem = SizeDropDown.Items[0];
@@ -76,28 +74,28 @@ namespace BizHawk.Client.EmuHawk
 							break;
 					}
 
-					var index = DisplayTypeDropDown.Items.IndexOf(Watch.DisplayTypeToString(_watchList[0].Type));
+					var index = DisplayTypeDropDown.Items.IndexOf(Watch.DisplayTypeToString(Watches[0].Type));
 					DisplayTypeDropDown.SelectedItem = DisplayTypeDropDown.Items[index];
 
-					if (_watchList.Count > 1)
+					if (Watches.Count > 1)
 					{
 						NotesBox.Enabled = false;
 						NotesBox.Text = "";
 
 						AddressBox.Enabled = false;
-						AddressBox.Text = _watchList.Select(a => a.AddressString).Aggregate((addrStr, nextStr) => $"{addrStr},{nextStr}");
+						AddressBox.Text = Watches.Select(a => a.AddressString).Aggregate((addrStr, nextStr) => $"{addrStr},{nextStr}");
 
 						BigEndianCheckBox.ThreeState = true;
 
-						if (_watchList.Select(s => s.Size).Distinct().Count() > 1)
+						if (Watches.Select(s => s.Size).Distinct().Count() > 1)
 						{
 							DisplayTypeDropDown.Enabled = false;
 						}
 					}
 					else
 					{
-						NotesBox.Text = _watchList[0].Notes;
-						AddressBox.SetFromLong(_watchList[0].Address);
+						NotesBox.Text = Watches[0].Notes;
+						AddressBox.SetFromLong(Watches[0].Address);
 					}
 
 					SetBigEndianCheckBox();
@@ -110,7 +108,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (watches != null)
 			{
-				_watchList.AddRange(watches);
+				Watches.AddRange(watches);
 			}
 
 			_mode = mode;
@@ -134,7 +132,7 @@ namespace BizHawk.Client.EmuHawk
 					Text = "New Watch";
 					break;
 				case Mode.Edit:
-					Text = $"Edit {(_watchList.Count == 1 ? "Watch" : "Watches")}";
+					Text = $"Edit {(Watches.Count == 1 ? "Watch" : "Watches")}";
 					break;
 				case Mode.Duplicate:
 					Text = "Duplicate Watch";
@@ -188,37 +186,34 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SetBigEndianCheckBox()
 		{
-			if (_watchList != null)
+			if (Watches.Count > 1)
 			{
-				if (_watchList.Count > 1)
-				{
-					// Aggregate state
-					var hasBig = _watchList.Any(x => x.BigEndian);
-					var hasLittle = _watchList.Any(x => x.BigEndian == false);
+				// Aggregate state
+				var hasBig = Watches.Any(x => x.BigEndian);
+				var hasLittle = Watches.Any(x => x.BigEndian == false);
 
-					if (hasBig && hasLittle)
-					{
-						BigEndianCheckBox.Checked = true;
-						BigEndianCheckBox.CheckState = CheckState.Indeterminate;
-					}
-					else if (hasBig)
-					{
-						BigEndianCheckBox.Checked = true;
-					}
-					else
-					{
-						BigEndianCheckBox.Checked = false;
-					}
-				}
-				else if (_watchList.Count == 1)
+				if (hasBig && hasLittle)
 				{
-					BigEndianCheckBox.Checked = _watchList[0].BigEndian;
-					return;
+					BigEndianCheckBox.Checked = true;
+					BigEndianCheckBox.CheckState = CheckState.Indeterminate;
+				}
+				else if (hasBig)
+				{
+					BigEndianCheckBox.Checked = true;
+				}
+				else
+				{
+					BigEndianCheckBox.Checked = false;
 				}
 			}
+			else if (Watches.Count == 1)
+			{
+				BigEndianCheckBox.Checked = Watches[0].BigEndian;
+				return;
+			}
 
-			var domain = MemoryDomains.FirstOrDefault(d => d.Name == DomainDropDown.SelectedItem.ToString()) ??
-						 MemoryDomains.MainMemory;
+			var domain = MemoryDomains.FirstOrDefault(d => d.Name == DomainDropDown.SelectedItem.ToString())
+				?? MemoryDomains.MainMemory;
 			BigEndianCheckBox.Checked = domain.EndianType == Emu.MemoryDomain.Endian.Big;
 		}
 
@@ -246,13 +241,13 @@ namespace BizHawk.Client.EmuHawk
 					switch (SizeDropDown.SelectedIndex)
 					{
 						case 0:
-							_watchList.Add(Watch.GenerateWatch(domain, address, WatchSize.Byte, type, bigEndian, notes));
+							Watches.Add(Watch.GenerateWatch(domain, address, WatchSize.Byte, type, bigEndian, notes));
 							break;
 						case 1:
-							_watchList.Add(Watch.GenerateWatch(domain, address, WatchSize.Word, type, bigEndian, notes));
+							Watches.Add(Watch.GenerateWatch(domain, address, WatchSize.Word, type, bigEndian, notes));
 							break;
 						case 2:
-							_watchList.Add(Watch.GenerateWatch(domain, address, WatchSize.DWord, type, bigEndian, notes));
+							Watches.Add(Watch.GenerateWatch(domain, address, WatchSize.DWord, type, bigEndian, notes));
 							break;
 					}
 
@@ -262,11 +257,11 @@ namespace BizHawk.Client.EmuHawk
 					break;
 				case Mode.Duplicate:
 					var tempWatchList = new List<Watch>();
-					tempWatchList.AddRange(_watchList);
-					_watchList.Clear();
+					tempWatchList.AddRange(Watches);
+					Watches.Clear();
 					foreach (var watch in tempWatchList)
 					{
-						_watchList.Add(Watch.GenerateWatch(
+						Watches.Add(Watch.GenerateWatch(
 								watch.Domain,
 								watch.Address,
 								watch.Size,
@@ -284,14 +279,14 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DoEdit()
 		{
-			if (_watchList.Count == 1)
+			if (Watches.Count == 1)
 			{
-				_watchList[0].Notes = NotesBox.Text;
+				Watches[0].Notes = NotesBox.Text;
 			}
 
 			if (_changedSize)
 			{
-				for (var i = 0; i < _watchList.Count; i++)
+				for (var i = 0; i < Watches.Count; i++)
 				{
 					var size = WatchSize.Byte;
 					switch (SizeDropDown.SelectedIndex)
@@ -307,24 +302,24 @@ namespace BizHawk.Client.EmuHawk
 							break;
 					}
 
-					_watchList[i] = Watch.GenerateWatch(
-						_watchList[i].Domain,
-						_watchList.Count == 1 ? AddressBox.ToRawInt() ?? 0 : _watchList[i].Address,
+					Watches[i] = Watch.GenerateWatch(
+						Watches[i].Domain,
+						Watches.Count == 1 ? AddressBox.ToRawInt() ?? 0 : Watches[i].Address,
 						size,
-						_watchList[i].Type,
-						_watchList[i].BigEndian,
-						_watchList[i].Notes);
+						Watches[i].Type,
+						Watches[i].BigEndian,
+						Watches[i].Notes);
 				}
 			}
 
 			if (_changedDisplayType)
 			{
-				_watchList.ForEach(x => x.Type = Watch.StringToDisplayType(DisplayTypeDropDown.SelectedItem.ToString()));
+				Watches.ForEach(x => x.Type = Watch.StringToDisplayType(DisplayTypeDropDown.SelectedItem.ToString()));
 			}
 
 			if (BigEndianCheckBox.CheckState != CheckState.Indeterminate)
 			{
-				_watchList.ForEach(x => x.BigEndian = BigEndianCheckBox.Checked);
+				Watches.ForEach(x => x.BigEndian = BigEndianCheckBox.Checked);
 			}
 		}
 
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
index ae4fbcc6cb..61a31de47c 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
@@ -23,10 +23,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public WatchSize ByteSize
 		{
-			get
-			{
-				return _size;
-			}
+			get => _size;
 
 			set
 			{
@@ -65,15 +62,12 @@ namespace BizHawk.Client.EmuHawk
 
 		public DisplayType Type
 		{
-			get
-			{
-				return _type;
-			}
+			get => _type;
 
 			set
 			{
-				_type = value;
 				var val = ToRawInt();
+				_type = value;
 				SetMaxLength();
 				SetFromRawInt(val);
 			}
diff --git a/BizHawk.Client.MultiHawk/App.config b/BizHawk.Client.MultiHawk/App.config
deleted file mode 100644
index 45437954e0..0000000000
--- a/BizHawk.Client.MultiHawk/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
-    </startup>
-</configuration>
diff --git a/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj b/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj
deleted file mode 100644
index daf4e4ecc3..0000000000
--- a/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <!--<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>-->
-    <CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>..\output\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <!--<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>-->
-    <CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{B95649F5-A0AE-41EB-B62B-578A2AFF5E18}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BizHawk.Client.MultiHawk</RootNamespace>
-    <AssemblyName>MultiHawk</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\References\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenTK">
-      <HintPath>..\References\OpenTK.dll</HintPath>
-    </Reference>
-    <Reference Include="SlimDX, Version=4.0.13.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\References\x64\SlimDX.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="movie\PlayMovie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="movie\PlayMovie.Designer.cs">
-      <DependentUpon>PlayMovie.cs</DependentUpon>
-    </Compile>
-    <Compile Include="movie\RecordMovie.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="movie\RecordMovie.Designer.cs">
-      <DependentUpon>RecordMovie.cs</DependentUpon>
-    </Compile>
-    <Compile Include="DisplayManager\DisplayManager.cs" />
-    <Compile Include="EmulatorWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="EmulatorWindow.Designer.cs">
-      <DependentUpon>EmulatorWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GlobalWin.cs" />
-    <Compile Include="InputManager.cs" />
-    <Compile Include="Input\GamePad.cs" />
-    <Compile Include="Input\Input.cs" />
-    <Compile Include="Input\Keyboard.cs" />
-    <Compile Include="Mainform.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Mainform.Designer.cs">
-      <DependentUpon>Mainform.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PresentationPanel.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="EmulatorWindowList.cs" />
-    <Compile Include="Extensions\ToolExtensions.cs" />
-    <EmbeddedResource Include="movie\PlayMovie.resx">
-      <DependentUpon>PlayMovie.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="movie\RecordMovie.resx">
-      <DependentUpon>RecordMovie.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="EmulatorWindow.resx">
-      <DependentUpon>EmulatorWindow.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mainform.resx">
-      <DependentUpon>Mainform.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <None Include="Resources\courier16px.bmfc" />
-    <None Include="Resources\courier16px.fnt" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\BizHawk.Client.Common\BizHawk.Client.Common.csproj">
-      <Project>{24a0aa3c-b25f-4197-b23d-476d6462dba0}</Project>
-      <Name>BizHawk.Client.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj">
-      <Project>{dd448b37-ba3f-4544-9754-5406e8094723}</Project>
-      <Name>BizHawk.Client.EmuHawk</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\BizHawk.Common\BizHawk.Common.csproj">
-      <Project>{866f8d13-0678-4ff9-80a4-a3993fd4d8a3}</Project>
-      <Name>BizHawk.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\BizHawk.Emulation.Common\BizHawk.Emulation.Common.csproj">
-      <Project>{e1a23168-b571-411c-b360-2229e7225e0e}</Project>
-      <Name>BizHawk.Emulation.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\BizHawk.Emulation.Cores\BizHawk.Emulation.Cores.csproj">
-      <Project>{197d4314-8a9f-49ba-977d-54acefaeb6ba}</Project>
-      <Name>BizHawk.Emulation.Cores</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\BizHawk.Emulation.DiscSystem\BizHawk.Emulation.DiscSystem.csproj">
-      <Project>{f51946ea-827f-4d82-b841-1f2f6d060312}</Project>
-      <Name>BizHawk.Emulation.DiscSystem</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Bizware\BizHawk.Bizware.BizwareGL.GdiPlus\BizHawk.Bizware.BizwareGL.GdiPlus.csproj">
-      <Project>{337ca23e-65e7-44e1-9411-97ee08bb8116}</Project>
-      <Name>BizHawk.Bizware.BizwareGL.GdiPlus</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Bizware\BizHawk.Bizware.BizwareGL.OpenTK\BizHawk.Bizware.BizwareGL.OpenTK.csproj">
-      <Project>{5160cfb1-5389-47c1-b7f6-8a0dc97641ee}</Project>
-      <Name>BizHawk.Bizware.BizwareGL.OpenTK</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Bizware\BizHawk.Bizware.BizwareGL.SlimDX\BizHawk.Bizware.BizwareGL.SlimDX.csproj">
-      <Project>{e6b436b1-a3cd-4c9a-8f76-5d7154726884}</Project>
-      <Name>BizHawk.Bizware.BizwareGL.SlimDX</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Bizware\BizHawk.Bizware.BizwareGL\BizHawk.Bizware.BizwareGL.csproj">
-      <Project>{9f84a0b2-861e-4ef4-b89b-5e2a3f38a465}</Project>
-      <Name>BizHawk.Bizware.BizwareGL</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\courier16px_0.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\GreenCheck.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\OpenFile.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\Pause.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\Play.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\ReadOnly.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\reboot.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\Recent.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\RecordHS.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\SaveAllHS.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\SaveAs.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\Scan.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\ExclamationRed.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\Stop.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\Blank.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\CutHS.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\GameController.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\HotKeys.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\Help.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\Save.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="images\restart.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj.DotSettings b/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj.DotSettings
deleted file mode 100644
index 73e96563f9..0000000000
--- a/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/DisplayManager/DisplayManager.cs b/BizHawk.Client.MultiHawk/DisplayManager/DisplayManager.cs
deleted file mode 100644
index ceb67d81e7..0000000000
--- a/BizHawk.Client.MultiHawk/DisplayManager/DisplayManager.cs
+++ /dev/null
@@ -1,724 +0,0 @@
-//TODO
-//we could flag textures as 'actually' render targets (keep a reference to the render target?) which could allow us to convert between them more quickly in some cases
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-
-using BizHawk.Emulation.Common;
-using BizHawk.Client.Common;
-using BizHawk.Client.EmuHawk;
-using BizHawk.Client.EmuHawk.FilterManager;
-using BizHawk.Bizware.BizwareGL;
-
-using OpenTK;
-using BizHawk.Bizware.BizwareGL.Drivers.SlimDX;
-using BizHawk.Bizware.BizwareGL.Drivers.GdiPlus;
-
-namespace BizHawk.Client.MultiHawk
-{
-	/// <summary>
-	/// A DisplayManager is destined forevermore to drive the PresentationPanel it gets initialized with.
-	/// Its job is to receive OSD and emulator outputs, and produce one single buffer (BitampBuffer? Texture2d?) for display by the PresentationPanel.
-	/// Details TBD
-	/// </summary>
-	public class DisplayManager : IDisposable
-	{
-		class DisplayManagerRenderTargetProvider : IRenderTargetProvider
-		{
-			public DisplayManagerRenderTargetProvider(Func<Size, RenderTarget> callback) { Callback = callback; }
-			Func<Size, RenderTarget> Callback;
-			RenderTarget IRenderTargetProvider.Get(Size size)
-			{
-				return Callback(size);
-			}
-		}
-
-		public DisplayManager(PresentationPanel presentationPanel, IGL gl, GLManager glManager)
-		{
-			GL = gl;
-			GLManager = glManager;
-			this.presentationPanel = presentationPanel;
-			GraphicsControl = this.presentationPanel.GraphicsControl;
-			CR_GraphicsControl = GLManager.GetContextForGraphicsControl(GraphicsControl);
-
-			//it's sort of important for these to be initialized to something nonzero
-			currEmuWidth = currEmuHeight = 1;
-
-			Renderer = GL.CreateRenderer();
-
-			VideoTextureFrugalizer = new TextureFrugalizer(GL);
-
-			ShaderChainFrugalizers = new RenderTargetFrugalizer[16]; //hacky hardcoded limit.. need some other way to manage these
-			for (int i = 0; i < 16; i++)
-			{
-				ShaderChainFrugalizers[i] = new RenderTargetFrugalizer(GL);
-			}
-
-			RefreshUserShader();
-		}
-
-		public bool Disposed { get; private set; }
-
-		public void Dispose()
-		{
-			if (Disposed) return;
-			Disposed = true;
-			VideoTextureFrugalizer.Dispose();
-			foreach (var f in LuaSurfaceFrugalizers.Values)
-				f.Dispose();
-			foreach (var f in ShaderChainFrugalizers)
-				if (f != null)
-					f.Dispose();
-			Renderer.Dispose();
-		}
-
-		//rendering resources:
-		IGL GL;
-		GLManager GLManager;
-		IGuiRenderer Renderer;
-
-		//layer resources
-		PresentationPanel presentationPanel; //well, its the final layer's target, at least
-		GraphicsControl GraphicsControl; //well, its the final layer's target, at least
-		GLManager.ContextRef CR_GraphicsControl;
-		FilterProgram CurrentFilterProgram;
-
-		/// <summary>
-		/// these variables will track the dimensions of the last frame's (or the next frame? this is confusing) emulator native output size
-		/// THIS IS OLD JUNK. I should get rid of it, I think. complex results from the last filter ingestion should be saved instead.
-		/// </summary>
-		int currEmuWidth, currEmuHeight;
-
-		/// <summary>
-		/// additional pixels added at the unscaled level for the use of lua drawing. essentially increases the input video provider dimensions
-		/// </summary>
-		public System.Windows.Forms.Padding GameExtraPadding;
-
-		/// <summary>
-		/// additional pixels added at the native level for the use of lua drawing. essentially just gets tacked onto the final calculated window sizes.
-		/// </summary>
-		public System.Windows.Forms.Padding ClientExtraPadding;
-
-		/// <summary>
-		/// custom fonts that don't need to be installed on the user side
-		/// </summary>
-		public System.Drawing.Text.PrivateFontCollection CustomFonts = new System.Drawing.Text.PrivateFontCollection();
-
-		TextureFrugalizer VideoTextureFrugalizer;
-		Dictionary<string, TextureFrugalizer> LuaSurfaceFrugalizers = new Dictionary<string, TextureFrugalizer>();
-		RenderTargetFrugalizer[] ShaderChainFrugalizers;
-		EmuHawk.Filters.RetroShaderChain ShaderChain_user;
-
-		public void RefreshUserShader()
-		{
-			if (ShaderChain_user != null)
-				ShaderChain_user.Dispose();
-			if (File.Exists(Global.Config.DispUserFilterPath))
-			{
-				var fi = new FileInfo(Global.Config.DispUserFilterPath);
-				using (var stream = fi.OpenRead())
-					ShaderChain_user = new EmuHawk.Filters.RetroShaderChain(GL, new EmuHawk.Filters.RetroShaderPreset(stream), Path.GetDirectoryName(Global.Config.DispUserFilterPath));
-			}
-		}
-
-		System.Windows.Forms.Padding CalculateCompleteContentPadding(bool user, bool source)
-		{
-			var padding = new System.Windows.Forms.Padding();
-
-			if(user)
-				padding += GameExtraPadding;
-
-			//an experimental feature
-			if(source)
-				if (Global.Emulator is BizHawk.Emulation.Cores.Sony.PSX.Octoshock)
-				{
-					var psx = Global.Emulator as BizHawk.Emulation.Cores.Sony.PSX.Octoshock;
-					var core_padding = psx.VideoProvider_Padding;
-					padding.Left += core_padding.Width / 2;
-					padding.Right += core_padding.Width - core_padding.Width / 2;
-					padding.Top += core_padding.Height / 2;
-					padding.Bottom += core_padding.Height - core_padding.Height / 2;
-				}
-
-			return padding;
-		}
-
-		FilterProgram BuildDefaultChain(Size chain_insize, Size chain_outsize, bool includeOSD)
-		{
-			//select user special FX shader chain
-			Dictionary<string, object> selectedChainProperties = new Dictionary<string, object>();
-			EmuHawk.Filters.RetroShaderChain selectedChain = null;
-			if (Global.Config.TargetDisplayFilter == 3 && ShaderChain_user != null && ShaderChain_user.Available)
-				selectedChain = ShaderChain_user;
-
-			EmuHawk.Filters.FinalPresentation fPresent = new EmuHawk.Filters.FinalPresentation(chain_outsize);
-			EmuHawk.Filters.SourceImage fInput = new EmuHawk.Filters.SourceImage(chain_insize);
-			EmuHawk.Filters.OSD fOSD = new EmuHawk.Filters.OSD();
-			fOSD.RenderCallback = () =>
-			{
-				if (!includeOSD)
-					return;
-				var size = fOSD.FindInput().SurfaceFormat.Size;
-				Renderer.Begin(size.Width, size.Height);
-				Renderer.SetBlendState(GL.BlendNormal);
-				Renderer.End();
-			};
-
-			var chain = new FilterProgram();
-
-			//add the first filter, encompassing output from the emulator core
-			chain.AddFilter(fInput, "input");
-
-			//if a non-zero padding is required, add a filter to allow for that
-			//note, we have two sources of padding right now.. one can come from the videoprovider and one from the user.
-			//we're combining these now and just using black, for sake of being lean, despite the discussion below:
-			//keep in mind, the videoprovider design in principle might call for another color.
-			//we havent really been using this very hard, but users will probably want black there (they could fill it to another color if needed tho)
-			var padding = CalculateCompleteContentPadding(true,true);
-			if (padding.Vertical != 0 || padding.Horizontal != 0)
-			{
-				//TODO - add another filter just for this, its cumbersome to use final presentation... I think. but maybe theres enough similarities to justify it.
-				Size size = chain_insize;
-				size.Width += padding.Horizontal;
-				size.Height += padding.Vertical;
-				EmuHawk.Filters.FinalPresentation fPadding = new EmuHawk.Filters.FinalPresentation(size);
-				chain.AddFilter(fPadding, "padding");
-				fPadding.GuiRenderer = Renderer;
-				fPadding.GL = GL;
-				fPadding.Config_PadOnly = true;
-				fPadding.Padding = padding;
-			}
-
-			if (Global.Config.DispPrescale != 1)
-			{
-				EmuHawk.Filters.PrescaleFilter fPrescale = new EmuHawk.Filters.PrescaleFilter() { Scale = Global.Config.DispPrescale };
-				chain.AddFilter(fPrescale, "user_prescale");
-			}
-
-			//AutoPrescale makes no sense for a None final filter
-			if (Global.Config.DispAutoPrescale && Global.Config.DispFinalFilter != (int)EmuHawk.Filters.FinalPresentation.eFilterOption.None)
-			{
-				var apf = new EmuHawk.Filters.AutoPrescaleFilter();
-				chain.AddFilter(apf, "auto_prescale");
-			}
-
-			//choose final filter
-			EmuHawk.Filters.FinalPresentation.eFilterOption finalFilter = EmuHawk.Filters.FinalPresentation.eFilterOption.None;
-			fPresent.FilterOption = finalFilter;
-
-			//add final presentation
-			chain.AddFilter(fPresent, "presentation");
-
-			return chain;
-		}
-
-		/// <summary>
-		/// This will receive an emulated output frame from an IVideoProvider and run it through the complete frame processing pipeline
-		/// Then it will stuff it into the bound PresentationPanel.
-		/// ---
-		/// If the int[] is size=1, then it contains an openGL texture ID (and the size should be as specified from videoProvider)
-		/// Don't worry about the case where the frontend isnt using opengl; DisplayManager deals with it
-		/// </summary>
-		public void UpdateSource(IVideoProvider videoProvider)
-		{
-			bool displayNothing = Global.Config.DispSpeedupFeatures == 0;
-			var job = new JobInfo
-			{
-				videoProvider = videoProvider,
-				simulate = displayNothing,
-				chain_outsize = GraphicsControl.Size,
-				includeOSD = true,
-			};
-			UpdateSourceInternal(job);
-		}
-
-		public BitmapBuffer RenderVideoProvider(IVideoProvider videoProvider)
-		{
-			//TODO - we might need to gather more Global.Config.DispXXX properties here, so they can be overridden
-			var targetSize = new Size(videoProvider.BufferWidth, videoProvider.BufferHeight);
-			var padding = CalculateCompleteContentPadding(true,true);
-			targetSize.Width += padding.Horizontal;
-			targetSize.Height += padding.Vertical;
-
-			var job = new JobInfo
-			{
-				videoProvider = videoProvider,
-				simulate = false,
-				chain_outsize = targetSize,
-				offscreen = true,
-				includeOSD = false
-			};
-			UpdateSourceInternal(job);
-			return job.offscreenBB;
-		}
-
-		/// <summary>
-		/// Does the entire display process to an offscreen buffer, suitable for a 'client' screenshot.
-		/// </summary>
-		public BitmapBuffer RenderOffscreen(IVideoProvider videoProvider, bool includeOSD)
-		{
-			var job = new JobInfo
-			{
-				videoProvider = videoProvider,
-				simulate = false,
-				chain_outsize = GraphicsControl.Size,
-				offscreen = true,
-				includeOSD = includeOSD
-			};
-			UpdateSourceInternal(job);
-			return job.offscreenBB;
-		}
-
-		class FakeVideoProvider : IVideoProvider
-		{
-			public int[] GetVideoBuffer() { return new int[] {}; }
-
-			public int VirtualWidth { get; set; }
-			public int VirtualHeight { get; set; }
-
-			public int BufferWidth { get; set; }
-			public int BufferHeight { get; set; }
-			public int BackgroundColor { get; set; }
-
-			public int VsyncNumerator
-			{
-				get { throw new InvalidOperationException(); }
-			}
-
-			public int VsyncDenominator
-			{
-				get { throw new InvalidOperationException(); }
-			}
-		}
-
-		void FixRatio(float x, float y, int inw, int inh, out int outw, out int outh)
-		{
-			float ratio = x / y;
-			if (ratio <= 1)
-			{
-				//taller. weird. expand height.
-				outw = inw;
-				outh = (int)((float)inw / ratio);
-			}
-			else
-			{
-				//wider. normal. expand width.
-				outw = (int)((float)inh * ratio);
-				outh = inh;
-			}
-		}
-
-		/// <summary>
-		/// Attempts to calculate a good client size with the given zoom factor, considering the user's DisplayManager preferences
-		/// TODO - this needs to be redone with a concept different from zoom factor.
-		/// basically, each increment of a 'zoomlike' factor should definitely increase the viewable area somehow, even if it isnt strictly by an entire zoom level.
-		/// </summary>
-		public Size CalculateClientSize(IVideoProvider videoProvider, int zoom)
-		{
-			bool ar_active = Global.Config.DispFixAspectRatio;
-			bool ar_system = Global.Config.DispManagerAR == Config.EDispManagerAR.System;
-			bool ar_custom = Global.Config.DispManagerAR == Config.EDispManagerAR.Custom;
-			bool ar_customRatio = Global.Config.DispManagerAR == Config.EDispManagerAR.CustomRatio;
-			bool ar_correct = ar_system || ar_custom || ar_customRatio;
-			bool ar_unity = !ar_correct;
-			bool ar_integer = Global.Config.DispFixScaleInteger;
-
-			int bufferWidth = videoProvider.BufferWidth;
-			int bufferHeight = videoProvider.BufferHeight;
-			int virtualWidth = videoProvider.VirtualWidth;
-			int virtualHeight = videoProvider.VirtualHeight;
-
-			if (ar_custom)
-			{
-				virtualWidth = Global.Config.DispCustomUserARWidth;
-				virtualHeight = Global.Config.DispCustomUserARHeight;
-			}
-
-			if (ar_customRatio)
-			{
-				FixRatio(Global.Config.DispCustomUserARX, Global.Config.DispCustomUserARY, videoProvider.BufferWidth, videoProvider.BufferHeight, out virtualWidth, out virtualHeight);
-			}
-
-			var padding = CalculateCompleteContentPadding(true, false);
-			virtualWidth += padding.Horizontal;
-			virtualHeight += padding.Vertical;
-
-			padding = CalculateCompleteContentPadding(true, true);
-			bufferWidth += padding.Horizontal;
-			bufferHeight += padding.Vertical;
-
-			//Console.WriteLine("DISPZOOM " + zoom); //test
-
-			//old stuff
-			var fvp = new FakeVideoProvider();
-			fvp.BufferWidth = bufferWidth;
-			fvp.BufferHeight = bufferHeight;
-			fvp.VirtualWidth = virtualWidth;
-			fvp.VirtualHeight = virtualHeight;
-
-			Size chain_outsize = new Size(fvp.BufferWidth * zoom, fvp.BufferHeight * zoom);
-
-			if (ar_active)
-			{
-				if (ar_correct)
-				{
-					if (ar_integer)
-					{
-						//ALERT COPYPASTE LAUNDROMAT
-						Vector2 VS = new Vector2(virtualWidth, virtualHeight);
-						Vector2 BS = new Vector2(bufferWidth, bufferHeight);
-						Vector2 AR = Vector2.Divide(VS, BS);
-						float target_par = (AR.X / AR.Y);
-
-						//this would malfunction for AR <= 0.5 or AR >= 2.0
-						//EDIT - in fact, we have AR like that coming from PSX, sometimes, so maybe we should solve this better
-						Vector2 PS = new Vector2(1, 1);
-
-						//here's how we define zooming, in this case:
-						//make sure each step is an increment of zoom for at least one of the dimensions (or maybe both of them)
-						//look for the increment which helps the AR the best
-						//TODO - this cant possibly support scale factors like 1.5x
-						//TODO - also, this might be messing up zooms and stuff, we might need to run this on the output size of the filter chain
-						for (int i = 1; i < zoom;i++)
-						{
-							//would not be good to run this per frame, but it seems to only run when the resolution changes, etc.
-							Vector2[] trials = new[] {
-								PS + new Vector2(1, 0),
-								PS + new Vector2(0, 1),
-								PS + new Vector2(1, 1)
-							};
-							int bestIndex = -1;
-							float bestValue = 1000.0f;
-							for (int t = 0; t < trials.Length; t++)
-							{
-								//I.
-								float test_ar = trials[t].X / trials[t].Y;
-
-								//II.
-								//Vector2 calc = Vector2.Multiply(trials[t], VS);
-								//float test_ar = calc.X / calc.Y;
-
-								//not clear which approach is superior
-								float deviation_linear = Math.Abs(test_ar - target_par);
-								float deviation_geom = test_ar / target_par;
-								if (deviation_geom < 1) deviation_geom = 1.0f / deviation_geom;
-
-								float value = deviation_linear;
-								if (value < bestValue)
-								{
-									bestIndex = t;
-									bestValue = value;
-								}
-							}
-							//is it possible to get here without selecting one? doubtful.
-							//EDIT: YES IT IS. it happened with an 0,0 buffer size. of course, that was a mistake, but we shouldnt crash
-							if(bestIndex != -1) //so, what now? well, this will result in 0,0 getting picked, so thats probably all we can do
-								PS = trials[bestIndex];
-						}
-
-						chain_outsize = new Size((int)(bufferWidth * PS.X), (int)(bufferHeight * PS.Y));
-					}
-					else
-					{
-						//obey the AR, but allow free scaling: just zoom the virtual size
-						chain_outsize = new Size(virtualWidth * zoom, virtualHeight * zoom);
-					}
-				}
-				else
-				{
-					//ar_unity:
-					//just choose to zoom the buffer (make no effort to incorporate AR)
-					chain_outsize = new Size(bufferWidth * zoom, bufferHeight * zoom);
-				}
-			}
-			else
-			{
-				//!ar_active:
-				//just choose to zoom the buffer (make no effort to incorporate AR)
-				chain_outsize = new Size(bufferWidth * zoom, bufferHeight * zoom);
-			}
-
-			chain_outsize.Width += ClientExtraPadding.Horizontal;
-			chain_outsize.Height += ClientExtraPadding.Vertical;
-
-			var job = new JobInfo
-			{
-				videoProvider = fvp,
-				simulate = true,
-				chain_outsize = chain_outsize,
-			};
-			var filterProgram = UpdateSourceInternal(job);
-
-			var size = filterProgram.Filters[filterProgram.Filters.Count - 1].FindOutput().SurfaceFormat.Size;
-
-			return size;
-		}
-
-		class JobInfo
-		{
-			public IVideoProvider videoProvider;
-			public bool simulate;
-			public Size chain_outsize;
-			public bool offscreen;
-			public BitmapBuffer offscreenBB;
-			public bool includeOSD;
-		}
-
-		FilterProgram UpdateSourceInternal(JobInfo job)
-		{
-			if (job.chain_outsize.Width == 0 || job.chain_outsize.Height == 0)
-			{
-				//this has to be a NOP, because lots of stuff will malfunction on a 0-sized viewport
-				return null;
-			}
-
-			//no drawing actually happens. it's important not to begin drawing on a control
-			if (!job.simulate && !job.offscreen)
-			{
-				GLManager.Activate(CR_GraphicsControl);
-			}
-
-			IVideoProvider videoProvider = job.videoProvider;
-			bool simulate = job.simulate;
-			Size chain_outsize = job.chain_outsize;
-
-			//simulate = true;
-
-			int vw = videoProvider.BufferWidth;
-			int vh = videoProvider.BufferHeight;
-
-			if (Global.Config.DispFixAspectRatio)
-			{
-				if (Global.Config.DispManagerAR == Config.EDispManagerAR.System)
-				{
-					vw = videoProvider.VirtualWidth;
-					vh = videoProvider.VirtualHeight;
-				}
-				if (Global.Config.DispManagerAR == Config.EDispManagerAR.Custom)
-				{
-					vw = Global.Config.DispCustomUserARWidth;
-					vh = Global.Config.DispCustomUserARHeight;
-				}
-				if (Global.Config.DispManagerAR == Config.EDispManagerAR.CustomRatio)
-				{
-					FixRatio(Global.Config.DispCustomUserARX, Global.Config.DispCustomUserARY, videoProvider.BufferWidth, videoProvider.BufferHeight, out vw, out vh);
-				}
-			}
-
-			var padding = CalculateCompleteContentPadding(true,false);
-			vw += padding.Horizontal;
-			vh += padding.Vertical;
-
-			int[] videoBuffer = videoProvider.GetVideoBuffer();
-
-			int bufferWidth = videoProvider.BufferWidth;
-			int bufferHeight = videoProvider.BufferHeight;
-			bool isGlTextureId = videoBuffer.Length == 1;
-
-			BitmapBuffer bb = null;
-			Texture2d videoTexture = null;
-			if (!simulate)
-			{
-				if (isGlTextureId)
-				{
-					//FYI: this is a million years from happening on n64, since it's all geriatric non-FBO code
-					//is it workable for saturn?
-					videoTexture = GL.WrapGLTexture2d(new IntPtr(videoBuffer[0]), bufferWidth, bufferHeight);
-				}
-				else
-				{
-					//wrap the videoprovider data in a BitmapBuffer (no point to refactoring that many IVideoProviders)
-					bb = new BitmapBuffer(bufferWidth, bufferHeight, videoBuffer);
-					bb.DiscardAlpha();
-
-					//now, acquire the data sent from the videoProvider into a texture
-					videoTexture = VideoTextureFrugalizer.Get(bb);
-
-					//lets not use this. lets define BizwareGL to make clamp by default (TBD: check opengl)
-					//GL.SetTextureWrapMode(videoTexture, true);
-				}
-			}
-
-			//record the size of what we received, since lua and stuff is gonna want to draw onto it
-			currEmuWidth = bufferWidth;
-			currEmuHeight = bufferHeight;
-
-			//build the default filter chain and set it up with services filters will need
-			Size chain_insize = new Size(bufferWidth, bufferHeight);
-
-			var filterProgram = BuildDefaultChain(chain_insize, chain_outsize, job.includeOSD);
-			filterProgram.GuiRenderer = Renderer;
-			filterProgram.GL = GL;
-
-			//setup the source image filter
-			EmuHawk.Filters.SourceImage fInput = filterProgram["input"] as EmuHawk.Filters.SourceImage;
-			fInput.Texture = videoTexture;
-
-			//setup the final presentation filter
-			EmuHawk.Filters.FinalPresentation fPresent = filterProgram["presentation"] as EmuHawk.Filters.FinalPresentation;
-			fPresent.VirtualTextureSize = new Size(vw, vh);
-			fPresent.TextureSize = new Size(bufferWidth, bufferHeight);
-			fPresent.BackgroundColor = videoProvider.BackgroundColor;
-			fPresent.GuiRenderer = Renderer;
-			fPresent.Flip = isGlTextureId;
-			fPresent.Config_FixAspectRatio = Global.Config.DispFixAspectRatio;
-			fPresent.Config_FixScaleInteger = Global.Config.DispFixScaleInteger;
-			fPresent.Padding = ClientExtraPadding;
-			fPresent.AutoPrescale = Global.Config.DispAutoPrescale;
-
-			fPresent.GL = GL;
-
-			filterProgram.Compile("default", chain_insize, chain_outsize, !job.offscreen);
-
-			if (simulate)
-			{
-			}
-			else
-			{
-				CurrentFilterProgram = filterProgram;
-				UpdateSourceDrawingWork(job);
-			}
-
-			//cleanup:
-			if (bb != null) bb.Dispose();
-
-			return filterProgram;
-		}
-
-		void UpdateSourceDrawingWork(JobInfo job)
-		{
-			bool vsync = false;
-			bool alternateVsync = false;
-			//only used by alternate vsync
-			IGL_SlimDX9 dx9 = null;
-
-			if (!job.offscreen)
-			{
-				//apply the vsync setting (should probably try to avoid repeating this)
-				vsync = Global.Config.VSyncThrottle || Global.Config.VSync;
-
-				//ok, now this is a bit undesireable.
-				//maybe the user wants vsync, but not vsync throttle.
-				//this makes sense... but we dont have the infrastructure to support it now (we'd have to enable triple buffering or something like that)
-				//so what we're gonna do is disable vsync no matter what if throttling is off, and maybe nobody will notice.
-				//update 26-mar-2016: this upsets me. When fastforwarding and skipping frames, vsync should still work. But I'm not changing it yet
-				if (Global.DisableSecondaryThrottling)
-					vsync = false;
-
-				//for now, it's assumed that the presentation panel is the main window, but that may not always be true
-				if (vsync && Global.Config.DispAlternateVsync && Global.Config.VSyncThrottle)
-				{
-					dx9 = GL as IGL_SlimDX9;
-					if (dx9 != null)
-					{
-						alternateVsync = true;
-						//unset normal vsync if we've chosen the alternate vsync
-						vsync = false;
-					}
-				}
-
-				//TODO - whats so hard about triple buffering anyway? just enable it always, and change api to SetVsync(enable,throttle)
-				//maybe even SetVsync(enable,throttlemethod) or just SetVsync(enable,throttle,advanced)
-
-				if (LastVsyncSetting != vsync || LastVsyncSettingGraphicsControl != presentationPanel.GraphicsControl)
-				{
-					if (LastVsyncSetting == null && vsync)
-					{
-						// Workaround for vsync not taking effect at startup (Intel graphics related?)
-						presentationPanel.GraphicsControl.SetVsync(false);
-					}
-					presentationPanel.GraphicsControl.SetVsync(vsync);
-					LastVsyncSettingGraphicsControl = presentationPanel.GraphicsControl;
-					LastVsyncSetting = vsync;
-				}
-			}
-
-			//begin rendering on this context
-			//should this have been done earlier?
-			//do i need to check this on an intel video card to see if running excessively is a problem? (it used to be in the FinalTarget command below, shouldnt be a problem)
-			//GraphicsControl.Begin(); //CRITICAL POINT for yabause+GL
-
-			//TODO - auto-create and age these (and dispose when old)
-			int rtCounter = 0;
-
-			CurrentFilterProgram.RenderTargetProvider = new DisplayManagerRenderTargetProvider((size) => ShaderChainFrugalizers[rtCounter++].Get(size));
-
-			GL.BeginScene();
-
-			//run filter chain
-			Texture2d texCurr = null;
-			RenderTarget rtCurr = null;
-			bool inFinalTarget = false;
-			foreach (var step in CurrentFilterProgram.Program)
-			{
-				switch (step.Type)
-				{
-					case FilterProgram.ProgramStepType.Run:
-						{
-							int fi = (int)step.Args;
-							var f = CurrentFilterProgram.Filters[fi];
-							f.SetInput(texCurr);
-							f.Run();
-							var orec = f.FindOutput();
-							if (orec != null)
-							{
-								if (orec.SurfaceDisposition == SurfaceDisposition.Texture)
-								{
-									texCurr = f.GetOutput();
-									rtCurr = null;
-								}
-							}
-							break;
-						}
-					case FilterProgram.ProgramStepType.NewTarget:
-						{
-							var size = (Size)step.Args;
-							rtCurr = ShaderChainFrugalizers[rtCounter++].Get(size);
-							rtCurr.Bind();
-							CurrentFilterProgram.CurrRenderTarget = rtCurr;
-							break;
-						}
-					case FilterProgram.ProgramStepType.FinalTarget:
-						{
-							var size = (Size)step.Args;
-							inFinalTarget = true;
-							rtCurr = null;
-							CurrentFilterProgram.CurrRenderTarget = null;
-							GL.BindRenderTarget(null);
-							break;
-						}
-				}
-			}
-
-			GL.EndScene();
-
-			if (job.offscreen)
-			{
-				job.offscreenBB = rtCurr.Texture2d.Resolve();
-				job.offscreenBB.DiscardAlpha();
-			}
-			else
-			{
-				Debug.Assert(inFinalTarget);
-
-				//wait for vsync to begin
-				if (alternateVsync) dx9.AlternateVsyncPass(0);
-
-				//present and conclude drawing
-				presentationPanel.GraphicsControl.SwapBuffers();
-
-				//wait for vsync to end
-				if (alternateVsync) dx9.AlternateVsyncPass(1);
-
-				//nope. dont do this. workaround for slow context switching on intel GPUs. just switch to another context when necessary before doing anything
-				//presentationPanel.GraphicsControl.End();
-			}
-		}
-
-		bool? LastVsyncSetting;
-		GraphicsControl LastVsyncSettingGraphicsControl;
-	}
-}
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/EmulatorWindow.Designer.cs b/BizHawk.Client.MultiHawk/EmulatorWindow.Designer.cs
deleted file mode 100644
index 5fbddd196c..0000000000
--- a/BizHawk.Client.MultiHawk/EmulatorWindow.Designer.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-namespace BizHawk.Client.MultiHawk
-{
-	partial class EmulatorWindow
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.SuspendLayout();
-			// 
-			// EmulatorWindow
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(284, 262);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Name = "EmulatorWindow";
-			this.ShowIcon = false;
-			this.Load += new System.EventHandler(this.EmulatorWindow_Load);
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/EmulatorWindow.cs b/BizHawk.Client.MultiHawk/EmulatorWindow.cs
deleted file mode 100644
index 0ea193c46c..0000000000
--- a/BizHawk.Client.MultiHawk/EmulatorWindow.cs
+++ /dev/null
@@ -1,411 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-using BizHawk.Common;
-using BizHawk.Common.BufferExtensions;
-using BizHawk.Client.EmuHawk;
-using BizHawk.Bizware.BizwareGL;
-using BizHawk.Client.Common;
-using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.IEmulatorExtensions;
-using System.IO;
-
-
-namespace BizHawk.Client.MultiHawk
-{
-	// TODO: we can safely assume videoprovider cores are a requirement of multihawk,
-	// but fail sooner and with a clear message instead of making misc calls to AsVideoProvider that will fail
-	public partial class EmulatorWindow : Form
-	{
-		public EmulatorWindow(Mainform parent)
-		{
-			InitializeComponent();
-			Closing += (o, e) =>
-			{
-				ShutDown();
-			};
-
-			MainForm = parent;
-		}
-
-		private void EmulatorWindow_Load(object sender, EventArgs e)
-		{
-			if (Game != null)
-			{
-				Text = Game.Name;
-			}
-		}
-
-		public Mainform MainForm { get; private set; }
-		public IEmulator Emulator { get; set; }
-		public CoreComm CoreComm { get; set; }
-		public GameInfo Game { get; set; }
-		public string CurrentRomPath { get; set; }
-
-		public IGL GL { get; set; }
-		public GLManager.ContextRef CR_GL { get; set; }
-		public GLManager GLManager { get; set; }
-
-		public PresentationPanel PresentationPanel { get; set; }
-
-		//public Sound Sound; // TODO
-		public DisplayManager DisplayManager;
-		
-
-		public void Init()
-		{
-			PresentationPanel = new PresentationPanel(this, GL);
-			CR_GL = GLManager.GetContextForIGL(GL);
-			DisplayManager = new DisplayManager(PresentationPanel, GL ,GLManager);
-
-			Controls.Add(PresentationPanel);
-			Controls.SetChildIndex(PresentationPanel, 0);
-		}
-
-		public void ShutDown()
-		{
-			SaveRam();
-			MainForm.EmulatorWindowClosed(this);
-			Emulator.Dispose();
-			GL.Dispose();
-		}
-
-		public void LoadQuickSave(string quickSlotName)
-		{
-			if (!Emulator.HasSavestates())
-			{
-				return;
-			}
-
-			var path = PathManager.SaveStatePrefix(Game) + "." + quickSlotName + ".State";
-
-			if (LoadStateFile(path, quickSlotName))
-			{
-				// SetMainformMovieInfo(); // TODO
-				MainForm.AddMessage("Loaded state: " + quickSlotName);
-			}
-			else
-			{
-				MainForm.AddMessage("Loadstate error!");
-			}
-		}
-
-		public bool LoadStateFile(string path, string name)
-		{
-			var core = Emulator.AsStatable();
-
-			// try to detect binary first
-			var bl = BinaryStateLoader.LoadAndDetect(path);
-			if (bl != null)
-			{
-				try
-				{
-					var succeed = false;
-
-					// TODO
-					if (IAmMaster)
-					{
-						if (Global.MovieSession.Movie.IsActive)
-						{
-							bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState_HackyStep1(tr));
-							if (!succeed)
-							{
-								return false;
-							}
-
-							bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState_HackyStep2(tr));
-							if (!succeed)
-							{
-								return false;
-							}
-						}
-					}
-
-					using (new SimpleTime("Load Core"))
-						bl.GetCoreState(br => core.LoadStateBinary(br), tr => core.LoadStateText(tr));
-
-					bl.GetLump(BinaryStateLump.Framebuffer, false, PopulateFramebuffer);
-				}
-				catch
-				{
-					return false;
-				}
-				finally
-				{
-					bl.Dispose();
-				}
-
-				return true;
-			}
-			else // text mode
-			{
-				if (Global.MovieSession.HandleMovieLoadState(path))
-				{
-					using (var reader = new StreamReader(path))
-					{
-						core.LoadStateText(reader);
-
-						while (true)
-						{
-							var str = reader.ReadLine();
-							if (str == null)
-							{
-								break;
-							}
-
-							if (str.Trim() == "")
-							{
-								continue;
-							}
-
-							var args = str.Split(' ');
-							if (args[0] == "Framebuffer")
-							{
-								Emulator.AsVideoProvider().GetVideoBuffer().ReadFromHex(args[1]);
-							}
-						}
-					}
-
-					return true;
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-
-		public void PopulateFramebuffer(BinaryReader br)
-		{
-			try
-			{
-				using (new SimpleTime("Load Framebuffer"))
-					QuickBmpFile.Load(Emulator.AsVideoProvider(), br.BaseStream);
-			}
-			catch
-			{
-				var buff = Emulator.AsVideoProvider().GetVideoBuffer();
-				try
-				{
-					for (int i = 0; i < buff.Length; i++)
-					{
-						int j = br.ReadInt32();
-						buff[i] = j;
-					}
-				}
-				catch (EndOfStreamException) { }
-			}
-		}
-
-		public void SaveQuickSave(string quickSlotName)
-		{
-			if (!Emulator.HasSavestates())
-			{
-				return;
-			}
-
-			var path = PathManager.SaveStatePrefix(Game) + "." + quickSlotName + ".State";
-
-			var file = new FileInfo(path);
-			if (file.Directory != null && file.Directory.Exists == false)
-			{
-				file.Directory.Create();
-			}
-
-			// TODO
-			// Make backup first
-			//if (Global.Config.BackupSavestates && file.Exists)
-			//{
-			//	var backup = path + ".bak";
-			//	var backupFile = new FileInfo(backup);
-			//	if (backupFile.Exists)
-			//	{
-			//		backupFile.Delete();
-			//	}
-
-			//	File.Move(path, backup);
-			//}
-
-			try
-			{
-				SaveStateFile(path, quickSlotName);
-
-				MainForm.AddMessage("Saved state: " + quickSlotName);
-			}
-			catch (IOException)
-			{
-				MainForm.AddMessage("Unable to save state " + path);
-			}
-
-			// TODO
-		}
-
-		private void SaveStateFile(string filename, string name)
-		{
-			var core = Emulator.AsStatable();
-
-			using (var bs = new BinaryStateSaver(filename))
-			{
-				if (Global.Config.SaveStateType == Config.SaveStateTypeE.Text ||
-					(Global.Config.SaveStateType == Config.SaveStateTypeE.Default && !core.BinarySaveStatesPreferred))
-				{
-					// text savestate format
-					using (new SimpleTime("Save Core"))
-						bs.PutLump(BinaryStateLump.CorestateText, (tw) => core.SaveStateText(tw));
-				}
-				else
-				{
-					// binary core lump format
-					using (new SimpleTime("Save Core"))
-						bs.PutLump(BinaryStateLump.Corestate, bw => core.SaveStateBinary(bw));
-				}
-
-				if (true) //TODO: Global.Config.SaveScreenshotWithStates)
-				{
-					var vp = Emulator.AsVideoProvider();
-					var buff = vp.GetVideoBuffer();
-
-					int out_w = vp.BufferWidth;
-					int out_h = vp.BufferHeight;
-
-					// if buffer is too big, scale down screenshot
-					if (true /* !Global.Config.NoLowResLargeScreenshotWithStates*/ && buff.Length >= Global.Config.BigScreenshotSize)
-					{
-						out_w /= 2;
-						out_h /= 2;
-					}
-					using (new SimpleTime("Save Framebuffer"))
-						bs.PutLump(BinaryStateLump.Framebuffer, (s) => QuickBmpFile.Save(Emulator.AsVideoProvider(), s, out_w, out_h));
-				}
-
-				if (IAmMaster)
-				{
-					if (Global.MovieSession.Movie.IsActive)
-					{
-						bs.PutLump(BinaryStateLump.Input,
-							delegate(TextWriter tw)
-							{
-								// this never should have been a core's responsibility
-								tw.WriteLine("Frame {0}", Emulator.Frame);
-								Global.MovieSession.HandleMovieSaveState(tw);
-							});
-					}
-				}
-			}
-		}
-
-		public bool IAmMaster
-		{
-			get
-			{
-				return MainForm.EmulatorWindows.First() == this;
-			}
-		}
-
-		public void FrameBufferResized()
-		{
-			// run this entire thing exactly twice, since the first resize may adjust the menu stacking
-			for (int i = 0; i < 2; i++)
-			{
-				var video = Emulator.AsVideoProvider();
-				int zoom = Global.Config.TargetZoomFactors[Global.Emulator.SystemId];
-				var area = Screen.FromControl(this).WorkingArea;
-
-				int borderWidth = Size.Width - PresentationPanel.Control.Size.Width;
-				int borderHeight = Size.Height - PresentationPanel.Control.Size.Height;
-
-				// start at target zoom and work way down until we find acceptable zoom
-				Size lastComputedSize = new Size(1, 1);
-				for (; zoom >= 1; zoom--)
-				{
-					lastComputedSize = DisplayManager.CalculateClientSize(video, zoom);
-					if ((((lastComputedSize.Width) + borderWidth) < area.Width)
-						&& (((lastComputedSize.Height) + borderHeight) < area.Height))
-					{
-						break;
-					}
-				}
-				Console.WriteLine("Selecting display size " + lastComputedSize.ToString());
-
-				// Change size
-				Size = new Size((lastComputedSize.Width) + borderWidth, ((lastComputedSize.Height) + borderHeight));
-				PerformLayout();
-				PresentationPanel.Resized = true;
-
-				// Is window off the screen at this size?
-				if (area.Contains(Bounds) == false)
-				{
-					if (Bounds.Right > area.Right) // Window is off the right edge
-					{
-						Location = new Point(area.Right - Size.Width, Location.Y);
-					}
-
-					if (Bounds.Bottom > area.Bottom) // Window is off the bottom edge
-					{
-						Location = new Point(Location.X, area.Bottom - Size.Height);
-					}
-				}
-			}
-		}
-
-		private Size _lastVideoSize = new Size(-1, -1), _lastVirtualSize = new Size(-1, -1);
-		public void Render()
-		{
-			var video = Emulator.AsVideoProvider();
-
-			Size currVideoSize = new Size(video.BufferWidth, video.BufferHeight);
-			Size currVirtualSize = new Size(video.VirtualWidth, video.VirtualWidth);
-			if (currVideoSize != _lastVideoSize || currVirtualSize != _lastVirtualSize)
-			{
-				_lastVideoSize = currVideoSize;
-				_lastVirtualSize = currVirtualSize;
-				FrameBufferResized();
-			}
-
-			DisplayManager.UpdateSource(video);
-		}
-
-		public void FrameAdvance()
-		{
-			Emulator.FrameAdvance(Global.ControllerOutput, true);
-		}
-
-		public void SaveRam()
-		{
-			if (Emulator.HasSaveRam() && Emulator.AsSaveRam().SaveRamModified)
-			{
-				var path = PathManager.SaveRamPath(Global.Game);
-				var f = new FileInfo(path);
-				if (f.Directory != null && f.Directory.Exists == false)
-				{
-					f.Directory.Create();
-				}
-
-				// Make backup first
-				if (Global.Config.BackupSaveram && f.Exists)
-				{
-					var backup = path + ".bak";
-					var backupFile = new FileInfo(backup);
-					if (backupFile.Exists)
-					{
-						backupFile.Delete();
-					}
-
-					f.CopyTo(backup);
-				}
-
-				var writer = new BinaryWriter(new FileStream(path, FileMode.Create, FileAccess.Write));
-				var saveram = Emulator.AsSaveRam().CloneSaveRam();
-
-				writer.Write(saveram, 0, saveram.Length);
-				writer.Close();
-			}
-		}
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/EmulatorWindow.resx b/BizHawk.Client.MultiHawk/EmulatorWindow.resx
deleted file mode 100644
index 29dcb1b3a3..0000000000
--- a/BizHawk.Client.MultiHawk/EmulatorWindow.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/EmulatorWindowList.cs b/BizHawk.Client.MultiHawk/EmulatorWindowList.cs
deleted file mode 100644
index 1da78079a1..0000000000
--- a/BizHawk.Client.MultiHawk/EmulatorWindowList.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-
-namespace BizHawk.Client.MultiHawk
-{
-	public class EmulatorWindowList : List<EmulatorWindow>
-	{
-		public string SessionName { get; set; }
-
-		public EmulatorWindow Master
-		{
-			get
-			{
-				if (this.Any())
-				{
-					return this.First();
-				}
-
-				return null;
-			}
-		}
-
-		public IEnumerable<RomSessionEntry> Session
-		{
-			get
-			{
-				return this.Select(ew => new RomSessionEntry
-				{
-					RomName = ew.CurrentRomPath,
-					Wndx = ew.Location.X,
-					Wndy = ew.Location.Y
-				});
-			}
-		}
-
-		public string SessionJson
-		{
-			get
-			{
-				return JsonConvert.SerializeObject(Session);
-			}
-		}
-
-		public static IEnumerable<RomSessionEntry> FromJson(string json)
-		{
-			return JsonConvert.DeserializeObject<List<RomSessionEntry>>(json);
-		}
-
-		public new void Clear()
-		{
-			SessionName = "";
-			base.Clear();
-		}
-
-		public class RomSessionEntry
-		{
-			public string RomName { get; set; }
-			public int Wndx { get; set; }
-			public int Wndy { get; set; }
-		}
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/Extensions/ToolExtensions.cs b/BizHawk.Client.MultiHawk/Extensions/ToolExtensions.cs
deleted file mode 100644
index 5648ebc66f..0000000000
--- a/BizHawk.Client.MultiHawk/Extensions/ToolExtensions.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using System.Linq;
-
-using BizHawk.Common;
-
-using BizHawk.Emulation.Common;
-using BizHawk.Client.Common;
-
-namespace BizHawk.Client.MultiHawk.ToolExtensions
-{
-	public static class ToolExtensions
-	{
-		public static ToolStripItem[] RecentMenu(this RecentFiles recent, Action<string> loadFileCallback, bool autoload = false)
-		{
-			var items = new List<ToolStripItem>();
-
-			if (recent.Empty)
-			{
-				var none = new ToolStripMenuItem { Enabled = false, Text = "None" };
-				items.Add(none);
-			}
-			else
-			{
-				foreach (var filename in recent)
-				{
-					//TODO - do TSMI and TSDD need disposing? yuck
-					var temp = filename;
-					var item = new ToolStripMenuItem { Text = temp };
-					items.Add(item);
-
-					item.Click += (o, ev) =>
-					{
-						loadFileCallback(temp);
-					};
-					
-					//TODO - use standard methods to split filename (hawkfile acquire?)
-					var hf = new HawkFile();
-					hf.Parse(temp);
-					bool canExplore = true;
-					if (!File.Exists(hf.FullPathWithoutMember))
-						canExplore = false;
-
-					var tsdd = new ToolStripDropDownMenu();
-
-					// TODO
-					if (canExplore)
-					{
-						//make a menuitem to show the last modified timestamp
-					//	var timestamp = File.GetLastWriteTime(hf.FullPathWithoutMember);
-					//	var tsmiTimestamp = new ToolStripLabel { Text = timestamp.ToString() };
-
-					//	tsdd.Items.Add(tsmiTimestamp);
-					//	tsdd.Items.Add(new ToolStripSeparator());
-
-
-
-					//	if (hf.IsArchive)
-					//	{
-					//		//make a menuitem to let you copy the path
-					//		var tsmiCopyCanonicalPath = new ToolStripMenuItem { Text = "&Copy Canonical Path" };
-					//		tsmiCopyCanonicalPath.Click += (o, ev) => { System.Windows.Forms.Clipboard.SetText(temp); };
-					//		tsdd.Items.Add(tsmiCopyCanonicalPath);
-
-					//		var tsmiCopyArchivePath = new ToolStripMenuItem { Text = "Copy Archive Path" };
-					//		tsmiCopyArchivePath.Click += (o, ev) => { System.Windows.Forms.Clipboard.SetText(hf.FullPathWithoutMember); };
-					//		tsdd.Items.Add(tsmiCopyArchivePath);
-
-					//		var tsmiOpenArchive = new ToolStripMenuItem { Text = "Open &Archive" };
-					//		tsmiOpenArchive.Click += (o, ev) => { System.Diagnostics.Process.Start(hf.FullPathWithoutMember); };
-					//		tsdd.Items.Add(tsmiOpenArchive);
-					//	}
-					//	else
-					//	{
-					//		//make a menuitem to let you copy the path
-					//		var tsmiCopyPath = new ToolStripMenuItem { Text = "&Copy Path" };
-					//		tsmiCopyPath.Click += (o, ev) => { System.Windows.Forms.Clipboard.SetText(temp); };
-					//		tsdd.Items.Add(tsmiCopyPath);
-					//	}
-
-					//	tsdd.Items.Add(new ToolStripSeparator());
-
-					//	//make a menuitem to let you explore to it
-					//	var tsmiExplore = new ToolStripMenuItem { Text = "&Explore" };
-					//	string explorePath = "\"" + hf.FullPathWithoutMember + "\"";
-					//	tsmiExplore.Click += (o, ev) => { System.Diagnostics.Process.Start("explorer.exe", "/select, " + explorePath); };
-					//	tsdd.Items.Add(tsmiExplore);
-
-					//	var tsmiCopyFile = new ToolStripMenuItem { Text = "Copy &File" };
-					//	var lame = new System.Collections.Specialized.StringCollection();
-					//	lame.Add(hf.FullPathWithoutMember);
-					//	tsmiCopyFile.Click += (o, ev) => { System.Windows.Forms.Clipboard.SetFileDropList(lame); };
-					//	tsdd.Items.Add(tsmiCopyFile);
-
-					//	var tsmiTest = new ToolStripMenuItem { Text = "&Shell Context Menu" };
-					//	tsmiTest.Click += (o, ev) => {
-					//		var si = new GongSolutions.Shell.ShellItem(hf.FullPathWithoutMember);
-					//		var scm = new GongSolutions.Shell.ShellContextMenu(si);
-					//		var tsddi = o as ToolStripDropDownItem;
-					//		tsddi.Owner.Update();
-					//		scm.ShowContextMenu(tsddi.Owner, new System.Drawing.Point(0, 0));
-					//	};
-					//	tsdd.Items.Add(tsmiTest);
-
-					//	tsdd.Items.Add(new ToolStripSeparator());
-					//}
-					//else
-					//{
-					//	//make a menuitem to show the last modified timestamp
-					//	var tsmiMissingFile = new ToolStripLabel { Text = "-Missing-" };
-					//	tsdd.Items.Add(tsmiMissingFile);
-					//	tsdd.Items.Add(new ToolStripSeparator());
-					//}
-					
-					////in either case, make a menuitem to let you remove the path
-					//var tsmiRemovePath = new ToolStripMenuItem { Text = "&Remove" };
-					//tsmiRemovePath.Click += (o, ev) => { recent.Remove(temp); };
-
-					//tsdd.Items.Add(tsmiRemovePath);
-
-					//////experiment of popping open a submenu. doesnt work well.
-					////item.MouseDown += (o, mev) =>
-					////{
-					////  if (mev.Button != MouseButtons.Right) return;
-					////  //location of the menu containing this item that was just rightclicked
-					////  var pos = item.Owner.Bounds.Location;
-					////  //the offset within that menu of this item
-					////  var tsddi = item as ToolStripDropDownItem;
-					////  pos.Offset(tsddi.Bounds.Location);
-					////  //the offset of the click
-					////  pos.Offset(mev.Location);
-					////	//tsdd.OwnerItem = item; //has interesting promise, but breaks things otherwise
-					////  tsdd.Show(pos);
-					////};
-
-					////just add it to the submenu for now
-					//item.MouseDown += (o, mev) =>
-					//{
-					//	if (mev.Button != MouseButtons.Right) return;
-					//	if (item.DropDown != null)
-					//		item.DropDown = tsdd;
-					//	item.ShowDropDown();
-					};
-				}
-			}
-
-			items.Add(new ToolStripSeparator());
-
-			var clearitem = new ToolStripMenuItem { Text = "&Clear", Enabled = !recent.Frozen };
-			clearitem.Click += (o, ev) => recent.Clear();
-			items.Add(clearitem);
-
-			var freezeitem = new ToolStripMenuItem { Text = recent.Frozen ? "&Unfreeze" : "&Freeze" };
-			freezeitem.Click += (o, ev) => recent.Frozen ^= true;
-			items.Add(freezeitem);
-
-			if (autoload)
-			{
-				var auto = new ToolStripMenuItem { Text = "&Autoload", Checked = recent.AutoLoad };
-				auto.Click += (o, ev) => recent.ToggleAutoLoad();
-				items.Add(auto);
-			}
-
-			// TODO
-			//var settingsitem = new ToolStripMenuItem { Text = "&Recent Settings..." };
-			//settingsitem.Click += (o, ev) =>
-			//{
-			//	using (var prompt = new InputPrompt
-			//	{
-			//		TextInputType = InputPrompt.InputType.Unsigned,
-			//		Message = "Number of recent files to track",
-			//		InitialValue = recent.MAX_RECENT_FILES.ToString()
-			//	})
-			//	{
-			//		var result = prompt.ShowDialog();
-			//		if (result == DialogResult.OK)
-			//		{
-			//			int val = int.Parse(prompt.PromptText);
-			//			if (val > 0)
-			//				recent.MAX_RECENT_FILES = val;
-			//		}
-			//	}
-			//};
-			//items.Add(settingsitem);
-
-			return items.ToArray();
-		}
-
-		public static void HandleLoadError(this RecentFiles recent, string path)
-		{
-			// TODO
-			//GlobalWin.Sound.StopSound();
-			if (recent.Frozen)
-			{
-				var result = MessageBox.Show("Could not open " + path, "File not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-			else
-			{
-				var result = MessageBox.Show("Could not open " + path + "\nRemove from list?", "File not found", MessageBoxButtons.YesNo, MessageBoxIcon.Error);
-				if (result == DialogResult.Yes)
-				{
-					recent.Remove(path);
-				}
-			}
-
-			//GlobalWin.Sound.StartSound();
-		}
-
-		public static IEnumerable<ToolStripItem> MenuItems(this IMemoryDomains domains, Action<string> setCallback, string selected = "", int? maxSize = null)
-		{
-			foreach (var domain in domains)
-			{
-				var name = domain.Name;
-				var item = new ToolStripMenuItem
-				{
-					Text = name,
-					Enabled = !(maxSize.HasValue && domain.Size > maxSize.Value),
-					Checked = name == selected
-				};
-				item.Click += (o, ev) => setCallback(name);
-
-				yield return item;
-			}
-		}
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/GlobalWin.cs b/BizHawk.Client.MultiHawk/GlobalWin.cs
deleted file mode 100644
index 45794b7700..0000000000
--- a/BizHawk.Client.MultiHawk/GlobalWin.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using BizHawk.Client.Common;
-using BizHawk.Bizware.BizwareGL;
-using SlimDX.DirectSound;
-
-namespace BizHawk.Client.MultiHawk
-{
-	public static class GlobalWin
-	{
-		public static Mainform MainForm;
-		//public static ToolManager Tools;
-		public static IGL GL;
-		public static Bizware.BizwareGL.Drivers.OpenTK.IGL_TK IGL_GL;
-		public static BizHawk.Client.EmuHawk.GLManager.ContextRef CR_GL;
-		//public static Sound Sound;
-		//public static PresentationPanel PresentationPanel;
-		//public static OSDManager OSD = new OSDManager();
-		//public static DisplayManager DisplayManager;
-		public static BizHawk.Client.EmuHawk.GLManager GLManager;
-
-		//input state which has been destined for game controller inputs are coalesced here
-		//public static ControllerInputCoalescer ControllerInputCoalescer = new ControllerInputCoalescer();
-		//input state which has been destined for client hotkey consumption are colesced here
-		public static InputCoalescer HotkeyCoalescer = new InputCoalescer();
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/Input/GamePad.cs b/BizHawk.Client.MultiHawk/Input/GamePad.cs
deleted file mode 100644
index 75e03c44a2..0000000000
--- a/BizHawk.Client.MultiHawk/Input/GamePad.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-using System;
-using System.Collections.Generic;
-using SlimDX;
-using SlimDX.DirectInput;
-
-namespace BizHawk.Client.MultiHawk
-{
-	public class GamePad
-	{
-		// ********************************** Static interface **********************************
-
-		static DirectInput dinput;
-		public static List<GamePad> Devices;
-
-		public static void Initialize(IntPtr parent)
-		{
-			if (dinput == null)
-				dinput = new DirectInput();
-
-			Devices = new List<GamePad>();
-
-			foreach (DeviceInstance device in dinput.GetDevices(DeviceClass.GameController, DeviceEnumerationFlags.AttachedOnly))
-			{
-				Console.WriteLine("joydevice: {0} `{1}`", device.InstanceGuid, device.ProductName);
-
-				if (device.ProductName.Contains("XBOX 360"))
-					continue; // Don't input XBOX 360 controllers into here; we'll process them via XInput (there are limitations in some trigger axes when xbox pads go over xinput)
-
-				var joystick = new Joystick(dinput, device.InstanceGuid);
-				joystick.SetCooperativeLevel(parent, CooperativeLevel.Background | CooperativeLevel.Nonexclusive);
-				foreach (DeviceObjectInstance deviceObject in joystick.GetObjects())
-				{
-					if ((deviceObject.ObjectType & ObjectDeviceType.Axis) != 0)
-						joystick.GetObjectPropertiesById((int)deviceObject.ObjectType).SetRange(-1000, 1000);
-				}
-				joystick.Acquire();
-
-				GamePad p = new GamePad(device.InstanceName, device.InstanceGuid, joystick);
-				Devices.Add(p);
-			}
-		}
-
-		public static void UpdateAll()
-		{
-			foreach (var device in Devices)
-				device.Update();
-		}
-
-		public static void CloseAll()
-		{
-			if (Devices != null)
-			{
-				foreach (var device in Devices)
-					device.joystick.Dispose();
-				Devices.Clear();
-			}
-		}
-
-		// ********************************** Instance Members **********************************
-
-		readonly string name;
-		readonly Guid guid;
-		readonly Joystick joystick;
-		JoystickState state = new JoystickState();
-
-		GamePad(string name, Guid guid, Joystick joystick)
-		{
-			this.name = name;
-			this.guid = guid;
-			this.joystick = joystick;
-			Update();
-			InitializeCallbacks();
-		}
-
-		public void Update()
-		{
-			try
-			{
-				if (joystick.Acquire().IsFailure)
-					return;
-			}
-			catch
-			{
-				return;
-			}
-			if (joystick.Poll().IsFailure)
-				return;
-
-			state = joystick.GetCurrentState();
-			if (Result.Last.IsFailure)
-				// do something?
-				return;
-		}
-
-		public IEnumerable<Tuple<string, float>> GetFloats()
-		{
-			var pis = typeof(JoystickState).GetProperties();
-			foreach (var pi in pis)
-				yield return new Tuple<string, float>(pi.Name, 10.0f * (float)(int)pi.GetValue(state, null));
-		}
-
-		/// <summary>FOR DEBUGGING ONLY</summary>
-		public JoystickState GetInternalState()
-		{
-			return state;
-		}
-
-		public string Name { get { return name; } }
-		public Guid Guid { get { return guid; } }
-
-
-		public string ButtonName(int index)
-		{
-			return names[index];
-		}
-		public bool Pressed(int index)
-		{
-			return actions[index]();
-		}
-		public int NumButtons { get; private set; }
-
-		private readonly List<string> names = new List<string>();
-		private readonly List<Func<bool>> actions = new List<Func<bool>>();
-
-		void AddItem(string _name, Func<bool> callback)
-		{
-			names.Add(_name);
-			actions.Add(callback);
-			NumButtons++;
-		}
-
-		void InitializeCallbacks()
-		{
-			const int dzp = 400;
-			const int dzn = -400;
-
-			names.Clear();
-			actions.Clear();
-			NumButtons = 0;
-
-			AddItem("AccelerationX+", () => state.AccelerationX >= dzp);
-			AddItem("AccelerationX-", () => state.AccelerationX <= dzn);
-			AddItem("AccelerationY+", () => state.AccelerationY >= dzp);
-			AddItem("AccelerationY-", () => state.AccelerationY <= dzn);
-			AddItem("AccelerationZ+", () => state.AccelerationZ >= dzp);
-			AddItem("AccelerationZ-", () => state.AccelerationZ <= dzn);
-			AddItem("AngularAccelerationX+", () => state.AngularAccelerationX >= dzp);
-			AddItem("AngularAccelerationX-", () => state.AngularAccelerationX <= dzn);
-			AddItem("AngularAccelerationY+", () => state.AngularAccelerationY >= dzp);
-			AddItem("AngularAccelerationY-", () => state.AngularAccelerationY <= dzn);
-			AddItem("AngularAccelerationZ+", () => state.AngularAccelerationZ >= dzp);
-			AddItem("AngularAccelerationZ-", () => state.AngularAccelerationZ <= dzn);
-			AddItem("AngularVelocityX+", () => state.AngularVelocityX >= dzp);
-			AddItem("AngularVelocityX-", () => state.AngularVelocityX <= dzn);
-			AddItem("AngularVelocityY+", () => state.AngularVelocityY >= dzp);
-			AddItem("AngularVelocityY-", () => state.AngularVelocityY <= dzn);
-			AddItem("AngularVelocityZ+", () => state.AngularVelocityZ >= dzp);
-			AddItem("AngularVelocityZ-", () => state.AngularVelocityZ <= dzn);
-			AddItem("ForceX+", () => state.ForceX >= dzp);
-			AddItem("ForceX-", () => state.ForceX <= dzn);
-			AddItem("ForceY+", () => state.ForceY >= dzp);
-			AddItem("ForceY-", () => state.ForceY <= dzn);
-			AddItem("ForceZ+", () => state.ForceZ >= dzp);
-			AddItem("ForceZ-", () => state.ForceZ <= dzn);
-			AddItem("RotationX+", () => state.RotationX >= dzp);
-			AddItem("RotationX-", () => state.RotationX <= dzn);
-			AddItem("RotationY+", () => state.RotationY >= dzp);
-			AddItem("RotationY-", () => state.RotationY <= dzn);
-			AddItem("RotationZ+", () => state.RotationZ >= dzp);
-			AddItem("RotationZ-", () => state.RotationZ <= dzn);
-			AddItem("TorqueX+", () => state.TorqueX >= dzp);
-			AddItem("TorqueX-", () => state.TorqueX <= dzn);
-			AddItem("TorqueY+", () => state.TorqueY >= dzp);
-			AddItem("TorqueY-", () => state.TorqueY <= dzn);
-			AddItem("TorqueZ+", () => state.TorqueZ >= dzp);
-			AddItem("TorqueZ-", () => state.TorqueZ <= dzn);
-			AddItem("VelocityX+", () => state.VelocityX >= dzp);
-			AddItem("VelocityX-", () => state.VelocityX <= dzn);
-			AddItem("VelocityY+", () => state.VelocityY >= dzp);
-			AddItem("VelocityY-", () => state.VelocityY <= dzn);
-			AddItem("VelocityZ+", () => state.VelocityZ >= dzp);
-			AddItem("VelocityZ-", () => state.VelocityZ <= dzn);
-			AddItem("X+", () => state.X >= dzp);
-			AddItem("X-", () => state.X <= dzn);
-			AddItem("Y+", () => state.Y >= dzp);
-			AddItem("Y-", () => state.Y <= dzn);
-			AddItem("Z+", () => state.Z >= dzp);
-			AddItem("Z-", () => state.Z <= dzn);
-
-			// i don't know what the "Slider"s do, so they're omitted for the moment
-
-			for (int i = 0; i < state.GetButtons().Length; i++)
-			{
-				int j = i;
-				AddItem($"B{i + 1}", () => state.IsPressed(j));
-			}
-
-			for (int i = 0; i < state.GetPointOfViewControllers().Length; i++)
-			{
-				int j = i;
-				AddItem($"POV{i + 1}U",
-					() => { int t = state.GetPointOfViewControllers()[j]; return (t >= 0 && t <= 4500) || (t >= 31500 && t < 36000); });
-				AddItem($"POV{i + 1}D",
-					() => { int t = state.GetPointOfViewControllers()[j]; return t >= 13500 && t <= 22500; });
-				AddItem($"POV{i + 1}L",
-					() => { int t = state.GetPointOfViewControllers()[j]; return t >= 22500 && t <= 31500; });
-				AddItem($"POV{i + 1}R",
-					() => { int t = state.GetPointOfViewControllers()[j]; return t >= 4500 && t <= 13500; });
-			}
-		}
-
-		// Note that this does not appear to work at this time. I probably need to have more infos.
-		public void SetVibration(int left, int right)
-		{
-			int[] temp1, temp2;
-			// my first clue that it doesnt work is that LEFT  and RIGHT _ARENT USED_
-			// I should just look for C++ examples instead of trying to look for SlimDX examples
-
-			var parameters = new EffectParameters
-				{
-					Duration = 0x2710,
-					Gain = 0x2710,
-					SamplePeriod = 0,
-					TriggerButton = 0,
-					TriggerRepeatInterval = 0x2710,
-					Flags = EffectFlags.None
-				};
-			parameters.GetAxes(out temp1, out temp2);
-			parameters.SetAxes(temp1, temp2);
-			var effect = new Effect(joystick, EffectGuid.ConstantForce);
-			effect.SetParameters(parameters);
-			effect.Start(1);
-		}
-	}
-}
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/Input/Input.cs b/BizHawk.Client.MultiHawk/Input/Input.cs
deleted file mode 100644
index 9c3abc76f0..0000000000
--- a/BizHawk.Client.MultiHawk/Input/Input.cs
+++ /dev/null
@@ -1,511 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Threading;
-#if WINDOWS
-using SlimDX.DirectInput;
-#endif
-
-using BizHawk.Common;
-using BizHawk.Client.Common;
-
-namespace BizHawk.Client.MultiHawk
-{
-	//coalesces events back into instantaneous states
-	public class InputCoalescer : SimpleController
-	{
-		public void Receive(Input.InputEvent ie)
-		{
-			bool state = ie.EventType == Input.InputEventType.Press;
-			
-			string button = ie.LogicalButton.ToString();
-			Buttons[button] = state;
-
-			//when a button is released, all modified variants of it are released as well
-			if (!state)
-			{
-				var releases = Buttons.Where(kvp => kvp.Key.Contains("+") && kvp.Key.EndsWith(ie.LogicalButton.Button)).ToArray();
-				foreach (var kvp in releases)
-					Buttons[kvp.Key] = false;
-			}
-		}
-	}
-
-	public class ControllerInputCoalescer : SimpleController
-	{
-		public void Receive(Input.InputEvent ie)
-		{
-			bool state = ie.EventType == Input.InputEventType.Press;
-
-			string button = ie.LogicalButton.ToString();
-			Buttons[button] = state;
-
-			//For controller input, we want Shift+X to register as both Shift and X (for Keyboard controllers)
-			string[] subgroups = button.Split('+');
-			if (subgroups.Length > 0)
-			{
-				foreach (string s in subgroups)
-				{
-					Buttons[s] = state;
-				}
-			}
-
-			//when a button is released, all modified variants of it are released as well
-			if (!state)
-			{
-				var releases = Buttons.Where((kvp) => kvp.Key.Contains("+") && kvp.Key.EndsWith(ie.LogicalButton.Button)).ToArray();
-				foreach (var kvp in releases)
-					Buttons[kvp.Key] = false;
-			}
-		}
-	}
-
-	public class Input
-	{
-		[Flags]
-		public enum InputFocus
-		{
-			None = 0,
-			Mouse = 1,
-			Keyboard = 2,
-			Pad = 4
-		}
-
-		/// <summary>
-		/// If your form needs this kind of input focus, be sure to say so.
-		/// Really, this only makes sense for mouse, but I've started building it out for other things
-		/// Why is this receiving a control, but actually using it as a Form (where the WantingMouseFocus is checked?)
-		/// Because later we might change it to work off the control, specifically, if a control is supplied (normally actually a Form will be supplied)
-		/// </summary>
-		public void ControlInputFocus(System.Windows.Forms.Control c, InputFocus types, bool wants)
-		{
-			if (types.HasFlag(InputFocus.Mouse) && wants) WantingMouseFocus.Add(c);
-			if (types.HasFlag(InputFocus.Mouse) && !wants) WantingMouseFocus.Remove(c);
-		}
-
-		HashSet<System.Windows.Forms.Control> WantingMouseFocus = new HashSet<System.Windows.Forms.Control>();
-
-		[Flags]
-		public enum ModifierKey
-		{
-			// Summary:
-			//     The bitmask to extract modifiers from a key value.
-			Modifiers = -65536,
-			//
-			// Summary:
-			//     No key pressed.
-			None = 0,
-			//
-			// Summary:
-			//     The SHIFT modifier key.
-			Shift = 65536,
-			//
-			// Summary:
-			//     The CTRL modifier key.
-			Control = 131072,
-			//
-			// Summary:
-			//     The ALT modifier key.
-			Alt = 262144,
-		}
-
-		public static Input Instance { get; private set; }
-		readonly Thread UpdateThread;
-
-		private Input()
-		{
-#if WINDOWS
-			UpdateThread = new Thread(UpdateThreadProc)
-			{
-				IsBackground = true, 
-				Priority = ThreadPriority.AboveNormal //why not? this thread shouldn't be very heavy duty, and we want it to be responsive
-			};
-			UpdateThread.Start();
-#endif
-		}
-
-		public static void Initialize(IntPtr parent)
-		{
-#if WINDOWS
-			KeyInput.Initialize(parent);
-			GamePad.Initialize(parent);
-			BizHawk.Client.EmuHawk.GamePad360.Initialize();
-#endif
-			Instance = new Input();
-		}
-
-		public enum InputEventType
-		{
-			Press, Release
-		}
-		public struct LogicalButton
-		{
-			public LogicalButton(string button, ModifierKey modifiers)
-			{
-				Button = button;
-				Modifiers = modifiers;
-			}
-			public readonly string Button;
-			public readonly ModifierKey Modifiers;
-
-			public bool Alt { get { return ((Modifiers & ModifierKey.Alt) != 0); } }
-			public bool Control { get { return ((Modifiers & ModifierKey.Control) != 0); } }
-			public bool Shift { get { return ((Modifiers & ModifierKey.Shift) != 0); } }
-
-			public override string ToString()
-			{
-				string ret = "";
-				if (Control) ret += "Ctrl+";
-				if (Alt) ret += "Alt+";
-				if (Shift) ret += "Shift+";
-				ret += Button;
-				return ret;
-			}
-			public override bool Equals(object obj)
-			{
-				var other = (LogicalButton)obj;
-				return other == this;
-			}
-			public override int GetHashCode()
-			{
-				return Button.GetHashCode() ^ Modifiers.GetHashCode();
-			}
-			public static bool operator ==(LogicalButton lhs, LogicalButton rhs)
-			{
-				return lhs.Button == rhs.Button && lhs.Modifiers == rhs.Modifiers;
-			}
-			public static bool operator !=(LogicalButton lhs, LogicalButton rhs)
-			{
-				return !(lhs == rhs);
-			}
-		}
-		public class InputEvent
-		{
-			public LogicalButton LogicalButton;
-			public InputEventType EventType;
-			public override string ToString() => $"{EventType.ToString()}:{LogicalButton.ToString()}";
-		}
-
-		private readonly WorkingDictionary<string, object> ModifierState = new WorkingDictionary<string, object>();
-		private readonly WorkingDictionary<string, bool> LastState = new WorkingDictionary<string, bool>();
-		private readonly WorkingDictionary<string, bool> UnpressState = new WorkingDictionary<string, bool>();
-		private readonly HashSet<string> IgnoreKeys = new HashSet<string>(new[] { "LeftShift", "RightShift", "LeftControl", "RightControl", "LeftAlt", "RightAlt" });
-		private readonly WorkingDictionary<string, float> FloatValues = new WorkingDictionary<string, float>();
-		private readonly WorkingDictionary<string, float> FloatDeltas = new WorkingDictionary<string, float>();
-		private bool trackdeltas = false;
-
-		void HandleButton(string button, bool newState)
-		{
-			bool isModifier = IgnoreKeys.Contains(button);
-			if (EnableIgnoreModifiers && isModifier) return;
-			if (LastState[button] && newState) return;
-			if (!LastState[button] && !newState) return;
-
-			//apply 
-			//NOTE: this is not quite right. if someone held leftshift+rightshift it would be broken. seems unlikely, though.
-			if (button == "LeftShift")
-			{
-				_Modifiers &= ~ModifierKey.Shift;
-				if (newState)
-					_Modifiers |= ModifierKey.Shift;
-			}
-			if (button == "RightShift") { _Modifiers &= ~ModifierKey.Shift; if (newState) _Modifiers |= ModifierKey.Shift; }
-			if (button == "LeftControl") { _Modifiers &= ~ModifierKey.Control; if (newState) _Modifiers |= ModifierKey.Control; }
-			if (button == "RightControl") { _Modifiers &= ~ModifierKey.Control; if (newState) _Modifiers |= ModifierKey.Control; }
-			if (button == "LeftAlt") { _Modifiers &= ~ModifierKey.Alt; if (newState) _Modifiers |= ModifierKey.Alt; }
-			if (button == "RightAlt") { _Modifiers &= ~ModifierKey.Alt; if (newState) _Modifiers |= ModifierKey.Alt; }
-
-			if (UnpressState.ContainsKey(button))
-			{
-				if (newState) return;
-				Console.WriteLine($"Removing Unpress {button} with {nameof(newState)} {newState}");
-				UnpressState.Remove(button);
-				LastState[button] = false;
-				return;
-			}
-
-
-			//dont generate events for things like Ctrl+LeftControl
-			ModifierKey mods = _Modifiers;
-			if (button == "LeftShift") mods &= ~ModifierKey.Shift;
-			if (button == "RightShift") mods &= ~ModifierKey.Shift;
-			if (button == "LeftControl") mods &= ~ModifierKey.Control;
-			if (button == "RightControl") mods &= ~ModifierKey.Control;
-			if (button == "LeftAlt") mods &= ~ModifierKey.Alt;
-			if (button == "RightAlt") mods &= ~ModifierKey.Alt;
-
-			var ie = new InputEvent
-				{
-					EventType = newState ? InputEventType.Press : InputEventType.Release,
-					LogicalButton = new LogicalButton(button, mods)
-				};
-			LastState[button] = newState;
-
-			//track the pressed events with modifiers that we send so that we can send corresponding unpresses with modifiers
-			//this is an interesting idea, which we may need later, but not yet.
-			//for example, you may see this series of events: press:ctrl+c, release:ctrl, release:c
-			//but you might would rather have press:ctr+c, release:ctrl+c
-			//this code relates the releases to the original presses.
-			//UPDATE - this is necessary for the frame advance key, which has a special meaning when it gets stuck down
-			//so, i am adding it as of 11-sep-2011
-			if (newState)
-			{
-				ModifierState[button] = ie.LogicalButton;
-			}
-			else
-			{
-				if (ModifierState[button] != null)
-				{
-					LogicalButton alreadyReleased = ie.LogicalButton;
-					var ieModified = new InputEvent
-						{
-							LogicalButton = (LogicalButton)ModifierState[button],
-							EventType = InputEventType.Release
-						};
-					if (ieModified.LogicalButton != alreadyReleased)
-						_NewEvents.Add(ieModified);
-				}
-				ModifierState[button] = null;
-			}
-
-			_NewEvents.Add(ie);
-		}
-
-		ModifierKey _Modifiers;
-		private readonly List<InputEvent> _NewEvents = new List<InputEvent>();
-
-		//do we need this?
-		public void ClearEvents()
-		{
-			lock (this)
-			{
-				InputEvents.Clear();
-			}
-		}
-
-		private readonly Queue<InputEvent> InputEvents = new Queue<InputEvent>();
-		public InputEvent DequeueEvent()
-		{
-			lock (this)
-			{
-				if (InputEvents.Count == 0) return null;
-				else return InputEvents.Dequeue();
-			}
-		}
-		void EnqueueEvent(InputEvent ie)
-		{
-			lock (this)
-			{
-				InputEvents.Enqueue(ie);
-			}
-		}
-
-		public List<Tuple<string, float>> GetFloats()
-		{
-			List<Tuple<string, float>> FloatValuesCopy = new List<Tuple<string,float>>();
-			lock (FloatValues)
-			{
-				foreach (var kvp in FloatValues)
-					FloatValuesCopy.Add(new Tuple<string, float>(kvp.Key, kvp.Value));
-			}
-			return FloatValuesCopy;
-		}
-
-#if WINDOWS
-		void UpdateThreadProc()
-		{
-			for (; ; )
-			{
-				var keyEvents = KeyInput.Update();
-				GamePad.UpdateAll();
-				BizHawk.Client.EmuHawk.GamePad360.UpdateAll();
-
-				//this block is going to massively modify data structures that the binding method uses, so we have to lock it all
-				lock (this)
-				{
-					_NewEvents.Clear();
-
-					//analyze keys
-					foreach (var ke in keyEvents)
-						HandleButton(ke.Key.ToString(), ke.Pressed);
-
-					lock (FloatValues)
-					{
-						//FloatValues.Clear();
-
-						//analyze xinput
-						foreach (var pad in BizHawk.Client.EmuHawk.GamePad360.EnumerateDevices())
-						{
-							string xname = "X" + pad.PlayerNumber + " ";
-							for (int b = 0; b < pad.NumButtons; b++)
-								HandleButton(xname + pad.ButtonName(b), pad.Pressed(b));
-							foreach (var sv in pad.GetFloats())
-							{
-								string n = xname + sv.Item1;
-								float f = sv.Item2;
-								if (trackdeltas)
-									FloatDeltas[n] += Math.Abs(f - FloatValues[n]);
-								FloatValues[n] = f;
-							}
-						}
-
-						//analyze joysticks
-						for (int i = 0; i < GamePad.Devices.Count; i++)
-						{
-							var pad = GamePad.Devices[i];
-							string jname = "J" + (i + 1) + " ";
-
-							for (int b = 0; b < pad.NumButtons; b++)
-								HandleButton(jname + pad.ButtonName(b), pad.Pressed(b));
-							foreach (var sv in pad.GetFloats())
-							{
-								string n = jname + sv.Item1;
-								float f = sv.Item2;
-								//if (n == "J5 RotationZ")
-								//	System.Diagnostics.Debugger.Break();
-								if (trackdeltas)
-									FloatDeltas[n] += Math.Abs(f - FloatValues[n]);
-								FloatValues[n] = f;
-							}
-						}
-
-						// analyse moose
-						// other sorts of mouse api (raw input) could easily be added as a separate listing under a different class
-						if (WantingMouseFocus.Contains(System.Windows.Forms.Form.ActiveForm))
-						{
-							var P = System.Windows.Forms.Control.MousePosition;
-							if (trackdeltas)
-							{
-								// these are relative to screen coordinates, but that's not terribly important
-								FloatDeltas["WMouse X"] += Math.Abs(P.X - FloatValues["WMouse X"]) * 50;
-								FloatDeltas["WMouse Y"] += Math.Abs(P.Y - FloatValues["WMouse Y"]) * 50;
-							}
-							// coordinate translation happens later
-							FloatValues["WMouse X"] = P.X;
-							FloatValues["WMouse Y"] = P.Y;
-
-							var B = System.Windows.Forms.Control.MouseButtons;
-							HandleButton("WMouse L", (B & System.Windows.Forms.MouseButtons.Left) != 0);
-							HandleButton("WMouse C", (B & System.Windows.Forms.MouseButtons.Middle) != 0);
-							HandleButton("WMouse R", (B & System.Windows.Forms.MouseButtons.Right) != 0);
-							HandleButton("WMouse 1", (B & System.Windows.Forms.MouseButtons.XButton1) != 0);
-							HandleButton("WMouse 2", (B & System.Windows.Forms.MouseButtons.XButton2) != 0);
-						}
-						else
-						{
-							//dont do this: for now, it will interfere with the virtualpad. dont do something similar for the mouse position either
-							//unpress all buttons
-							//HandleButton("WMouse L", false);
-							//HandleButton("WMouse C", false);
-							//HandleButton("WMouse R", false);
-							//HandleButton("WMouse 1", false);
-							//HandleButton("WMouse 2", false);
-						}
-
-					}
-
-					bool swallow = !GlobalWin.MainForm.AllowInput;
-
-					foreach (var ie in _NewEvents)
-					{
-						//events are swallowed in some cases:
-						if (ie.EventType == InputEventType.Press && swallow)
-						{ }
-						else
-							EnqueueEvent(ie);
-					}
-				} //lock(this)
-
-				//arbitrary selection of polling frequency:
-				Thread.Sleep(10);
-			}
-		}
-#endif
-
-		public void StartListeningForFloatEvents()
-		{
-			lock (FloatValues)
-			{
-				FloatDeltas.Clear();
-				trackdeltas = true;
-			}
-		}
-
-		public string GetNextFloatEvent()
-		{
-			lock (FloatValues)
-			{
-				foreach (var kvp in FloatDeltas)
-				{
-					// need to wiggle the stick a bit
-					if (kvp.Value >= 20000.0f)
-						return kvp.Key;
-				}
-			}
-			return null;
-		}
-
-		public void StopListeningForFloatEvents()
-		{
-			lock (FloatValues)
-			{
-				trackdeltas = false;
-			}
-		}
-
-		public void Update()
-		{
-			//TODO - for some reason, we may want to control when the next event processing step happens
-			//so i will leave this method here for now..
-		}
-
-		//returns the next Press event, if available. should be useful
-		public string GetNextBindEvent()
-		{
-			//this whole process is intimately involved with the data structures, which can conflict with the input thread.
-			lock (this)
-			{
-				if (InputEvents.Count == 0) return null;
-				if (!GlobalWin.MainForm.AllowInput) return null;
-
-				//we only listen to releases for input binding, because we need to distinguish releases of pure modifierkeys from modified keys
-				//if you just pressed ctrl, wanting to bind ctrl, we'd see: pressed:ctrl, unpressed:ctrl
-				//if you just pressed ctrl+c, wanting to bind ctrl+c, we'd see: pressed:ctrl, pressed:ctrl+c, unpressed:ctrl+c, unpressed:ctrl
-				//so its the first unpress we need to listen for
-
-				while (InputEvents.Count != 0)
-				{
-					var ie = DequeueEvent();
-
-					//as a special perk, we'll accept escape immediately
-					if (ie.EventType == InputEventType.Press && ie.LogicalButton.Button == "Escape")
-						goto ACCEPT;
-
-					if (ie.EventType == InputEventType.Press) continue;
-
-				ACCEPT:
-					Console.WriteLine("Bind Event: {0} ", ie);
-
-					foreach (var kvp in LastState)
-						if (kvp.Value)
-						{
-							Console.WriteLine("Unpressing " + kvp.Key);
-							UnpressState[kvp.Key] = true;
-						}
-
-					InputEvents.Clear();
-
-					return ie.LogicalButton.ToString();
-				}
-
-				return null;
-			}
-		}
-
-		//controls whether modifier keys will be ignored as key press events
-		//this should be used by hotkey binders, but we may want modifier key events
-		//to get triggered in the main form
-		public bool EnableIgnoreModifiers = false;
-
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/Input/Keyboard.cs b/BizHawk.Client.MultiHawk/Input/Keyboard.cs
deleted file mode 100644
index 33f5ba938a..0000000000
--- a/BizHawk.Client.MultiHawk/Input/Keyboard.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System.Collections.Generic;
-using SlimDX;
-using SlimDX.DirectInput;
-using System;
-
-namespace BizHawk.Client.MultiHawk
-{
-	public static class KeyInput
-	{
-		private static DirectInput dinput;
-		private static Keyboard keyboard;
-		private static KeyboardState state = new KeyboardState();
-
-		public static void Initialize(IntPtr parent)
-		{
-			if (dinput == null) 
-				dinput = new DirectInput();
-
-			if (keyboard == null || keyboard.Disposed)
-				keyboard = new Keyboard(dinput);
-			keyboard.SetCooperativeLevel(parent, CooperativeLevel.Background | CooperativeLevel.Nonexclusive);
-			keyboard.Properties.BufferSize = 8;
-		}
-
-		static List<KeyEvent> EmptyList = new List<KeyEvent>();
-		static List<KeyEvent> EventList = new List<KeyEvent>();
-
-		public static IEnumerable<KeyEvent> Update()
-		{
-			EventList.Clear();
-
-			if (keyboard.Acquire().IsFailure)
-				return EmptyList;
-			if (keyboard.Poll().IsFailure)
-				return EmptyList;
-
-			for (; ; )
-			{
-				var events = keyboard.GetBufferedData();
-				if (Result.Last.IsFailure)
-					return EventList;
-				if (events.Count == 0)
-					break;
-				foreach (var e in events)
-				{
-					foreach (var k in e.PressedKeys)
-						EventList.Add(new KeyEvent { Key = k, Pressed = true });
-					foreach (var k in e.ReleasedKeys)
-					EventList.Add(new KeyEvent { Key = k, Pressed = false });
-				}
-			}
-
-			return EventList;
-		}
-
-		public struct KeyEvent
-		{
-			public Key Key;
-			public bool Pressed;
-		}
-
-		
-		public static bool IsPressed(Key key)
-		{
-			if (state.IsPressed(key))
-				return true;
-			
-			if (key == Key.LeftShift && state.IsPressed(Key.RightShift))
-				return true;
-			if (key == Key.LeftControl && state.IsPressed(Key.RightControl))
-				return true;
-			if (key == Key.LeftAlt && state.IsPressed(Key.RightAlt))
-				return true;
-
-			return false;
-		}
-
-		public static bool ShiftModifier
-		{
-			get
-			{
-				if (state.IsPressed(Key.LeftShift)) return true;
-				if (state.IsPressed(Key.RightShift)) return true;
-				return false;
-			}
-		}
-
-		public static bool CtrlModifier
-		{
-			get
-			{
-				if (state.IsPressed(Key.LeftControl)) return true;
-				if (state.IsPressed(Key.RightControl)) return true;
-				return false;
-			}
-		}
-
-		public static bool AltModifier
-		{
-			get
-			{
-				if (state.IsPressed(Key.LeftAlt)) return true;
-				if (state.IsPressed(Key.RightAlt)) return true;
-				return false;
-			}
-		}
-
-		public static Input.ModifierKey GetModifierKeysAsKeys()
-		{
-			Input.ModifierKey ret = Input.ModifierKey.None;
-			if (ShiftModifier) ret |= Input.ModifierKey.Shift;
-			if (CtrlModifier) ret |= Input.ModifierKey.Control;
-			if (AltModifier) ret |= Input.ModifierKey.Alt;
-			return ret;
-		}
-
-	}
-
-	internal static class KeyExtensions
-	{
-		public static bool IsModifier(this Key key)
-		{
-			if (key == Key.LeftShift) return true;
-			if (key == Key.RightShift) return true;
-			if (key == Key.LeftControl) return true;
-			if (key == Key.RightControl) return true;
-			if (key == Key.LeftAlt) return true;
-			if (key == Key.RightAlt) return true;
-			return false;
-		}
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/InputManager.cs b/BizHawk.Client.MultiHawk/InputManager.cs
deleted file mode 100644
index a1e7470727..0000000000
--- a/BizHawk.Client.MultiHawk/InputManager.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-using BizHawk.Emulation.Common;
-using BizHawk.Client.Common.InputAdapterExtensions;
-
-using BizHawk.Client.Common;
-
-namespace BizHawk.Client.MultiHawk
-{
-	public class InputManager
-	{
-		Mainform _mainForm;
-
-		public InputManager(Mainform mainForm)
-		{
-			_mainForm = mainForm;
-		}
-
-		public void RewireInputChain()
-		{
-			Global.ControllerInputCoalescer.Clear();
-			Global.ControllerInputCoalescer.Definition = Global.ActiveController.Definition;
-
-			// TODO?
-			//Global.UD_LR_ControllerAdapter.Source = Global.ActiveController.Or(Global.AutoFireController);
-			Global.UD_LR_ControllerAdapter.Source = Global.ActiveController;
-
-			Global.StickyXORAdapter.Source = Global.UD_LR_ControllerAdapter;
-			
-			// TODO?
-			//Global.AutofireStickyXORAdapter.Source = Global.StickyXORAdapter;
-
-			//Global.MultitrackRewiringAdapter.Source = Global.AutofireStickyXORAdapter;
-
-			Global.MultitrackRewiringAdapter.Source = Global.StickyXORAdapter;
-			Global.MovieInputSourceAdapter.Source = Global.MultitrackRewiringAdapter;
-			Global.ControllerOutput.Source = Global.MovieOutputHardpoint;
-
-			Global.MovieSession.MovieControllerAdapter.Definition = Global.MovieInputSourceAdapter.Definition;
-
-			// connect the movie session before MovieOutputHardpoint if it is doing anything
-			// otherwise connect the MovieInputSourceAdapter to it, effectively bypassing the movie session
-			if (Global.MovieSession != null)
-			{
-				Global.MovieOutputHardpoint.Source = Global.MovieSession.MovieControllerAdapter;
-			}
-			else
-			{
-				Global.MovieOutputHardpoint.Source = Global.MovieInputSourceAdapter;
-			}
-		}
-
-		public void SyncControls()
-		{
-			var def = _mainForm.EmulatorWindows.First().Emulator.ControllerDefinition;
-
-			Global.ActiveController = BindToDefinition(def, Global.Config.AllTrollers, Global.Config.AllTrollersAnalog);
-			// TODO?
-			//Global.AutoFireController = BindToDefinitionAF(def, Global.Config.AllTrollersAutoFire);
-
-			// allow propogating controls that are in the current controller definition but not in the prebaked one
-			// these two lines shouldn't be required anymore under the new system?
-			Global.ActiveController.ForceType(new ControllerDefinition(def));
-			Global.ClickyVirtualPadController.Definition = new ControllerDefinition(def);
-			RewireInputChain();
-		}
-
-		private Controller BindToDefinition(ControllerDefinition def, IDictionary<string, Dictionary<string, string>> allbinds, IDictionary<string, Dictionary<string, Config.AnalogBind>> analogbinds)
-		{
-			var ret = new Controller(def);
-			Dictionary<string, string> binds;
-			if (allbinds.TryGetValue(def.Name, out binds))
-			{
-				foreach (var cbutton in def.BoolButtons)
-				{
-					string bind;
-					if (binds.TryGetValue(cbutton, out bind))
-					{
-						ret.BindMulti(cbutton, bind);
-					}
-				}
-			}
-
-			Dictionary<string, Config.AnalogBind> abinds;
-			if (analogbinds.TryGetValue(def.Name, out abinds))
-			{
-				foreach (var cbutton in def.FloatControls)
-				{
-					Config.AnalogBind bind;
-					if (abinds.TryGetValue(cbutton, out bind))
-					{
-						ret.BindFloat(cbutton, bind);
-					}
-				}
-			}
-
-			return ret;
-		}
-
-		// TODO?
-		//private AutofireController BindToDefinitionAF(ControllerDefinition def, IDictionary<string, Dictionary<string, string>> allbinds)
-		//{
-		//	var ret = new AutofireController(def);
-		//	Dictionary<string, string> binds;
-		//	if (allbinds.TryGetValue(def.Name, out binds))
-		//	{
-		//		foreach (var cbutton in def.BoolButtons)
-		//		{
-		//			string bind;
-		//			if (binds.TryGetValue(cbutton, out bind))
-		//			{
-		//				ret.BindMulti(cbutton, bind);
-		//			}
-		//		}
-		//	}
-
-		//	return ret;
-		//}
-	}
-}
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/Mainform.Designer.cs b/BizHawk.Client.MultiHawk/Mainform.Designer.cs
deleted file mode 100644
index 51157dee4f..0000000000
--- a/BizHawk.Client.MultiHawk/Mainform.Designer.cs
+++ /dev/null
@@ -1,548 +0,0 @@
-namespace BizHawk.Client.MultiHawk
-{
-	partial class Mainform
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			this.MainformMenu = new MenuStripEx();
-			this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.NewSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.OpenSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SaveSessionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SaveSessionAsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RecentSessionSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
-			this.OpenRomMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RecentRomSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-			this.RebootCoresMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-			this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.ViewSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this._1xMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this._2xMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this._3xMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this._4xMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.MovieSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.RecordMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.PlayMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.StopMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RestartMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RecentMovieSubMenu = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-			this.ToggleReadonlyMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.controllerConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.hotkeyConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-			this.saveConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.WorkspacePanel = new System.Windows.Forms.Panel();
-			this.MainStatusBar = new System.Windows.Forms.StatusStrip();
-			this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.FameStatusBarLabel = new System.Windows.Forms.ToolStripStatusLabel();
-			this.PlayRecordStatusButton = new System.Windows.Forms.ToolStripDropDownButton();
-			this.StatusBarMessageLabel = new System.Windows.Forms.ToolStripStatusLabel();
-			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.RecordMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.PlayMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.LoadLastMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.StopMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RestartMovieContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.MainformMenu.SuspendLayout();
-			this.WorkspacePanel.SuspendLayout();
-			this.MainStatusBar.SuspendLayout();
-			this.contextMenuStrip1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// MainformMenu
-			// 
-			this.MainformMenu.ClickThrough = true;
-			this.MainformMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FileSubMenu,
-            this.ViewSubMenu,
-            this.MovieSubMenu,
-            this.configToolStripMenuItem});
-			this.MainformMenu.Location = new System.Drawing.Point(0, 0);
-			this.MainformMenu.Name = "MainformMenu";
-			this.MainformMenu.Size = new System.Drawing.Size(655, 24);
-			this.MainformMenu.TabIndex = 0;
-			this.MainformMenu.Text = "menuStrip1";
-			// 
-			// FileSubMenu
-			// 
-			this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.NewSessionMenuItem,
-            this.OpenSessionMenuItem,
-            this.SaveSessionMenuItem,
-            this.SaveSessionAsMenuItem,
-            this.RecentSessionSubMenu,
-            this.toolStripSeparator7,
-            this.OpenRomMenuItem,
-            this.RecentRomSubMenu,
-            this.toolStripSeparator5,
-            this.RebootCoresMenuItem,
-            this.toolStripSeparator3,
-            this.ExitMenuItem});
-			this.FileSubMenu.Name = "FileSubMenu";
-			this.FileSubMenu.Size = new System.Drawing.Size(37, 20);
-			this.FileSubMenu.Text = "&File";
-			this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
-			// 
-			// NewSessionMenuItem
-			// 
-			this.NewSessionMenuItem.Name = "NewSessionMenuItem";
-			this.NewSessionMenuItem.Size = new System.Drawing.Size(165, 22);
-			this.NewSessionMenuItem.Text = "&New Session";
-			this.NewSessionMenuItem.Click += new System.EventHandler(this.NewSessionMenuItem_Click);
-			// 
-			// OpenSessionMenuItem
-			// 
-			this.OpenSessionMenuItem.Name = "OpenSessionMenuItem";
-			this.OpenSessionMenuItem.Size = new System.Drawing.Size(165, 22);
-			this.OpenSessionMenuItem.Text = "&Open Session";
-			this.OpenSessionMenuItem.Click += new System.EventHandler(this.OpenSessionMenuItem_Click);
-			// 
-			// SaveSessionMenuItem
-			// 
-			this.SaveSessionMenuItem.Name = "SaveSessionMenuItem";
-			this.SaveSessionMenuItem.Size = new System.Drawing.Size(165, 22);
-			this.SaveSessionMenuItem.Text = "&Save Session";
-			this.SaveSessionMenuItem.Click += new System.EventHandler(this.SaveSessionMenuItem_Click);
-			// 
-			// SaveSessionAsMenuItem
-			// 
-			this.SaveSessionAsMenuItem.Name = "SaveSessionAsMenuItem";
-			this.SaveSessionAsMenuItem.Size = new System.Drawing.Size(165, 22);
-			this.SaveSessionAsMenuItem.Text = "Save Session &As...";
-			this.SaveSessionAsMenuItem.Click += new System.EventHandler(this.SaveSessionAsMenuItem_Click);
-			// 
-			// RecentSessionSubMenu
-			// 
-			this.RecentSessionSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripSeparator6});
-			this.RecentSessionSubMenu.Name = "RecentSessionSubMenu";
-			this.RecentSessionSubMenu.Size = new System.Drawing.Size(165, 22);
-			this.RecentSessionSubMenu.Text = "Recent Session";
-			this.RecentSessionSubMenu.DropDownOpened += new System.EventHandler(this.RecentSessionSubMenu_DropDownOpened);
-			// 
-			// toolStripSeparator6
-			// 
-			this.toolStripSeparator6.Name = "toolStripSeparator6";
-			this.toolStripSeparator6.Size = new System.Drawing.Size(57, 6);
-			// 
-			// toolStripSeparator7
-			// 
-			this.toolStripSeparator7.Name = "toolStripSeparator7";
-			this.toolStripSeparator7.Size = new System.Drawing.Size(162, 6);
-			// 
-			// OpenRomMenuItem
-			// 
-			this.OpenRomMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.OpenFile;
-			this.OpenRomMenuItem.Name = "OpenRomMenuItem";
-			this.OpenRomMenuItem.Size = new System.Drawing.Size(165, 22);
-			this.OpenRomMenuItem.Text = "Open ROM";
-			this.OpenRomMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click);
-			// 
-			// RecentRomSubMenu
-			// 
-			this.RecentRomSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripSeparator1});
-			this.RecentRomSubMenu.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Recent;
-			this.RecentRomSubMenu.Name = "RecentRomSubMenu";
-			this.RecentRomSubMenu.Size = new System.Drawing.Size(165, 22);
-			this.RecentRomSubMenu.Text = "Recent";
-			this.RecentRomSubMenu.DropDownOpened += new System.EventHandler(this.RecentRomSubMenu_DropDownOpened);
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(57, 6);
-			// 
-			// toolStripSeparator5
-			// 
-			this.toolStripSeparator5.Name = "toolStripSeparator5";
-			this.toolStripSeparator5.Size = new System.Drawing.Size(162, 6);
-			// 
-			// RebootCoresMenuItem
-			// 
-			this.RebootCoresMenuItem.Name = "RebootCoresMenuItem";
-			this.RebootCoresMenuItem.Size = new System.Drawing.Size(165, 22);
-			this.RebootCoresMenuItem.Text = "Reboot Cores";
-			this.RebootCoresMenuItem.Click += new System.EventHandler(this.RebootCoresMenuItem_Click);
-			// 
-			// toolStripSeparator3
-			// 
-			this.toolStripSeparator3.Name = "toolStripSeparator3";
-			this.toolStripSeparator3.Size = new System.Drawing.Size(162, 6);
-			// 
-			// ExitMenuItem
-			// 
-			this.ExitMenuItem.Name = "ExitMenuItem";
-			this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4";
-			this.ExitMenuItem.Size = new System.Drawing.Size(165, 22);
-			this.ExitMenuItem.Text = "E&xit";
-			this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
-			// 
-			// ViewSubMenu
-			// 
-			this.ViewSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this._1xMenuItem,
-            this._2xMenuItem,
-            this._3xMenuItem,
-            this._4xMenuItem});
-			this.ViewSubMenu.Enabled = false;
-			this.ViewSubMenu.Name = "ViewSubMenu";
-			this.ViewSubMenu.Size = new System.Drawing.Size(44, 20);
-			this.ViewSubMenu.Text = "&View";
-			this.ViewSubMenu.DropDownOpened += new System.EventHandler(this.ViewSubMenu_DropDownOpened);
-			// 
-			// _1xMenuItem
-			// 
-			this._1xMenuItem.Name = "_1xMenuItem";
-			this._1xMenuItem.Size = new System.Drawing.Size(85, 22);
-			this._1xMenuItem.Text = "&1x";
-			this._1xMenuItem.Click += new System.EventHandler(this._1xMenuItem_Click);
-			// 
-			// _2xMenuItem
-			// 
-			this._2xMenuItem.Name = "_2xMenuItem";
-			this._2xMenuItem.Size = new System.Drawing.Size(85, 22);
-			this._2xMenuItem.Text = "&2x";
-			this._2xMenuItem.Click += new System.EventHandler(this._2xMenuItem_Click);
-			// 
-			// _3xMenuItem
-			// 
-			this._3xMenuItem.Name = "_3xMenuItem";
-			this._3xMenuItem.Size = new System.Drawing.Size(85, 22);
-			this._3xMenuItem.Text = "&3x";
-			this._3xMenuItem.Click += new System.EventHandler(this._3xMenuItem_Click);
-			// 
-			// _4xMenuItem
-			// 
-			this._4xMenuItem.Name = "_4xMenuItem";
-			this._4xMenuItem.Size = new System.Drawing.Size(85, 22);
-			this._4xMenuItem.Text = "&4x";
-			this._4xMenuItem.Click += new System.EventHandler(this._4xMenuItem_Click);
-			// 
-			// MovieSubMenu
-			// 
-			this.MovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.RecordMovieMenuItem,
-            this.PlayMovieMenuItem,
-            this.StopMovieMenuItem,
-            this.RestartMovieMenuItem,
-            this.RecentMovieSubMenu,
-            this.toolStripSeparator2,
-            this.ToggleReadonlyMenuItem});
-			this.MovieSubMenu.Name = "MovieSubMenu";
-			this.MovieSubMenu.Size = new System.Drawing.Size(52, 20);
-			this.MovieSubMenu.Text = "&Movie";
-			this.MovieSubMenu.DropDownOpened += new System.EventHandler(this.MovieSubMenu_DropDownOpened);
-			// 
-			// RecordMovieMenuItem
-			// 
-			this.RecordMovieMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.RecordHS;
-			this.RecordMovieMenuItem.Name = "RecordMovieMenuItem";
-			this.RecordMovieMenuItem.Size = new System.Drawing.Size(168, 22);
-			this.RecordMovieMenuItem.Text = "Record Movie";
-			this.RecordMovieMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
-			// 
-			// PlayMovieMenuItem
-			// 
-			this.PlayMovieMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Play;
-			this.PlayMovieMenuItem.Name = "PlayMovieMenuItem";
-			this.PlayMovieMenuItem.Size = new System.Drawing.Size(168, 22);
-			this.PlayMovieMenuItem.Text = "Play Movie";
-			this.PlayMovieMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click);
-			// 
-			// StopMovieMenuItem
-			// 
-			this.StopMovieMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Stop;
-			this.StopMovieMenuItem.Name = "StopMovieMenuItem";
-			this.StopMovieMenuItem.Size = new System.Drawing.Size(168, 22);
-			this.StopMovieMenuItem.Text = "&Stop Movie";
-			this.StopMovieMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
-			// 
-			// RestartMovieMenuItem
-			// 
-			this.RestartMovieMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.restart;
-			this.RestartMovieMenuItem.Name = "RestartMovieMenuItem";
-			this.RestartMovieMenuItem.Size = new System.Drawing.Size(168, 22);
-			this.RestartMovieMenuItem.Text = "Restart Movie";
-			this.RestartMovieMenuItem.Click += new System.EventHandler(this.RestartMovieMenuItem_Click);
-			// 
-			// RecentMovieSubMenu
-			// 
-			this.RecentMovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripSeparator8});
-			this.RecentMovieSubMenu.Name = "RecentMovieSubMenu";
-			this.RecentMovieSubMenu.Size = new System.Drawing.Size(168, 22);
-			this.RecentMovieSubMenu.Text = "Recent";
-			this.RecentMovieSubMenu.DropDownOpened += new System.EventHandler(this.RecentMovieSubMenu_DropDownOpened);
-			// 
-			// toolStripSeparator8
-			// 
-			this.toolStripSeparator8.Name = "toolStripSeparator8";
-			this.toolStripSeparator8.Size = new System.Drawing.Size(57, 6);
-			// 
-			// toolStripSeparator2
-			// 
-			this.toolStripSeparator2.Name = "toolStripSeparator2";
-			this.toolStripSeparator2.Size = new System.Drawing.Size(165, 6);
-			// 
-			// ToggleReadonlyMenuItem
-			// 
-			this.ToggleReadonlyMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.ReadOnly;
-			this.ToggleReadonlyMenuItem.Name = "ToggleReadonlyMenuItem";
-			this.ToggleReadonlyMenuItem.Size = new System.Drawing.Size(168, 22);
-			this.ToggleReadonlyMenuItem.Text = "Toggle Read-only";
-			this.ToggleReadonlyMenuItem.Click += new System.EventHandler(this.ToggleReadonlyMenuItem_Click);
-			// 
-			// configToolStripMenuItem
-			// 
-			this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.controllerConfigToolStripMenuItem,
-            this.hotkeyConfigToolStripMenuItem,
-            this.toolStripSeparator4,
-            this.saveConfigToolStripMenuItem});
-			this.configToolStripMenuItem.Name = "configToolStripMenuItem";
-			this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
-			this.configToolStripMenuItem.Text = "&Config";
-			// 
-			// controllerConfigToolStripMenuItem
-			// 
-			this.controllerConfigToolStripMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.GameController;
-			this.controllerConfigToolStripMenuItem.Name = "controllerConfigToolStripMenuItem";
-			this.controllerConfigToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
-			this.controllerConfigToolStripMenuItem.Text = "Controller Config";
-			this.controllerConfigToolStripMenuItem.Click += new System.EventHandler(this.controllerConfigToolStripMenuItem_Click);
-			// 
-			// hotkeyConfigToolStripMenuItem
-			// 
-			this.hotkeyConfigToolStripMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.HotKeys;
-			this.hotkeyConfigToolStripMenuItem.Name = "hotkeyConfigToolStripMenuItem";
-			this.hotkeyConfigToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
-			this.hotkeyConfigToolStripMenuItem.Text = "Hotkey Config";
-			this.hotkeyConfigToolStripMenuItem.Click += new System.EventHandler(this.hotkeyConfigToolStripMenuItem_Click);
-			// 
-			// toolStripSeparator4
-			// 
-			this.toolStripSeparator4.Name = "toolStripSeparator4";
-			this.toolStripSeparator4.Size = new System.Drawing.Size(163, 6);
-			// 
-			// saveConfigToolStripMenuItem
-			// 
-			this.saveConfigToolStripMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Save;
-			this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem";
-			this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
-			this.saveConfigToolStripMenuItem.Text = "Save Config";
-			this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click);
-			// 
-			// WorkspacePanel
-			// 
-			this.WorkspacePanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.WorkspacePanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-			this.WorkspacePanel.Controls.Add(this.MainStatusBar);
-			this.WorkspacePanel.Location = new System.Drawing.Point(0, 25);
-			this.WorkspacePanel.Name = "WorkspacePanel";
-			this.WorkspacePanel.Size = new System.Drawing.Size(655, 405);
-			this.WorkspacePanel.TabIndex = 1;
-			// 
-			// MainStatusBar
-			// 
-			this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabel1,
-            this.FameStatusBarLabel,
-            this.PlayRecordStatusButton,
-            this.StatusBarMessageLabel});
-			this.MainStatusBar.Location = new System.Drawing.Point(0, 379);
-			this.MainStatusBar.Name = "MainStatusBar";
-			this.MainStatusBar.Size = new System.Drawing.Size(651, 22);
-			this.MainStatusBar.TabIndex = 0;
-			this.MainStatusBar.Text = "statusStrip1";
-			// 
-			// toolStripStatusLabel1
-			// 
-			this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
-			this.toolStripStatusLabel1.Size = new System.Drawing.Size(46, 17);
-			this.toolStripStatusLabel1.Text = "Frame: ";
-			// 
-			// FameStatusBarLabel
-			// 
-			this.FameStatusBarLabel.Name = "FameStatusBarLabel";
-			this.FameStatusBarLabel.Size = new System.Drawing.Size(13, 17);
-			this.FameStatusBarLabel.Text = "0";
-			// 
-			// PlayRecordStatusButton
-			// 
-			this.PlayRecordStatusButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.PlayRecordStatusButton.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Blank;
-			this.PlayRecordStatusButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.PlayRecordStatusButton.Name = "PlayRecordStatusButton";
-			this.PlayRecordStatusButton.Size = new System.Drawing.Size(29, 20);
-			this.PlayRecordStatusButton.Text = "No movie is active";
-			// 
-			// StatusBarMessageLabel
-			// 
-			this.StatusBarMessageLabel.Name = "StatusBarMessageLabel";
-			this.StatusBarMessageLabel.Size = new System.Drawing.Size(35, 17);
-			this.StatusBarMessageLabel.Text = "Hello";
-			// 
-			// contextMenuStrip1
-			// 
-			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.RecordMovieContextMenuItem,
-            this.PlayMovieContextMenuItem,
-            this.RestartMovieContextMenuItem,
-            this.StopMovieContextMenuItem,
-            this.LoadLastMovieContextMenuItem});
-			this.contextMenuStrip1.Name = "contextMenuStrip1";
-			this.contextMenuStrip1.Size = new System.Drawing.Size(161, 114);
-			this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
-			// 
-			// RecordMovieContextMenuItem
-			// 
-			this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.RecordHS;
-			this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem";
-			this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.RecordMovieContextMenuItem.Text = "Record Movie";
-			this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click);
-			// 
-			// PlayMovieContextMenuItem
-			// 
-			this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Play;
-			this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem";
-			this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.PlayMovieContextMenuItem.Text = "Play Movie";
-			this.PlayMovieContextMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click);
-			// 
-			// LoadLastMovieContextMenuItem
-			// 
-			this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Recent;
-			this.LoadLastMovieContextMenuItem.Name = "LoadLastMovieContextMenuItem";
-			this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.LoadLastMovieContextMenuItem.Text = "Load Last Movie";
-			this.LoadLastMovieContextMenuItem.Click += new System.EventHandler(this.LoadLastMovieMenuItem_Click);
-			// 
-			// StopMovieContextMenuItem
-			// 
-			this.StopMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Stop;
-			this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem";
-			this.StopMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.StopMovieContextMenuItem.Text = "Stop Movie";
-			this.StopMovieContextMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click);
-			// 
-			// RestartMovieContextMenuItem
-			// 
-			this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.restart;
-			this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem";
-			this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(160, 22);
-			this.RestartMovieContextMenuItem.Text = "Restart Movie";
-			this.RestartMovieContextMenuItem.Click += new System.EventHandler(this.RestartMovieMenuItem_Click);
-			// 
-			// Mainform
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(655, 431);
-			this.ContextMenuStrip = this.contextMenuStrip1;
-			this.Controls.Add(this.WorkspacePanel);
-			this.Controls.Add(this.MainformMenu);
-			this.MainMenuStrip = this.MainformMenu;
-			this.Name = "Mainform";
-			this.Text = "MultiHawk";
-			this.Load += new System.EventHandler(this.Mainform_Load);
-			this.MainformMenu.ResumeLayout(false);
-			this.MainformMenu.PerformLayout();
-			this.WorkspacePanel.ResumeLayout(false);
-			this.WorkspacePanel.PerformLayout();
-			this.MainStatusBar.ResumeLayout(false);
-			this.MainStatusBar.PerformLayout();
-			this.contextMenuStrip1.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private MenuStripEx MainformMenu;
-		private System.Windows.Forms.ToolStripMenuItem FileSubMenu;
-		private System.Windows.Forms.ToolStripMenuItem OpenRomMenuItem;
-		private System.Windows.Forms.Panel WorkspacePanel;
-		private System.Windows.Forms.StatusStrip MainStatusBar;
-		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
-		private System.Windows.Forms.ToolStripStatusLabel FameStatusBarLabel;
-		private System.Windows.Forms.ToolStripStatusLabel StatusBarMessageLabel;
-		private System.Windows.Forms.ToolStripMenuItem RecentRomSubMenu;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-		private System.Windows.Forms.ToolStripMenuItem MovieSubMenu;
-		private System.Windows.Forms.ToolStripMenuItem RecordMovieMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem PlayMovieMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem StopMovieMenuItem;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-		private System.Windows.Forms.ToolStripMenuItem ToggleReadonlyMenuItem;
-		private System.Windows.Forms.ToolStripDropDownButton PlayRecordStatusButton;
-		private System.Windows.Forms.ToolStripMenuItem configToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem controllerConfigToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem hotkeyConfigToolStripMenuItem;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
-		private System.Windows.Forms.ToolStripMenuItem ExitMenuItem;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
-		private System.Windows.Forms.ToolStripMenuItem saveConfigToolStripMenuItem;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
-		private System.Windows.Forms.ToolStripMenuItem RebootCoresMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem OpenSessionMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem SaveSessionMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem RecentSessionSubMenu;
-		private System.Windows.Forms.ToolStripMenuItem NewSessionMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem SaveSessionAsMenuItem;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
-		private System.Windows.Forms.ToolStripMenuItem ViewSubMenu;
-		private System.Windows.Forms.ToolStripMenuItem _1xMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem _2xMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem _3xMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem _4xMenuItem;
-		private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-		private System.Windows.Forms.ToolStripMenuItem LoadLastMovieContextMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem RecentMovieSubMenu;
-		private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
-		private System.Windows.Forms.ToolStripMenuItem RecordMovieContextMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem StopMovieContextMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem PlayMovieContextMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem RestartMovieMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem RestartMovieContextMenuItem;
-	}
-}
-
diff --git a/BizHawk.Client.MultiHawk/Mainform.cs b/BizHawk.Client.MultiHawk/Mainform.cs
deleted file mode 100644
index cf49fe3706..0000000000
--- a/BizHawk.Client.MultiHawk/Mainform.cs
+++ /dev/null
@@ -1,1560 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-using BizHawk.Common;
-using BizHawk.Common.IOExtensions;
-using BizHawk.Client.EmuHawk;
-using BizHawk.Bizware.BizwareGL;
-using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.IEmulatorExtensions;
-using BizHawk.Emulation.Cores.Nintendo.NES;
-using BizHawk.Client.Common;
-using BizHawk.Client.MultiHawk.ToolExtensions;
-
-namespace BizHawk.Client.MultiHawk
-{
-	public partial class Mainform : Form
-	{
-		static Mainform()
-		{
-			// If this isnt here, then our assemblyresolving hacks wont work due to the check for MainForm.INTERIM
-			// its.. weird. dont ask.
-		}
-
-		public Mainform(string[] args)
-		{
-			GLManager.CreateInstance(GlobalWin.IGL_GL);
-
-			InitializeComponent();
-			_throttle = new BizHawk.Client.EmuHawk.Throttle();
-			_inputManager = new InputManager(this);
-			Global.Config = ConfigService.Load<Config>(PathManager.DefaultIniPath);
-			Global.Config.DispFixAspectRatio = false; // TODO: don't hardcode this
-			Global.Config.ResolveDefaults();
-			GlobalWin.MainForm = this;
-
-			Global.ControllerInputCoalescer = new ControllerInputCoalescer();
-			Global.FirmwareManager = new FirmwareManager();
-			Global.MovieSession = new MovieSession
-			{
-				Movie = MovieService.DefaultInstance,
-				MovieControllerAdapter = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter,
-				MessageCallback = AddMessage,
-
-				AskYesNoCallback = StateErrorAskUser,
-				PauseCallback = PauseEmulator,
-				ModeChangedCallback = SetMainformMovieInfo
-			};
-
-			new AutoResetEvent(false);
-			// TODO
-			//Icon = Properties.Resources.logo;
-			Global.Game = GameInfo.NullInstance;
-
-			// In order to allow late construction of this database, we hook up a delegate here to dearchive the data and provide it on demand
-			// we could background thread this later instead if we wanted to be real clever
-			NES.BootGodDB.GetDatabaseBytes = () =>
-			{
-				string xmlPath = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.xml");
-				string x7zPath = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.7z");
-				bool loadXml = File.Exists(xmlPath);
-				using (var NesCartFile = new HawkFile(loadXml ? xmlPath : x7zPath))
-				{
-					if (!loadXml) { NesCartFile.BindFirst(); }
-					return NesCartFile
-						.GetStream()
-						.ReadAllBytes();
-				}
-			};
-
-			Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb.txt"));
-
-			Input.Initialize(this.Handle);
-			InitControls();
-
-			// TODO
-			//CoreFileProvider.SyncCoreCommInputSignals();
-
-			Global.ActiveController = new Controller(NullController.Instance.Definition);
-			Global.AutoFireController = AutofireNullControls;
-			Global.AutofireStickyXORAdapter.SetOnOffPatternFromConfig();
-
-			Closing += (o, e) =>
-			{
-				Global.MovieSession.Movie.Stop();
-
-				foreach (var ew in EmulatorWindows.ToList())
-				{
-					ew.ShutDown();
-				}
-
-				SaveConfig();
-			};
-
-			if (Global.Config.MainWndx != -1 && Global.Config.MainWndy != -1 && Global.Config.SaveWindowPosition)
-			{
-				Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy);
-			}
-		}
-
-		// TODO: make this an actual property, set it when loading a Rom, and pass it dialogs, etc
-		// This is a quick hack to reduce the dependency on Global.Emulator
-		public IEmulator Emulator
-		{
-			get { return Global.Emulator; }
-			set { Global.Emulator = value; }
-		}
-
-		private static bool StateErrorAskUser(string title, string message)
-		{
-			var result = MessageBox.Show(
-				message,
-				title,
-				MessageBoxButtons.YesNo,
-				MessageBoxIcon.Question
-			);
-
-			return result == DialogResult.Yes;
-		}
-
-		private void Mainform_Load(object sender, EventArgs e)
-		{
-			SetMainformMovieInfo();
-
-			if (Global.Config.RecentRomSessions.AutoLoad)
-			{
-				LoadRomSessionFromRecent(Global.Config.RecentRomSessions.MostRecent);
-
-				if (Global.Config.RecentMovies.AutoLoad && !Global.Config.RecentMovies.Empty)
-				{
-					LoadMoviesFromRecent(Global.Config.RecentMovies.MostRecent);
-				}
-			}
-
-			if (Global.Config.SaveWindowPosition && Global.Config.MainWidth > 0 && Global.Config.MainHeight > 0)
-			{
-				this.Size = new Size(Global.Config.MainWidth, Global.Config.MainHeight);
-				
-			}
-		}
-
-		public EmulatorWindowList EmulatorWindows = new EmulatorWindowList();
-		private AutofireController AutofireNullControls;
-		private bool _exit;
-
-		protected override void OnClosed(EventArgs e)
-		{
-			_exit = true;
-			base.OnClosed(e);
-		}
-
-		private void SaveConfig()
-		{
-			if (Global.Config.SaveWindowPosition)
-			{
-				if (Global.Config.MainWndx != -32000) // When minimized location is -32000, don't save this into the config file!
-				{
-					Global.Config.MainWndx = Location.X;
-				}
-
-				if (Global.Config.MainWndy != -32000)
-				{
-					Global.Config.MainWndy = Location.Y;
-				}
-			}
-			else
-			{
-				Global.Config.MainWndx = -1;
-				Global.Config.MainWndy = -1;
-			}
-
-			Global.Config.MainWidth = this.Width;
-			Global.Config.MainHeight = this.Height;
-
-			ConfigService.Save(PathManager.DefaultIniPath, Global.Config);
-		}
-
-		private void InitControls()
-		{
-			var controls = new Controller(
-				new ControllerDefinition
-				{
-					Name = "Emulator Frontend Controls",
-					BoolButtons = Global.Config.HotkeyBindings.Select(x => x.DisplayName).ToList()
-				});
-
-			foreach (var b in Global.Config.HotkeyBindings)
-			{
-				controls.BindMulti(b.DisplayName, b.Bindings);
-			}
-
-			Global.ClientControls = controls;
-			AutofireNullControls = new AutofireController(NullController.Instance.Definition, Emulator);
-		}
-
-		private void OpenRomMenuItem_Click(object sender, EventArgs e)
-		{
-			var ofd = new OpenFileDialog
-			{
-				InitialDirectory = PathManager.GetExeDirectoryAbsolute()
-			};
-
-			ofd.Filter = FormatFilter(
-					"Rom Files", "*.nes;*.fds;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.a26;*.a78;*.lnx;*.m3u;*.cue;*.ccd;*.exe;*.gb;*.gbc;*.gba;*.gen;*.md;*.col;.int;*.smc;*.sfc;*.prg;*.d64;*.g64;*.crt;*.sgb;*.xml;*.z64;*.v64;*.n64;*.ws;*.wsc;%ARCH%",
-					"Music Files", "*.psf;*.sid",
-					"Disc Images", "*.cue;*.ccd;*.m3u",
-					"NES", "*.nes;*.fds;%ARCH%",
-					"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
-					"Master System", "*.sms;*.gg;*.sg;%ARCH%",
-					"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;%ARCH%",
-					"TI-83", "*.rom;%ARCH%",
-					"Archive Files", "%ARCH%",
-					"Savestate", "*.state",
-					"Atari 2600", "*.a26;*.bin;%ARCH%",
-					"Atari 7800", "*.a78;*.bin;%ARCH%",
-					"Atari Lynx", "*.lnx;%ARCH%",
-					"Genesis", "*.gen;*.smd;*.bin;*.md;*.cue;*.ccd;%ARCH%",
-					"Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%",
-					"Gameboy Advance", "*.gba;%ARCH%",
-					"Colecovision", "*.col;%ARCH%",
-					"Intellivision (very experimental)", "*.int;*.bin;*.rom;%ARCH%",
-					"PSX Executables (experimental)", "*.exe",
-					"PSF Playstation Sound File", "*.psf;*.minipsf",
-					"Commodore 64 (experimental)", "*.prg; *.d64, *.g64; *.crt;%ARCH%",
-					"SID Commodore 64 Music File", "*.sid;%ARCH%",
-					"Nintendo 64", "*.z64;*.v64;*.n64",
-					"WonderSwan", "*.ws;*.wsc;%ARCH%",
-					"All Files", "*.*");
-
-			var result = ofd.ShowDialog();
-			if (result != DialogResult.OK)
-			{
-				return;
-			}
-
-			LoadRom(ofd.FileName);
-		}
-
-		private readonly InputManager _inputManager;
-
-		private bool ReloadRom(EmulatorWindow ew)
-		{
-			bool deterministic = ew.Emulator.DeterministicEmulation;
-			string path = ew.CurrentRomPath;
-
-			var loader = new RomLoader
-			{
-				ChooseArchive = LoadArhiveChooser,
-				ChoosePlatform = ChoosePlatformForRom,
-				Deterministic = deterministic,
-				MessageCallback = AddMessage
-			};
-
-
-			loader.OnLoadError += ShowLoadError;
-			loader.OnLoadSettings += CoreSettings;
-			loader.OnLoadSyncSettings += CoreSyncSettings;
-
-			var nextComm = new CoreComm(ShowMessageCoreComm, AddMessage);
-
-			var result = loader.LoadRom(path, nextComm);
-
-			if (result)
-			{
-				ew.SaveRam();
-				ew.Emulator.Dispose();
-				ew.Emulator = loader.LoadedEmulator;
-				ew.CoreComm = nextComm;
-
-				_inputManager.SyncControls();
-
-				if (EmulatorWindows.First() == ew)
-				{
-					Emulator = ew.Emulator;
-				}
-
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		private string StripArchivePath(string path)
-		{
-			if (path.Contains("|"))
-			{
-				return path.Split('|').Last();
-			}
-
-			return path;
-		}
-
-		private bool LoadRom(string path)
-		{
-			bool deterministic = true;
-
-			var loader = new RomLoader
-			{
-				ChooseArchive = LoadArhiveChooser,
-				ChoosePlatform = ChoosePlatformForRom,
-				Deterministic = deterministic,
-				MessageCallback = AddMessage
-			};
-
-
-			loader.OnLoadError += ShowLoadError;
-			loader.OnLoadSettings += CoreSettings;
-			loader.OnLoadSyncSettings += CoreSyncSettings;
-
-			var nextComm = new CoreComm(ShowMessageCoreComm, AddMessage);
-			nextComm.CoreFileProvider = new CoreFileProvider(s => MessageBox.Show(s));
-
-			var result = loader.LoadRom(path, nextComm);
-
-			if (result)
-			{
-				var ew = new EmulatorWindow(this)
-				{
-					TopLevel = false,
-					Text = Path.GetFileNameWithoutExtension(StripArchivePath(path)),
-					Emulator = loader.LoadedEmulator,
-					GL = new Bizware.BizwareGL.Drivers.OpenTK.IGL_TK(2,0,false),
-					//GL = new Bizware.BizwareGL.Drivers.SlimDX.IGL_SlimDX9(),
-					GLManager = GLManager.Instance,
-					Game = loader.Game,
-					CurrentRomPath = loader.CanonicalFullPath
-				};
-
-				nextComm.ReleaseGLContext = (o) => GlobalWin.GLManager.ReleaseGLContext(o);
-				nextComm.RequestGLContext = (major, minor, forward) => GlobalWin.GLManager.CreateGLContext(major, minor, forward);
-				nextComm.ActivateGLContext = (gl) => GlobalWin.GLManager.Activate((GLManager.ContextRef)gl);
-				nextComm.DeactivateGLContext = () => GlobalWin.GLManager.Deactivate();
-
-				ew.CoreComm = nextComm;
-				ew.Init();
-
-				if (EmulatorWindows.Any())
-				{
-					// Attempt to open the window is a smart location
-					var last = EmulatorWindows.Last();
-
-					int x = last.Location.X + last.Width + 5;
-					int y = last.Location.Y;
-					if (x + (last.Width / 2) > Width) // If it will go too far off screen
-					{
-						y += last.Height + 5;
-						x = EmulatorWindows.First().Location.X;
-					}
-
-					ew.Location = new Point(x, y);
-				}
-				
-
-				EmulatorWindows.Add(ew);
-
-				WorkspacePanel.Controls.Add(ew);
-				ew.Show();
-
-				Global.Config.RecentRoms.Add(loader.CanonicalFullPath);
-
-				if (EmulatorWindows.Count == 1)
-				{
-					Emulator = ew.Emulator;
-					ViewSubMenu.Enabled = true;
-				}
-
-				_inputManager.SyncControls();
-
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		/// <summary>
-		/// Controls whether the app generates input events. should be turned off for most modal dialogs
-		/// </summary>
-		public bool AllowInput
-		{
-			get
-			{
-				// the main form gets input
-				if (ActiveForm == this)
-				{
-					return true;
-				}
-
-				// modals that need to capture input for binding purposes get input, of course
-				if (ActiveForm is BizHawk.Client.EmuHawk.HotkeyConfig
-					|| ActiveForm is BizHawk.Client.EmuHawk.ControllerConfig
-					//|| ActiveForm is TAStudio
-					//|| ActiveForm is VirtualpadTool
-				)
-				{
-					return true;
-				}
-
-				return false;
-			}
-		}
-
-		private static string FormatFilter(params string[] args)
-		{
-			var sb = new StringBuilder();
-			if (args.Length % 2 != 0)
-			{
-				throw new ArgumentException();
-			}
-
-			var num = args.Length / 2;
-			for (int i = 0; i < num; i++)
-			{
-				sb.AppendFormat("{0} ({1})|{1}", args[i * 2], args[i * 2 + 1]);
-				if (i != num - 1)
-				{
-					sb.Append('|');
-				}
-			}
-
-			var str = sb.ToString().Replace("%ARCH%", "*.zip;*.rar;*.7z;*.gz");
-			str = str.Replace(";", "; ");
-			return str;
-		}
-
-		public void AddMessage(string message)
-		{
-			StatusBarMessageLabel.Text = message;
-		}
-
-		private string ChoosePlatformForRom(RomGame rom)
-		{
-			// TODO
-			return null;
-		}
-
-		private int? LoadArhiveChooser(HawkFile file)
-		{
-			var ac = new BizHawk.Client.EmuHawk.ArchiveChooser(file);
-			if (ac.ShowDialog(this) == DialogResult.OK)
-			{
-				return ac.SelectedMemberIndex;
-			}
-			else
-			{
-				return null;
-			}
-		}
-
-		private void ShowLoadError(object sender, RomLoader.RomErrorArgs e)
-		{
-			string title = "load error";
-			if (e.AttemptedCoreLoad != null)
-			{
-				title = e.AttemptedCoreLoad + " load error";
-			}
-
-			MessageBox.Show(this, e.Message, title, MessageBoxButtons.OK, MessageBoxIcon.Error);
-		}
-
-		private static void CoreSettings(object sender, RomLoader.SettingsLoadArgs e)
-		{
-			e.Settings = Global.Config.GetCoreSettings(e.Core);
-		}
-
-		private void CoreSyncSettings(object sender, RomLoader.SettingsLoadArgs e)
-		{
-			if (Global.MovieSession.QueuedMovie != null)
-			{
-				if (!string.IsNullOrWhiteSpace(Global.MovieSession.QueuedMovie.SyncSettingsJson))
-				{
-					e.Settings = ConfigService.LoadWithType(Global.MovieSession.QueuedMovie.SyncSettingsJson);
-				}
-				else
-				{
-					MessageBox.Show(
-						"No sync settings found, using currently configured settings for this core.",
-						"No sync settings found",
-						MessageBoxButtons.OK,
-						MessageBoxIcon.Warning
-						);
-
-					e.Settings = Global.Config.GetCoreSyncSettings(e.Core);
-				}
-			}
-			else
-			{
-				e.Settings = Global.Config.GetCoreSyncSettings(e.Core);
-			}
-
-		}
-
-		public void FlagNeedsReboot()
-		{
-			// TODO
-		}
-
-		private void ShowMessageCoreComm(string message)
-		{
-			MessageBox.Show(this, message, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-		}
-
-		private static void CheckMessages()
-		{
-			Application.DoEvents();
-			if (ActiveForm != null)
-			{
-				BizHawk.Client.EmuHawk.ScreenSaver.ResetTimerPeriodically();
-			}
-		}
-
-		// sends an alt+mnemonic combination
-		private void SendAltKeyChar(char c)
-		{
-			typeof(ToolStrip).InvokeMember("ProcessMnemonicInternal", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Instance, null, MainformMenu, new object[] { c });
-		}
-
-		// sends a simulation of a plain alt key keystroke
-		private void SendPlainAltKey(int lparam)
-		{
-			var m = new Message { WParam = new IntPtr(0xF100), LParam = new IntPtr(lparam), Msg = 0x0112, HWnd = Handle };
-			base.WndProc(ref m);
-		}
-
-		public void ProcessInput()
-		{
-			ControllerInputCoalescer conInput = Global.ControllerInputCoalescer as ControllerInputCoalescer;
-
-			for (; ; )
-			{
-
-				// loop through all available events
-				var ie = Input.Instance.DequeueEvent();
-				if (ie == null) { break; }
-
-				// look for hotkey bindings for this key
-				var triggers = Global.ClientControls.SearchBindings(ie.LogicalButton.ToString());
-				if (triggers.Count == 0)
-				{
-					// Maybe it is a system alt-key which hasnt been overridden
-					if (ie.EventType == Input.InputEventType.Press)
-					{
-						if (ie.LogicalButton.Alt && ie.LogicalButton.Button.Length == 1)
-						{
-							var c = ie.LogicalButton.Button.ToLower()[0];
-							if ((c >= 'a' && c <= 'z') || c == ' ')
-							{
-								SendAltKeyChar(c);
-							}
-						}
-						if (ie.LogicalButton.Alt && ie.LogicalButton.Button == "Space")
-						{
-							SendPlainAltKey(32);
-						}
-					}
-				}
-
-				bool handled;
-				switch (Global.Config.Input_Hotkey_OverrideOptions)
-				{
-					default:
-					case 0: // Both allowed
-						conInput.Receive(ie);
-
-						handled = false;
-						if (ie.EventType == Input.InputEventType.Press)
-						{
-							handled = triggers.Aggregate(handled, (current, trigger) => current | CheckHotkey(trigger));
-						}
-
-						// hotkeys which arent handled as actions get coalesced as pollable virtual client buttons
-						if (!handled)
-						{
-							GlobalWin.HotkeyCoalescer.Receive(ie);
-						}
-
-						break;
-					case 1: // Input overrides Hokeys
-						conInput.Receive(ie);
-						if (!Global.ActiveController.HasBinding(ie.LogicalButton.ToString()))
-						{
-							handled = false;
-							if (ie.EventType == Input.InputEventType.Press)
-							{
-								handled = triggers.Aggregate(handled, (current, trigger) => current | CheckHotkey(trigger));
-							}
-
-							// hotkeys which arent handled as actions get coalesced as pollable virtual client buttons
-							if (!handled)
-							{
-								GlobalWin.HotkeyCoalescer.Receive(ie);
-							}
-						}
-						break;
-					case 2: // Hotkeys override Input
-						handled = false;
-						if (ie.EventType == Input.InputEventType.Press)
-						{
-							handled = triggers.Aggregate(handled, (current, trigger) => current | CheckHotkey(trigger));
-						}
-
-						// hotkeys which arent handled as actions get coalesced as pollable virtual client buttons
-						if (!handled)
-						{
-							GlobalWin.HotkeyCoalescer.Receive(ie);
-							conInput.Receive(ie);
-						}
-						break;
-				}
-			}
-		}
-
-		public void ProgramRunLoop()
-		{			
-			CheckMessages();
-
-			for (; ; )
-			{
-				Input.Instance.Update();
-
-				// handle events and dispatch as a hotkey action, or a hotkey button, or an input button
-				ProcessInput();
-				Global.ClientControls.LatchFromPhysical(GlobalWin.HotkeyCoalescer);
-
-				Global.ActiveController.LatchFromPhysical(Global.ControllerInputCoalescer);
-
-				// TODO
-				//Global.ActiveController.ApplyAxisConstraints(
-				//	(Emulator is N64 && Global.Config.N64UseCircularAnalogConstraint) ? "Natural Circle" : null);
-
-				Global.ActiveController.OR_FromLogical(Global.ClickyVirtualPadController);
-				Global.AutoFireController.LatchFromPhysical(Global.ControllerInputCoalescer);
-
-				if (Global.ClientControls["Autohold"])
-				{
-					Global.StickyXORAdapter.MassToggleStickyState(Global.ActiveController.PressedButtons);
-					Global.AutofireStickyXORAdapter.MassToggleStickyState(Global.AutoFireController.PressedButtons);
-				}
-				else if (Global.ClientControls["Autofire"])
-				{
-					Global.AutofireStickyXORAdapter.MassToggleStickyState(Global.ActiveController.PressedButtons);
-				}
-
-				// autohold/autofire must not be affected by the following inputs
-				Global.ActiveController.Overrides(Global.LuaAndAdaptor);
-
-				if (EmulatorWindows.Any())
-				{
-					StepRunLoop_Core();
-					StepRunLoop_Throttle();
-
-					foreach (var window in EmulatorWindows)
-					{
-						window.Render();
-					}
-				}
-
-				CheckMessages();
-
-				if (_exit)
-				{
-					break;
-				}
-
-				Thread.Sleep(0);
-			}
-
-			Shutdown();
-		}
-
-		private void Shutdown()
-		{
-			//TODO
-			//if (_currAviWriter != null)
-			//{
-			//	_currAviWriter.CloseFile();
-			//	_currAviWriter = null;
-			//}
-		}
-
-		public void LoadQuickSave(string quickSlotName)
-		{
-			try
-			{
-				foreach (var window in EmulatorWindows)
-				{
-					window.LoadQuickSave(quickSlotName);
-				}
-			}
-			catch
-			{
-				MessageBox.Show("Could not load " + quickSlotName);
-			}
-		}
-
-		public void SaveQuickSave(string quickSlotName)
-		{
-			try
-			{
-				foreach (var window in EmulatorWindows)
-				{
-					window.SaveQuickSave(quickSlotName);
-				}
-			}
-			catch
-			{
-				MessageBox.Show("Could not save " + quickSlotName);
-			}
-		}
-
-		private void SelectSlot(int num)
-		{
-			Global.Config.SaveSlot = num;
-			UpdateStatusSlots();
-		}
-
-		private void UpdateStatusSlots()
-		{
-			// TODO
-			SaveSlotSelectedMessage();
-			UpdateAfterFrameChanged();
-		}
-
-		private void SaveSlotSelectedMessage()
-		{
-			AddMessage("Slot " + Global.Config.SaveSlot + " selected.");
-		}
-
-		public void TogglePause()
-		{
-			EmulatorPaused ^= true;
-			//SetPauseStatusbarIcon(); // TODO
-		}
-		private bool CheckHotkey(string trigger)
-		{
-			switch (trigger)
-			{
-				default:
-					return false;
-
-				case "Pause":
-					TogglePause();
-					break;
-				case "Reboot Core":
-					RebootCoresMenuItem_Click(null, null);
-					break;
-				case "Quick Load":
-					LoadQuickSave("QuickSave" + Global.Config.SaveSlot);
-					break;
-				case "Quick Save":
-					SaveQuickSave("QuickSave" + Global.Config.SaveSlot);
-					break;
-
-				// Save States
-				case "Save State 0":
-					SaveQuickSave("QuickSave0");
-					Global.Config.SaveSlot = 0;
-					UpdateStatusSlots();
-					break;
-				case "Save State 1":
-					SaveQuickSave("QuickSave1");
-					Global.Config.SaveSlot = 1;
-					UpdateStatusSlots();
-					break;
-				case "Save State 2":
-					SaveQuickSave("QuickSave2");
-					Global.Config.SaveSlot = 2;
-					UpdateStatusSlots();
-					break;
-				case "Save State 3":
-					SaveQuickSave("QuickSave3");
-					Global.Config.SaveSlot = 3;
-					UpdateStatusSlots();
-					break;
-				case "Save State 4":
-					SaveQuickSave("QuickSave4");
-					Global.Config.SaveSlot = 4;
-					UpdateStatusSlots();
-					break;
-				case "Save State 5":
-					SaveQuickSave("QuickSave5");
-					Global.Config.SaveSlot = 5;
-					UpdateStatusSlots();
-					break;
-				case "Save State 6":
-					SaveQuickSave("QuickSave6");
-					Global.Config.SaveSlot = 6;
-					UpdateStatusSlots();
-					break;
-				case "Save State 7":
-					SaveQuickSave("QuickSave7");
-					Global.Config.SaveSlot = 7;
-					UpdateStatusSlots();
-					break;
-				case "Save State 8":
-					SaveQuickSave("QuickSave8");
-					Global.Config.SaveSlot = 8;
-					UpdateStatusSlots();
-					break;
-				case "Save State 9":
-					SaveQuickSave("QuickSave9");
-					Global.Config.SaveSlot = 9;
-					//UpdateStatusSlots();
-					break;
-				case "Load State 0":
-					LoadQuickSave("QuickSave0");
-					Global.Config.SaveSlot = 0;
-					UpdateStatusSlots();
-					break;
-				case "Load State 1":
-					LoadQuickSave("QuickSave1");
-					Global.Config.SaveSlot = 1;
-					UpdateStatusSlots();
-					break;
-				case "Load State 2":
-					LoadQuickSave("QuickSave2");
-					Global.Config.SaveSlot = 2;
-					UpdateStatusSlots();
-					break;
-				case "Load State 3":
-					LoadQuickSave("QuickSave3");
-					Global.Config.SaveSlot = 3;
-					UpdateStatusSlots();
-					break;
-				case "Load State 4":
-					LoadQuickSave("QuickSave4");
-					Global.Config.SaveSlot = 4;
-					UpdateStatusSlots();
-					break;
-				case "Load State 5":
-					LoadQuickSave("QuickSave5");
-					Global.Config.SaveSlot = 5;
-					UpdateStatusSlots();
-					break;
-				case "Load State 6":
-					LoadQuickSave("QuickSave6");
-					Global.Config.SaveSlot = 6;
-					UpdateStatusSlots();
-					break;
-				case "Load State 7":
-					LoadQuickSave("QuickSave7");
-					Global.Config.SaveSlot = 7;
-					break;
-				case "Load State 8":
-					LoadQuickSave("QuickSave8");
-					Global.Config.SaveSlot = 8;
-					UpdateStatusSlots();
-					break;
-				case "Load State 9":
-					LoadQuickSave("QuickSave9");
-					Global.Config.SaveSlot = 9;
-					UpdateStatusSlots();
-					break;
-
-				case "Select State 0":
-					SelectSlot(0);
-					break;
-				case "Select State 1":
-					SelectSlot(1);
-					break;
-				case "Select State 2":
-					SelectSlot(2);
-					break;
-				case "Select State 3":
-					SelectSlot(3);
-					break;
-				case "Select State 4":
-					SelectSlot(4);
-					break;
-				case "Select State 5":
-					SelectSlot(5);
-					break;
-				case "Select State 6":
-					SelectSlot(6);
-					break;
-				case "Select State 7":
-					SelectSlot(7);
-					break;
-				case "Select State 8":
-					SelectSlot(8);
-					break;
-				case "Select State 9":
-					SelectSlot(9);
-					break;
-
-				// Movie
-				case "Stop Movie":
-					StopMovieMenuItem_Click(null, null);
-					break;
-				case "Toggle read-only":
-					ToggleReadonlyMenuItem_Click(null, null);
-					break;
-				// TODO
-				//case "Play from beginning":
-				//	RestartMovie();
-				//	break;
-				// TODO
-				//case "Save Movie":
-				//	SaveMovie();
-				//	break;
-			}
-
-			return true;
-		}
-
-		public bool PressFrameAdvance = false;
-		public bool PressRewind = false;
-		public bool FastForward = false;
-		public bool TurboFastForward = false;
-		public bool EmulatorPaused = true;
-		private readonly BizHawk.Client.EmuHawk.Throttle _throttle;
-		//private bool _unthrottled; // TODO
-		private bool _runloopFrameAdvance;
-		private bool _runloopFrameProgress;
-		private long _frameAdvanceTimestamp;
-		private bool _runloopLastFf;
-		private int _runloopFps;
-		private long _runloopSecond;
-		private int _runloopLastFps;
-
-		public bool IsTurboing
-		{
-			get
-			{
-				return Global.ClientControls["Turbo"];
-			}
-		}
-
-		private void SyncThrottle()
-		{
-			// "unthrottled" = throttle was turned off with "Toggle Throttle" hotkey
-			// "turbo" = throttle is off due to the "Turbo" hotkey being held
-			// They are basically the same thing but one is a toggle and the other requires a
-			// hotkey to be held. There is however slightly different behavior in that turbo
-			// skips outputting the audio. There's also a third way which is when no throttle
-			// method is selected, but the clock throttle determines that by itself and
-			// everything appears normal here.
-
-			var fastForward = Global.ClientControls["Fast Forward"] || FastForward;
-			var turbo = IsTurboing;
-
-			int speedPercent = fastForward ? Global.Config.SpeedPercentAlternate : Global.Config.SpeedPercent;
-
-			Global.DisableSecondaryThrottling = /*_unthrottled || TODO */ turbo || fastForward;
-
-			// realtime throttle is never going to be so exact that using a double here is wrong
-			_throttle.SetCoreFps(EmulatorWindows.Master.Emulator.VsyncRate());
-			_throttle.signal_paused = EmulatorPaused;
-			_throttle.signal_unthrottle = /*_unthrottled || TODO */ turbo;
-			_throttle.signal_overrideSecondaryThrottle = fastForward && (Global.Config.SoundThrottle || Global.Config.VSyncThrottle || Global.Config.VSync);
-			_throttle.SetSpeedPercent(speedPercent);
-		}
-
-		private void StepRunLoop_Throttle()
-		{
-			SyncThrottle();
-			_throttle.signal_frameAdvance = _runloopFrameAdvance;
-			_throttle.signal_continuousFrameAdvancing = _runloopFrameProgress;
-
-			_throttle.Step(true, -1);
-		}
-
-		public void PauseEmulator()
-		{
-			EmulatorPaused = true;
-			//SetPauseStatusbarIcon(); // TODO
-		}
-
-		public void UnpauseEmulator()
-		{
-			EmulatorPaused = false;
-			//SetPauseStatusbarIcon(); // TODO
-		}
-
-		private void StepRunLoop_Core()
-		{
-			var runFrame = false;
-			_runloopFrameAdvance = false;
-			var currentTimestamp = Stopwatch.GetTimestamp();
-			double frameAdvanceTimestampDeltaMs = (double)(currentTimestamp - _frameAdvanceTimestamp) / Stopwatch.Frequency * 1000.0;
-			bool frameProgressTimeElapsed = frameAdvanceTimestampDeltaMs >= Global.Config.FrameProgressDelayMs;
-
-			if (Global.ClientControls["Frame Advance"])
-			{
-				// handle the initial trigger of a frame advance
-				if (_frameAdvanceTimestamp == 0)
-				{
-					PauseEmulator();
-					runFrame = true;
-					_runloopFrameAdvance = true;
-					_frameAdvanceTimestamp = currentTimestamp;
-				}
-				else
-				{
-					// handle the timed transition from countdown to FrameProgress
-					if (frameProgressTimeElapsed)
-					{
-						runFrame = true;
-						_runloopFrameProgress = true;
-						UnpauseEmulator();
-					}
-				}
-			}
-			else
-			{
-				// handle release of frame advance: do we need to deactivate FrameProgress?
-				if (_runloopFrameProgress)
-				{
-					_runloopFrameProgress = false;
-					PauseEmulator();
-				}
-
-				_frameAdvanceTimestamp = 0;
-			}
-
-			if (!EmulatorPaused)
-			{
-				runFrame = true;
-			}
-
-			if (runFrame)
-			{
-				var isFastForwarding = Global.ClientControls["Fast Forward"] || IsTurboing;
-				var updateFpsString = _runloopLastFf != isFastForwarding;
-				_runloopLastFf = isFastForwarding;
-				_runloopFps++;
-
-				if ((double)(currentTimestamp - _runloopSecond) / Stopwatch.Frequency >= 1.0)
-				{
-					_runloopLastFps = _runloopFps;
-					_runloopSecond = currentTimestamp;
-					_runloopFps = 0;
-					updateFpsString = true;
-				}
-
-				if (updateFpsString)
-				{
-					var fps_string = _runloopLastFps + " fps";
-					if (IsTurboing)
-					{
-						fps_string += " >>>>";
-					}
-					else if (isFastForwarding)
-					{
-						fps_string += " >>";
-					}
-
-					//GlobalWin.OSD.FPS = fps_string; // TODO
-				}
-
-				Global.MovieSession.HandleMovieOnFrameLoop();
-
-				foreach (var window in EmulatorWindows)
-				{
-					window.FrameAdvance();
-				}
-
-				PressFrameAdvance = false;
-
-				UpdateAfterFrameChanged();
-			}
-		}
-
-		private void UpdateAfterFrameChanged()
-		{
-			if (EmulatorWindows.Any())
-			{
-				string frame = EmulatorWindows.Master.Emulator.Frame.ToString();
-
-				if (Global.MovieSession.Movie.IsActive)
-				{
-					if (Global.MovieSession.Movie.IsFinished)
-					{
-						frame += $" / {Global.MovieSession.Movie.FrameCount} (finished)";
-					}
-					else if (Global.MovieSession.Movie.IsPlaying)
-					{
-						frame += $" / {Global.MovieSession.Movie.FrameCount}";
-					}
-				}
-
-				FameStatusBarLabel.Text = frame;
-			}
-		}
-
-		private void FileSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			SaveSessionMenuItem.Enabled = !string.IsNullOrWhiteSpace(EmulatorWindows.SessionName);
-			SaveSessionAsMenuItem.Enabled = EmulatorWindows.Any();
-		}
-
-		private void LoadRomFromRecent(string rom)
-		{
-			if (!LoadRom(rom))
-			{
-				Global.Config.RecentRoms.HandleLoadError(rom);
-			}
-		}
-
-		private void MovieSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			PlayMovieMenuItem.Enabled =
-				RecordMovieMenuItem.Enabled =
-				EmulatorWindows.Any();
-
-			StopMovieMenuItem.Enabled =
-				RestartMovieMenuItem.Enabled =
-				Global.MovieSession.Movie.IsActive;
-		}
-
-		private void RecordMovieMenuItem_Click(object sender, EventArgs e)
-		{
-			new RecordMovie(Emulator).ShowDialog();
-			UpdateMainText();
-			UpdateAfterFrameChanged();
-		}
-
-		private void PlayMovieMenuItem_Click(object sender, EventArgs e)
-		{
-			new PlayMovie().ShowDialog();
-			UpdateMainText();
-			UpdateAfterFrameChanged();
-		}
-
-		private void StopMovieMenuItem_Click(object sender, EventArgs e)
-		{
-			Global.MovieSession.StopMovie(true);
-			SetMainformMovieInfo();
-			UpdateMainText();
-			UpdateAfterFrameChanged();
-			//UpdateStatusSlots(); // TODO
-		}
-
-		private void ToggleReadonlyMenuItem_Click(object sender, EventArgs e)
-		{
-			Global.MovieSession.ReadOnly ^= true;
-			if (Global.MovieSession.ReadOnly)
-			{
-				AddMessage("Movie is now Read-only");
-			}
-			else
-			{
-				AddMessage("Movie is now read+write");
-			}
-		}
-
-		private void LoadMoviesFromRecent(string path)
-		{
-			if (File.Exists(path))
-			{
-				var movie = MovieService.Get(path);
-				Global.MovieSession.ReadOnly = true;
-				StartNewMovie(movie, false);
-			}
-			else
-			{
-				Global.Config.RecentMovies.HandleLoadError(path);
-			}
-		}
-
-		public void SetMainformMovieInfo()
-		{
-			if (Global.MovieSession.Movie.IsPlaying)
-			{
-				PlayRecordStatusButton.Image = Properties.Resources.Play;
-				PlayRecordStatusButton.ToolTipText = "Movie is in playback mode";
-				PlayRecordStatusButton.Visible = true;
-			}
-			else if (Global.MovieSession.Movie.IsRecording)
-			{
-				PlayRecordStatusButton.Image = Properties.Resources.RecordHS;
-				PlayRecordStatusButton.ToolTipText = "Movie is in record mode";
-				PlayRecordStatusButton.Visible = true;
-			}
-			else if (!Global.MovieSession.Movie.IsActive)
-			{
-				PlayRecordStatusButton.Image = Properties.Resources.Blank;
-				PlayRecordStatusButton.ToolTipText = "No movie is active";
-				PlayRecordStatusButton.Visible = false;
-			}
-		}
-
-		public bool StartNewMovie(IMovie movie, bool record)
-		{
-			if (movie.IsActive)
-			{
-				movie.Save();
-			}
-
-			try
-			{
-				Global.MovieSession.QueueNewMovie(movie, record, Emulator);
-			}
-			catch (MoviePlatformMismatchException ex)
-			{
-				MessageBox.Show(this, ex.Message, "Movie/Platform Mismatch", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return false;
-			}
-
-			RebootCoresMenuItem_Click(null, null);
-
-			Emulator = EmulatorWindows.Master.Emulator;
-
-			if (Global.MovieSession.PreviousNES_InQuickNES.HasValue)
-			{
-				Global.Config.NES_InQuickNES = Global.MovieSession.PreviousNES_InQuickNES.Value;
-				Global.MovieSession.PreviousNES_InQuickNES = null;
-			}
-
-			if (Global.MovieSession.PreviousSNES_InSnes9x.HasValue)
-			{
-				Global.Config.SNES_InSnes9x = Global.MovieSession.PreviousSNES_InSnes9x.Value;
-				Global.MovieSession.PreviousSNES_InSnes9x = null;
-			}
-
-			if (Global.MovieSession.PreviousGBA_UsemGBA.HasValue)
-			{
-				Global.Config.GBA_UsemGBA = Global.MovieSession.PreviousGBA_UsemGBA.Value;
-				Global.MovieSession.PreviousGBA_UsemGBA = null;
-			}
-
-			Global.Config.RecentMovies.Add(movie.Filename);
-
-			if (EmulatorWindows.Master.Emulator.HasSavestates() && movie.StartsFromSavestate)
-			{
-				if (movie.TextSavestate != null)
-				{
-					EmulatorWindows.Master.Emulator.AsStatable().LoadStateText(new StringReader(movie.TextSavestate));
-				}
-				else
-				{
-					EmulatorWindows.Master.Emulator.AsStatable().LoadStateBinary(new BinaryReader(new MemoryStream(movie.BinarySavestate, false)));
-				}
-
-				foreach (var ew in EmulatorWindows)
-				{
-					ew.Emulator.ResetCounters();
-				}
-			}
-
-			Global.MovieSession.RunQueuedMovie(record);
-
-			SetMainformMovieInfo();
-			UpdateAfterFrameChanged();
-			return true;
-		}
-
-		private void hotkeyConfigToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			if (new BizHawk.Client.EmuHawk.HotkeyConfig().ShowDialog() == DialogResult.OK)
-			{
-				InitControls();
-				_inputManager.SyncControls();
-			}
-		}
-
-		private void controllerConfigToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var controller = new BizHawk.Client.EmuHawk.ControllerConfig(EmulatorWindows.Master.Emulator.ControllerDefinition);
-			if (controller.ShowDialog() == DialogResult.OK)
-			{
-				InitControls();
-				_inputManager.SyncControls();
-			}
-		}
-
-		public void EmulatorWindowClosed(EmulatorWindow ew)
-		{
-			EmulatorWindows.Remove(ew);
-			WorkspacePanel.Controls.Remove(ew);
-
-			if (ew.Emulator == Emulator)
-			{
-				if (EmulatorWindows.Any())
-				{
-					Emulator = EmulatorWindows.Master.Emulator;
-				}
-				else
-				{
-					Emulator = null;
-					ViewSubMenu.Enabled = false;
-				}
-			}
-		}
-
-		private void ExitMenuItem_Click(object sender, EventArgs e)
-		{
-			Close();
-		}
-
-		private void saveConfigToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			SaveConfig();
-			AddMessage("Saved settings");
-		}
-
-		private void RebootCoresMenuItem_Click(object sender, EventArgs e)
-		{
-			foreach (var ew in EmulatorWindows)
-			{
-				ReloadRom(ew);
-			}
-
-			AddMessage("Rebooted all cores");
-		}
-
-		private void SaveSessionMenuItem_Click(object sender, EventArgs e)
-		{
-			if (!string.IsNullOrWhiteSpace(EmulatorWindows.SessionName))
-			{
-				File.WriteAllText(EmulatorWindows.SessionName, EmulatorWindows.SessionJson);
-				AddMessage("Session saved.");
-			}
-		}
-
-		private void SaveSessionAsMenuItem_Click(object sender, EventArgs e)
-		{
-			if (EmulatorWindows.Any())
-			{
-				var file = GetSaveFileFromUser();
-				if (file != null)
-				{
-					EmulatorWindows.SessionName = file.FullName;
-					Global.Config.RecentRomSessions.Add(file.FullName);
-					SaveSessionMenuItem_Click(sender, e);
-					UpdateMainText();
-				}
-			}
-		}
-
-		private FileInfo GetSaveFileFromUser()
-		{
-			var sfd = new SaveFileDialog();
-			if (!string.IsNullOrWhiteSpace(EmulatorWindows.SessionName))
-			{
-				sfd.FileName = Path.GetFileNameWithoutExtension(EmulatorWindows.SessionName);
-				sfd.InitialDirectory = Path.GetDirectoryName(EmulatorWindows.SessionName);
-			}
-			else if (EmulatorWindows.Master != null)
-			{
-				sfd.FileName = PathManager.FilesystemSafeName(EmulatorWindows.Master.Game);
-				sfd.InitialDirectory = PathManager.GetRomsPath("Global");
-			}
-			else
-			{
-				sfd.FileName = "NULL";
-				sfd.InitialDirectory = PathManager.GetRomsPath("Global");
-			}
-
-			sfd.Filter = "Rom Session Files (*.romses)|*.romses|All Files|*.*";
-			sfd.RestoreDirectory = true;
-			var result = sfd.ShowDialog();
-			if (result != DialogResult.OK)
-			{
-				return null;
-			}
-
-			return new FileInfo(sfd.FileName);
-		}
-
-		private void OpenSessionMenuItem_Click(object sender, EventArgs e)
-		{
-			var file = GetFileFromUser("Rom Session Files (*.romses)|*.romses|All Files|*.*");
-			if (file != null)
-			{
-				NewSessionMenuItem_Click(null, null);
-				var json = File.ReadAllText(file.FullName);
-				EmulatorWindows.SessionName = file.FullName;
-				LoadRomSession(EmulatorWindowList.FromJson(json));
-				Global.Config.RecentRomSessions.Add(file.FullName);
-				UpdateMainText();
-			}
-		}
-
-		private void UpdateMainText()
-		{
-			string text = "MultiHawk";
-
-			if (!string.IsNullOrWhiteSpace(EmulatorWindows.SessionName))
-			{
-				text += " - " + Path.GetFileNameWithoutExtension(EmulatorWindows.SessionName);
-			}
-
-			if (Global.MovieSession.Movie.IsActive)
-			{
-				text += " - " + Path.GetFileNameWithoutExtension(Global.MovieSession.Movie.Filename);
-			}
-
-			Text = text;
-		}
-
-		private static FileInfo GetFileFromUser(string filter)
-		{
-			var ofd = new OpenFileDialog
-			{
-				InitialDirectory = PathManager.GetRomsPath("Global"),
-				Filter = filter,
-				RestoreDirectory = true
-			};
-
-			if (!Directory.Exists(ofd.InitialDirectory))
-			{
-				Directory.CreateDirectory(ofd.InitialDirectory);
-			}
-
-			var result = ofd.ShowDialog();
-			return result == DialogResult.OK ? new FileInfo(ofd.FileName) : null;
-		}
-
-		private void CloseAllWindows()
-		{
-			foreach (var ew in EmulatorWindows.ToList())
-			{
-				ew.Close();
-			}
-
-			EmulatorWindows.Clear();
-		}
-
-		private void NewSessionMenuItem_Click(object sender, EventArgs e)
-		{
-			foreach (var ew in EmulatorWindows.ToList())
-			{
-				ew.Close();
-			}
-
-			EmulatorWindows.Clear();
-			UpdateMainText();
-		}
-
-		private void LoadRomSession(IEnumerable<EmulatorWindowList.RomSessionEntry> entries)
-		{
-			foreach (var entry in entries)
-			{
-				LoadRom(entry.RomName);
-				EmulatorWindows.Last().Location = new Point(entry.Wndx, entry.Wndy);
-				UpdateMainText();
-			}
-		}
-
-		private void LoadRomSessionFromRecent(string path)
-		{
-			var file = new FileInfo(path);
-			if (file.Exists)
-			{
-				NewSessionMenuItem_Click(null, null);
-				var json = File.ReadAllText(file.FullName);
-				EmulatorWindows.SessionName = file.FullName;
-				LoadRomSession(EmulatorWindowList.FromJson(json));
-				Global.Config.RecentRomSessions.Add(file.FullName);
-				UpdateMainText();
-			}
-			else
-			{
-				Global.Config.RecentRomSessions.HandleLoadError(path);
-			}
-		}
-
-		private void RecentSessionSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			RecentSessionSubMenu.DropDownItems.Clear();
-			RecentSessionSubMenu.DropDownItems.AddRange(
-				Global.Config.RecentRomSessions.RecentMenu(LoadRomSessionFromRecent, autoload: true));
-		}
-
-		private void RecentRomSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			RecentRomSubMenu.DropDownItems.Clear();
-			RecentRomSubMenu.DropDownItems.AddRange(
-				Global.Config.RecentRoms.RecentMenu(LoadRomFromRecent, autoload: false));
-		}
-
-		private void ViewSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			_1xMenuItem.Checked = Global.Config.TargetZoomFactors[Emulator.SystemId] == 1;
-			_2xMenuItem.Checked = Global.Config.TargetZoomFactors[Emulator.SystemId] == 2;
-			_3xMenuItem.Checked = Global.Config.TargetZoomFactors[Emulator.SystemId] == 3;
-			_4xMenuItem.Checked = Global.Config.TargetZoomFactors[Emulator.SystemId] == 4;
-		}
-
-		private void _1xMenuItem_Click(object sender, EventArgs e)
-		{
-			Global.Config.TargetZoomFactors[Emulator.SystemId] = 1;
-			ReRenderAllWindows();
-		}
-
-		private void _2xMenuItem_Click(object sender, EventArgs e)
-		{
-			Global.Config.TargetZoomFactors[Emulator.SystemId] = 2;
-			ReRenderAllWindows();
-		}
-
-		private void _3xMenuItem_Click(object sender, EventArgs e)
-		{
-			Global.Config.TargetZoomFactors[Emulator.SystemId] = 3;
-			ReRenderAllWindows();
-		}
-
-		private void _4xMenuItem_Click(object sender, EventArgs e)
-		{
-			Global.Config.TargetZoomFactors[Emulator.SystemId] = 4;
-			ReRenderAllWindows();
-		}
-
-		private void ReRenderAllWindows()
-		{
-			foreach (var ew in EmulatorWindows)
-			{
-				ew.FrameBufferResized();
-				ew.Render();
-			}
-		}
-
-		private void LoadLastMovieMenuItem_Click(object sender, EventArgs e)
-		{
-			LoadMoviesFromRecent(Global.Config.RecentMovies.MostRecent);
-		}
-
-		private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)
-		{
-			LoadLastMovieContextMenuItem.Visible = !Global.Config.RecentMovies.Empty;
-			PlayMovieContextMenuItem.Visible =
-				RecordMovieContextMenuItem.Visible =
-				!Global.MovieSession.Movie.IsActive;
-
-			StopMovieContextMenuItem.Visible =
-				RestartMovieContextMenuItem.Visible =
-				Global.MovieSession.Movie.IsActive;
-
-		}
-
-		private void RecentMovieSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			RecentMovieSubMenu.DropDownItems.Clear();
-			RecentMovieSubMenu.DropDownItems.AddRange(
-				Global.Config.RecentMovies.RecentMenu(LoadMoviesFromRecent, autoload: true));
-		}
-
-		private void RestartMovieMenuItem_Click(object sender, EventArgs e)
-		{
-			if (Global.MovieSession.Movie.IsActive)
-			{
-				StartNewMovie(Global.MovieSession.Movie, false);
-				AddMessage("Replaying movie file in read-only mode");
-			}
-		}
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/Mainform.resx b/BizHawk.Client.MultiHawk/Mainform.resx
deleted file mode 100644
index bdf629369a..0000000000
--- a/BizHawk.Client.MultiHawk/Mainform.resx
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="MainformMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="MainStatusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>153, 17</value>
-  </metadata>
-  <metadata name="MainStatusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>153, 17</value>
-  </metadata>
-  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>283, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/PresentationPanel.cs b/BizHawk.Client.MultiHawk/PresentationPanel.cs
deleted file mode 100644
index 881f13960a..0000000000
--- a/BizHawk.Client.MultiHawk/PresentationPanel.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Drawing;
-using sd=System.Drawing;
-using sysdrawingfont=System.Drawing.Font;
-using sysdrawing2d=System.Drawing.Drawing2D;
-using System.IO;
-using System.Threading;
-using System.Windows.Forms;
-#if WINDOWS
-using SlimDX;
-#endif
-
-using BizHawk.Client.Common;
-using BizHawk.Bizware.BizwareGL;
-
-using OpenTK.Graphics.OpenGL;
-
-namespace BizHawk.Client.MultiHawk
-{
-	/// <summary>
-	/// Thinly wraps a BizwareGL.GraphicsControl for EmuHawk's needs
-	/// </summary>
-	public class PresentationPanel
-	{
-		public PresentationPanel(Form parent, IGL gl)
-		{
-			GL = gl;
-
-			GraphicsControl = new GraphicsControl(GL);
-			GraphicsControl.Dock = DockStyle.Fill;
-			GraphicsControl.BackColor = Color.Black;
-
-			//pass through these events to the form. we might need a more scalable solution for mousedown etc. for zapper and whatnot.
-			//http://stackoverflow.com/questions/547172/pass-through-mouse-events-to-parent-control (HTTRANSPARENT)
-			
-			// TODO
-			//GraphicsControl.MouseClick += (o, e) => GlobalWin.MainForm.MainForm_MouseClick(o, e);
-		}
-
-		bool IsDisposed = false;
-		public void Dispose()
-		{
-			if (IsDisposed) return;
-			IsDisposed = true;
-			GraphicsControl.Dispose();
-		}
-
-		//graphics resources
-		public IGL GL { get; set; }
-		public GraphicsControl GraphicsControl;
-
-		public Control Control { get { return GraphicsControl; } }
-		public static implicit operator Control(PresentationPanel self) { return self.GraphicsControl; }
-
-		public bool Resized { get; set; }
-
-		public Size NativeSize { get { return GraphicsControl.ClientSize; } }
-	}
-
-	
-
-	public interface IBlitterFont { }
-
-}
diff --git a/BizHawk.Client.MultiHawk/Program.cs b/BizHawk.Client.MultiHawk/Program.cs
deleted file mode 100644
index 9ee5ddddc7..0000000000
--- a/BizHawk.Client.MultiHawk/Program.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-#if WINDOWS
-using SlimDX.DirectSound;
-using Microsoft.VisualBasic.ApplicationServices;
-#endif
-
-using BizHawk.Common;
-using BizHawk.Client.Common;
-
-namespace BizHawk.Client.MultiHawk
-{
-	static class Program
-	{
-		static Program()
-		{
-			//http://www.codeproject.com/Articles/310675/AppDomain-AssemblyResolve-Event-Tips
-#if WINDOWS
-			// this will look in subdirectory "dll" to load pinvoked stuff
-			string dllDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll");
-			SetDllDirectory(dllDir);
-
-			//in case assembly resolution fails, such as if we moved them into the dll subdiretory, this event handler can reroute to them
-			AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
-
-			//but before we even try doing that, whack the MOTW from everything in that directory (thats a dll)
-			//otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
-			//some people are getting MOTW through a combination of browser used to download bizhawk, and program used to dearchive it
-			WhackAllMOTW(dllDir);
-#endif
-		}
-
-		
-		/// <summary>
-		/// The main entry point for the application.
-		/// </summary>
-		[STAThread]
-		static void Main(string[] args)
-		{
-			SubMain(args);
-		}
-
-
-		//NoInlining should keep this code from getting jammed into Main() which would create dependencies on types which havent been setup by the resolver yet... or something like that
-		[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-		static void SubMain(string[] args)
-		{
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
-			string iniPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "config.ini");
-			Global.Config = ConfigService.Load<Config>(iniPath);
-			Global.Config.ResolveDefaults();
-			HawkFile.ArchiveHandlerFactory = new SevenZipSharpArchiveHandler();
-
-			//super hacky! this needs to be done first. still not worth the trouble to make this system fully proper
-			for (int i = 0; i < args.Length; i++)
-			{
-				var arg = args[i].ToLower();
-				if (arg.StartsWith("--gdi"))
-				{
-					Global.Config.DispMethod = Config.EDispMethod.GdiPlus;
-				}
-			}
-
-
-			//WHY do we have to do this? some intel graphics drivers (ig7icd64.dll 10.18.10.3304 on an unknown chip on win8.1) are calling SetDllDirectory() for the process, which ruins stuff.
-			//The relevant initialization happened just before in "create IGL context".
-			//It isn't clear whether we need the earlier SetDllDirectory(), but I think we do.
-			//note: this is pasted instead of being put in a static method due to this initialization code being sensitive to things like that, and not wanting to cause it to break
-			//pasting should be safe (not affecting the jit order of things)
-			string dllDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll");
-			SetDllDirectory(dllDir);
-
-			try
-			{
-					using (var mf = new Mainform(args))
-					{
-						var title = mf.Text;
-						mf.Show();
-						mf.Text = title;
-						try
-						{
-							mf.ProgramRunLoop();
-						}
-						catch (Exception e) when (Global.MovieSession.Movie.IsActive)
-						{
-							var result = MessageBox.Show(
-								"EmuHawk has thrown a fatal exception and is about to close.\nA movie has been detected. Would you like to try to save?\n(Note: Depending on what caused this error, this may or may not succeed)",
-								"Fatal error: " + e.GetType().Name,
-								MessageBoxButtons.YesNo,
-								MessageBoxIcon.Exclamation
-								);
-							if (result == DialogResult.Yes)
-							{
-								Global.MovieSession.Movie.Save();
-							}
-						}
-					}
-			}
-			catch (Exception e)
-			{
-				string message = e.ToString();
-				if (e.InnerException != null)
-				{
-					message += "\n\nInner Exception:\n\n" + e.InnerException;
-				}
-
-				message += "\n\nStackTrace:\n" + e.StackTrace;
-				MessageBox.Show(message);
-			}
-#if WINDOWS
-			finally
-			{
-				GamePad.CloseAll();
-			}
-#endif
-		}
-
-
-		static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
-		{
-			lock (AppDomain.CurrentDomain)
-			{
-				var asms = AppDomain.CurrentDomain.GetAssemblies();
-				foreach (var asm in asms)
-					if (asm.FullName == args.Name)
-						return asm;
-
-				//load missing assemblies by trying to find them in the dll directory
-				string dllname = new AssemblyName(args.Name).Name + ".dll";
-				string directory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll");
-				string fname = Path.Combine(directory, dllname);
-				if (!File.Exists(fname)) return null;
-				//it is important that we use LoadFile here and not load from a byte array; otherwise mixed (managed/unamanged) assemblies can't load
-				return Assembly.LoadFile(fname);
-			}
-		}
-
-		//declared here instead of a more usual place to avoid dependencies on the more usual place
-#if WINDOWS
-		[DllImport("kernel32.dll", SetLastError = true)]
-		static extern uint SetDllDirectory(string lpPathName);
-
-		[DllImport("kernel32.dll", EntryPoint = "DeleteFileW", SetLastError = true, CharSet = CharSet.Unicode, ExactSpelling = true)]
-		static extern bool DeleteFileW([MarshalAs(UnmanagedType.LPWStr)]string lpFileName);
-		static void RemoveMOTW(string path)
-		{
-			DeleteFileW(path + ":Zone.Identifier");
-		}
-
-		static void WhackAllMOTW(string dllDir)
-		{
-			var todo = new Queue<DirectoryInfo>(new[] { new DirectoryInfo(dllDir) });
-			while (todo.Count > 0)
-			{
-				var di = todo.Dequeue();
-				foreach (var disub in di.GetDirectories()) todo.Enqueue(disub);
-				foreach (var fi in di.GetFiles("*.dll"))
-					RemoveMOTW(fi.FullName);
-				foreach (var fi in di.GetFiles("*.exe"))
-					RemoveMOTW(fi.FullName);
-			}
-
-		}
-#endif
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.MultiHawk/Properties/AssemblyInfo.cs
deleted file mode 100644
index e0b3f137d4..0000000000
--- a/BizHawk.Client.MultiHawk/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("BizHawk.Client.MultiHawk")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("BizHawk.Client.MultiHawk")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fcf20c42-6452-46c7-bb88-bc9f5bd0ce71")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/BizHawk.Client.MultiHawk/Properties/Resources.Designer.cs b/BizHawk.Client.MultiHawk/Properties/Resources.Designer.cs
deleted file mode 100644
index 3855218b5a..0000000000
--- a/BizHawk.Client.MultiHawk/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace BizHawk.Client.MultiHawk.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BizHawk.Client.MultiHawk.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Blank {
-            get {
-                object obj = ResourceManager.GetObject("Blank", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
-        internal static byte[] courier16px {
-            get {
-                object obj = ResourceManager.GetObject("courier16px", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap courier16px_0 {
-            get {
-                object obj = ResourceManager.GetObject("courier16px_0", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
-        internal static byte[] courier16px1 {
-            get {
-                object obj = ResourceManager.GetObject("courier16px1", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap CutHS {
-            get {
-                object obj = ResourceManager.GetObject("CutHS", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap ExclamationRed {
-            get {
-                object obj = ResourceManager.GetObject("ExclamationRed", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap GameController {
-            get {
-                object obj = ResourceManager.GetObject("GameController", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap GreenCheck {
-            get {
-                object obj = ResourceManager.GetObject("GreenCheck", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Help {
-            get {
-                object obj = ResourceManager.GetObject("Help", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap HotKeys {
-            get {
-                object obj = ResourceManager.GetObject("HotKeys", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap OpenFile {
-            get {
-                object obj = ResourceManager.GetObject("OpenFile", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Pause {
-            get {
-                object obj = ResourceManager.GetObject("Pause", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Play {
-            get {
-                object obj = ResourceManager.GetObject("Play", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap ReadOnly {
-            get {
-                object obj = ResourceManager.GetObject("ReadOnly", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap reboot {
-            get {
-                object obj = ResourceManager.GetObject("reboot", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Recent {
-            get {
-                object obj = ResourceManager.GetObject("Recent", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap RecordHS {
-            get {
-                object obj = ResourceManager.GetObject("RecordHS", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap restart {
-            get {
-                object obj = ResourceManager.GetObject("restart", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Save {
-            get {
-                object obj = ResourceManager.GetObject("Save", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap SaveAllHS {
-            get {
-                object obj = ResourceManager.GetObject("SaveAllHS", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap SaveAs {
-            get {
-                object obj = ResourceManager.GetObject("SaveAs", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Scan {
-            get {
-                object obj = ResourceManager.GetObject("Scan", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Stop {
-            get {
-                object obj = ResourceManager.GetObject("Stop", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}
diff --git a/BizHawk.Client.MultiHawk/Properties/Resources.resx b/BizHawk.Client.MultiHawk/Properties/Resources.resx
deleted file mode 100644
index 88761a4c4d..0000000000
--- a/BizHawk.Client.MultiHawk/Properties/Resources.resx
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="courier16px" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\courier16px.bmfc;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="courier16px1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\courier16px.fnt;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="courier16px_0" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\courier16px_0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="CutHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\CutHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ExclamationRed" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\ExclamationRed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="GreenCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\GreenCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="OpenFile" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\OpenFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ReadOnly" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\ReadOnly.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="reboot" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\reboot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Recent" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Recent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="RecordHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\RecordHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="SaveAllHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\SaveAllHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="SaveAs" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\SaveAs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Scan" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Scan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="GameController" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\GameController.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="HotKeys" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\HotKeys.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="restart" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\restart.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.Client.MultiHawk/Properties/Settings.Designer.cs b/BizHawk.Client.MultiHawk/Properties/Settings.Designer.cs
deleted file mode 100644
index fb9499495c..0000000000
--- a/BizHawk.Client.MultiHawk/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace BizHawk.Client.MultiHawk.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/BizHawk.Client.MultiHawk/Properties/Settings.settings b/BizHawk.Client.MultiHawk/Properties/Settings.settings
deleted file mode 100644
index abf36c5d3d..0000000000
--- a/BizHawk.Client.MultiHawk/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/BizHawk.Client.MultiHawk/Resources/courier16px.bmfc b/BizHawk.Client.MultiHawk/Resources/courier16px.bmfc
deleted file mode 100644
index df09355333..0000000000
--- a/BizHawk.Client.MultiHawk/Resources/courier16px.bmfc
+++ /dev/null
@@ -1,55 +0,0 @@
-# AngelCode Bitmap Font Generator configuration file
-fileVersion=1
-
-# font settings
-fontName=Courier
-fontFile=
-charSet=0
-fontSize=16
-aa=1
-scaleH=100
-useSmoothing=0
-isBold=1
-isItalic=0
-useUnicode=1
-disableBoxChars=1
-outputInvalidCharGlyph=1
-dontIncludeKerningPairs=0
-useHinting=1
-renderFromOutline=0
-useClearType=1
-
-# character alignment
-paddingDown=0
-paddingUp=0
-paddingRight=0
-paddingLeft=0
-spacingHoriz=1
-spacingVert=1
-useFixedHeight=0
-forceZero=0
-
-# output file
-outWidth=128
-outHeight=256
-outBitDepth=32
-fontDescFormat=1
-fourChnlPacked=0
-textureFormat=png
-textureCompression=0
-alphaChnl=0
-redChnl=4
-greenChnl=4
-blueChnl=4
-invA=0
-invR=0
-invG=0
-invB=0
-
-# outline
-outlineThickness=0
-
-# selected chars
-chars=32-127,129,141,143-144,157,160-255
-
-# imported icon images
diff --git a/BizHawk.Client.MultiHawk/Resources/courier16px.fnt b/BizHawk.Client.MultiHawk/Resources/courier16px.fnt
deleted file mode 100644
index 0e8d5e8a1f..0000000000
--- a/BizHawk.Client.MultiHawk/Resources/courier16px.fnt
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0"?>
-<font>
-  <info face="Courier" size="16" bold="1" italic="0" charset="" unicode="1" stretchH="100" smooth="0" aa="1" padding="0,0,0,0" spacing="1,1" outline="0"/>
-  <common lineHeight="16" base="13" scaleW="128" scaleH="256" pages="1" packed="0" alphaChnl="0" redChnl="4" greenChnl="4" blueChnl="4"/>
-  <pages>
-    <page id="0" file="courier16px_0.png" />
-  </pages>
-  <chars count="198">
-    <char id="-1" x="126" y="73" width="1" height="1" xoffset="0" yoffset="0" xadvance="0" page="0" chnl="15" />
-    <char id="32" x="83" y="137" width="30" height="1" xoffset="-10" yoffset="15" xadvance="10" page="0" chnl="15" />
-    <char id="33" x="124" y="95" width="2" height="10" xoffset="4" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="34" x="15" y="137" width="5" height="4" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="35" x="93" y="52" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="36" x="72" y="28" width="8" height="12" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="37" x="83" y="52" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="38" x="73" y="53" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="39" x="125" y="115" width="2" height="4" xoffset="4" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="40" x="61" y="28" width="4" height="13" xoffset="4" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="41" x="56" y="28" width="4" height="13" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="42" x="106" y="124" width="8" height="5" xoffset="1" yoffset="5" xadvance="10" page="0" chnl="15" />
-    <char id="43" x="72" y="127" width="8" height="7" xoffset="1" yoffset="5" xadvance="10" page="0" chnl="15" />
-    <char id="44" x="38" y="135" width="5" height="3" xoffset="3" yoffset="11" xadvance="10" page="0" chnl="15" />
-    <char id="45" x="106" y="130" width="7" height="1" xoffset="2" yoffset="8" xadvance="10" page="0" chnl="15" />
-    <char id="46" x="49" y="135" width="3" height="2" xoffset="4" yoffset="11" xadvance="10" page="0" chnl="15" />
-    <char id="47" x="100" y="107" width="9" height="8" xoffset="1" yoffset="4" xadvance="10" page="0" chnl="15" />
-    <char id="48" x="52" y="97" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="49" x="58" y="108" width="6" height="10" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="50" x="0" y="109" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="51" x="8" y="109" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="52" x="60" y="97" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="53" x="76" y="97" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="54" x="92" y="96" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="55" x="100" y="96" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="56" x="44" y="97" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="57" x="116" y="95" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="58" x="121" y="115" width="3" height="7" xoffset="4" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="59" x="7" y="120" width="5" height="8" xoffset="3" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="60" x="93" y="107" width="6" height="9" xoffset="2" yoffset="4" xadvance="10" page="0" chnl="15" />
-    <char id="61" x="30" y="136" width="7" height="3" xoffset="2" yoffset="7" xadvance="10" page="0" chnl="15" />
-    <char id="62" x="86" y="108" width="6" height="9" xoffset="2" yoffset="4" xadvance="10" page="0" chnl="15" />
-    <char id="63" x="84" y="97" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="64" x="90" y="28" width="9" height="11" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="65" x="11" y="53" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="66" x="27" y="75" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="67" x="36" y="75" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="68" x="45" y="75" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="69" x="54" y="75" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="70" x="63" y="75" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="71" x="0" y="65" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="72" x="0" y="54" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="73" x="51" y="108" width="6" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="74" x="20" y="64" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="75" x="30" y="64" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="76" x="72" y="75" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="77" x="107" y="40" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="78" x="19" y="42" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="79" x="81" y="75" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="80" x="40" y="64" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="81" x="81" y="28" width="8" height="12" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="82" x="53" y="53" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="83" x="90" y="74" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="84" x="41" y="42" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="85" x="22" y="53" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="86" x="63" y="42" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="87" x="74" y="41" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="88" x="85" y="41" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="89" x="96" y="40" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="90" x="99" y="74" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="91" x="51" y="28" width="4" height="13" xoffset="4" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="92" x="110" y="106" width="9" height="8" xoffset="1" yoffset="4" xadvance="10" page="0" chnl="15" />
-    <char id="93" x="123" y="14" width="4" height="13" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="94" x="115" y="123" width="8" height="4" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="95" x="114" y="135" width="10" height="1" xoffset="0" yoffset="14" xadvance="10" page="0" chnl="15" />
-    <char id="96" x="53" y="135" width="3" height="2" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="97" x="18" y="128" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="98" x="108" y="73" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="99" x="0" y="129" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="100" x="117" y="73" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="101" x="103" y="116" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="102" x="36" y="97" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="103" x="0" y="87" width="8" height="10" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="104" x="9" y="87" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="105" x="30" y="108" width="6" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="106" x="121" y="0" width="6" height="13" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="107" x="18" y="76" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="108" x="23" y="109" width="6" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="109" x="46" y="119" width="10" height="7" xoffset="0" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="110" x="76" y="118" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="111" x="63" y="127" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="112" x="18" y="87" width="8" height="10" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="113" x="27" y="86" width="8" height="10" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="114" x="57" y="119" width="9" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="115" x="9" y="129" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="116" x="68" y="108" width="8" height="9" xoffset="1" yoffset="4" xadvance="10" page="0" chnl="15" />
-    <char id="117" x="94" y="117" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="118" x="24" y="120" width="10" height="7" xoffset="0" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="119" x="35" y="119" width="10" height="7" xoffset="0" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="120" x="54" y="127" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="121" x="8" y="42" width="10" height="10" xoffset="0" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="122" x="27" y="128" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="123" x="9" y="28" width="6" height="13" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="124" x="66" y="28" width="2" height="13" xoffset="4" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="125" x="37" y="28" width="6" height="13" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="126" x="21" y="136" width="8" height="3" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="127" x="123" y="51" width="4" height="10" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="129" x="92" y="133" width="30" height="1" xoffset="-10" yoffset="15" xadvance="10" page="0" chnl="15" />
-    <char id="141" x="52" y="140" width="30" height="1" xoffset="-10" yoffset="15" xadvance="10" page="0" chnl="15" />
-    <char id="143" x="21" y="140" width="30" height="1" xoffset="-10" yoffset="15" xadvance="10" page="0" chnl="15" />
-    <char id="144" x="61" y="135" width="30" height="1" xoffset="-10" yoffset="15" xadvance="10" page="0" chnl="15" />
-    <char id="157" x="83" y="139" width="30" height="1" xoffset="-10" yoffset="15" xadvance="10" page="0" chnl="15" />
-    <char id="160" x="52" y="138" width="30" height="1" xoffset="-10" yoffset="15" xadvance="10" page="0" chnl="15" />
-    <char id="161" x="65" y="108" width="2" height="10" xoffset="4" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="162" x="0" y="42" width="7" height="11" xoffset="2" yoffset="4" xadvance="10" page="0" chnl="15" />
-    <char id="163" x="68" y="97" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="164" x="81" y="126" width="7" height="6" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="165" x="30" y="42" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="166" x="69" y="28" width="2" height="13" xoffset="4" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="167" x="110" y="28" width="8" height="11" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="168" x="100" y="135" width="5" height="1" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="169" x="10" y="65" width="9" height="10" xoffset="1" yoffset="2" xadvance="10" page="0" chnl="15" />
-    <char id="170" x="120" y="106" width="7" height="8" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="171" x="67" y="119" width="8" height="7" xoffset="1" yoffset="5" xadvance="10" page="0" chnl="15" />
-    <char id="172" x="0" y="137" width="8" height="4" xoffset="1" yoffset="7" xadvance="10" page="0" chnl="15" />
-    <char id="173" x="92" y="135" width="7" height="1" xoffset="2" yoffset="8" xadvance="10" page="0" chnl="15" />
-    <char id="174" x="33" y="53" width="9" height="10" xoffset="1" yoffset="2" xadvance="10" page="0" chnl="15" />
-    <char id="175" x="81" y="133" width="10" height="1" xoffset="0" yoffset="1" xadvance="10" page="0" chnl="15" />
-    <char id="176" x="9" y="137" width="5" height="4" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="177" x="77" y="108" width="8" height="9" xoffset="1" yoffset="4" xadvance="10" page="0" chnl="15" />
-    <char id="178" x="95" y="125" width="5" height="6" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="179" x="89" y="126" width="5" height="6" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="180" x="57" y="135" width="3" height="2" xoffset="4" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="181" x="100" y="28" width="9" height="11" xoffset="1" yoffset="5" xadvance="10" page="0" chnl="15" />
-    <char id="182" x="63" y="53" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="183" x="124" y="123" width="3" height="2" xoffset="4" yoffset="7" xadvance="10" page="0" chnl="15" />
-    <char id="184" x="44" y="135" width="4" height="3" xoffset="3" yoffset="13" xadvance="10" page="0" chnl="15" />
-    <char id="185" x="101" y="125" width="4" height="6" xoffset="3" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="186" x="0" y="120" width="6" height="8" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="187" x="85" y="118" width="8" height="7" xoffset="1" yoffset="5" xadvance="10" page="0" chnl="15" />
-    <char id="188" x="103" y="51" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="189" x="118" y="40" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="190" x="113" y="51" width="9" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="191" x="108" y="95" width="7" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="192" x="88" y="0" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="193" x="11" y="0" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="194" x="22" y="0" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="195" x="22" y="14" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="196" x="11" y="14" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="197" x="0" y="14" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="198" x="52" y="42" width="10" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="199" x="42" y="14" width="8" height="13" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="200" x="96" y="14" width="8" height="13" xoffset="1" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="201" x="87" y="14" width="8" height="13" xoffset="1" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="202" x="78" y="14" width="8" height="13" xoffset="1" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="203" x="69" y="14" width="8" height="13" xoffset="1" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="204" x="44" y="28" width="6" height="13" xoffset="2" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="205" x="23" y="28" width="6" height="13" xoffset="2" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="206" x="16" y="28" width="6" height="13" xoffset="2" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="207" x="30" y="28" width="6" height="13" xoffset="2" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="208" x="43" y="53" width="9" height="10" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="209" x="99" y="0" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="210" x="60" y="14" width="8" height="13" xoffset="1" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="211" x="51" y="14" width="8" height="13" xoffset="1" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="212" x="0" y="28" width="8" height="13" xoffset="1" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="213" x="114" y="14" width="8" height="13" xoffset="1" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="214" x="105" y="14" width="8" height="13" xoffset="1" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="215" x="112" y="115" width="8" height="7" xoffset="1" yoffset="5" xadvance="10" page="0" chnl="15" />
-    <char id="216" x="45" y="86" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="217" x="110" y="0" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="218" x="0" y="0" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="219" x="44" y="0" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="220" x="77" y="0" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="221" x="55" y="0" width="10" height="13" xoffset="0" yoffset="0" xadvance="10" page="0" chnl="15" />
-    <char id="222" x="54" y="86" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="223" x="63" y="86" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="224" x="72" y="86" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="225" x="81" y="86" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="226" x="90" y="85" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="227" x="99" y="85" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="228" x="108" y="84" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="229" x="119" y="28" width="8" height="11" xoffset="1" yoffset="2" xadvance="10" page="0" chnl="15" />
-    <char id="230" x="13" y="120" width="10" height="7" xoffset="0" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="231" x="117" y="84" width="8" height="10" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="232" x="36" y="86" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="233" x="0" y="98" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="234" x="9" y="98" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="235" x="18" y="98" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="236" x="44" y="108" width="6" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="237" x="37" y="108" width="6" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="238" x="16" y="109" width="6" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="239" x="121" y="62" width="6" height="10" xoffset="2" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="240" x="27" y="97" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="241" x="49" y="64" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="242" x="58" y="64" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="243" x="67" y="64" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="244" x="76" y="64" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="245" x="85" y="63" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="246" x="94" y="63" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="247" x="36" y="127" width="8" height="7" xoffset="1" yoffset="5" xadvance="10" page="0" chnl="15" />
-    <char id="248" x="45" y="127" width="8" height="7" xoffset="1" yoffset="6" xadvance="10" page="0" chnl="15" />
-    <char id="249" x="103" y="62" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="250" x="112" y="62" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="251" x="0" y="76" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="252" x="9" y="76" width="8" height="10" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="253" x="66" y="0" width="10" height="13" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="254" x="33" y="14" width="8" height="13" xoffset="1" yoffset="3" xadvance="10" page="0" chnl="15" />
-    <char id="255" x="33" y="0" width="10" height="13" xoffset="0" yoffset="3" xadvance="10" page="0" chnl="15" />
-  </chars>
-</font>
diff --git a/BizHawk.Client.MultiHawk/Resources/courier16px_0.png b/BizHawk.Client.MultiHawk/Resources/courier16px_0.png
deleted file mode 100644
index 36d5051db4..0000000000
Binary files a/BizHawk.Client.MultiHawk/Resources/courier16px_0.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/Blank.png b/BizHawk.Client.MultiHawk/images/Blank.png
deleted file mode 100644
index c8d0a51cc0..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/Blank.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/CutHS.png b/BizHawk.Client.MultiHawk/images/CutHS.png
deleted file mode 100644
index dd40e93a2a..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/CutHS.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/ExclamationRed.png b/BizHawk.Client.MultiHawk/images/ExclamationRed.png
deleted file mode 100644
index e1e238ad30..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/ExclamationRed.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/GameController.png b/BizHawk.Client.MultiHawk/images/GameController.png
deleted file mode 100644
index 3d0131cd16..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/GameController.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/GreenCheck.png b/BizHawk.Client.MultiHawk/images/GreenCheck.png
deleted file mode 100644
index 9f243dcd9d..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/GreenCheck.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/Help.png b/BizHawk.Client.MultiHawk/images/Help.png
deleted file mode 100644
index 30a424bbf1..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/Help.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/HotKeys.png b/BizHawk.Client.MultiHawk/images/HotKeys.png
deleted file mode 100644
index 962eb51ed7..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/HotKeys.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/OpenFile.png b/BizHawk.Client.MultiHawk/images/OpenFile.png
deleted file mode 100644
index 0bc670e2c0..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/OpenFile.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/Pause.png b/BizHawk.Client.MultiHawk/images/Pause.png
deleted file mode 100644
index 206c71c233..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/Pause.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/Play.png b/BizHawk.Client.MultiHawk/images/Play.png
deleted file mode 100644
index b8f7541b05..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/Play.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/ReadOnly.png b/BizHawk.Client.MultiHawk/images/ReadOnly.png
deleted file mode 100644
index 119d155206..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/ReadOnly.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/Recent.png b/BizHawk.Client.MultiHawk/images/Recent.png
deleted file mode 100644
index 42c559ad27..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/Recent.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/RecordHS.png b/BizHawk.Client.MultiHawk/images/RecordHS.png
deleted file mode 100644
index 581741d36c..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/RecordHS.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/Save.png b/BizHawk.Client.MultiHawk/images/Save.png
deleted file mode 100644
index 5ec0a2d762..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/Save.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/SaveAllHS.png b/BizHawk.Client.MultiHawk/images/SaveAllHS.png
deleted file mode 100644
index 7bde10a6d2..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/SaveAllHS.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/SaveAs.png b/BizHawk.Client.MultiHawk/images/SaveAs.png
deleted file mode 100644
index 5ca4d10623..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/SaveAs.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/Scan.png b/BizHawk.Client.MultiHawk/images/Scan.png
deleted file mode 100644
index ea5e620d8f..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/Scan.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/Stop.png b/BizHawk.Client.MultiHawk/images/Stop.png
deleted file mode 100644
index ef00c0f811..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/Stop.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/reboot.png b/BizHawk.Client.MultiHawk/images/reboot.png
deleted file mode 100644
index 2d355ac56c..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/reboot.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/images/restart.png b/BizHawk.Client.MultiHawk/images/restart.png
deleted file mode 100644
index 89eebbbd04..0000000000
Binary files a/BizHawk.Client.MultiHawk/images/restart.png and /dev/null differ
diff --git a/BizHawk.Client.MultiHawk/movie/PlayMovie.Designer.cs b/BizHawk.Client.MultiHawk/movie/PlayMovie.Designer.cs
deleted file mode 100644
index 39e0289bb3..0000000000
--- a/BizHawk.Client.MultiHawk/movie/PlayMovie.Designer.cs
+++ /dev/null
@@ -1,406 +0,0 @@
-namespace BizHawk.Client.MultiHawk
-{
-	partial class PlayMovie
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PlayMovie));
-			this.Cancel = new System.Windows.Forms.Button();
-			this.OK = new System.Windows.Forms.Button();
-			this.BrowseMovies = new System.Windows.Forms.Button();
-			this.DetailsView = new System.Windows.Forms.ListView();
-			this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.columnHeader6 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.SubtitlesBtn = new System.Windows.Forms.Button();
-			this.CommentsBtn = new System.Windows.Forms.Button();
-			this.MovieCount = new System.Windows.Forms.Label();
-			this.ReadOnlyCheckBox = new System.Windows.Forms.CheckBox();
-			this.IncludeSubDirectories = new System.Windows.Forms.CheckBox();
-			this.Scan = new System.Windows.Forms.Button();
-			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-			this.MatchHashCheckBox = new System.Windows.Forms.CheckBox();
-			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.StopOnFrameCheckbox = new System.Windows.Forms.CheckBox();
-			this.StopOnFrameTextBox = new BizHawk.Client.EmuHawk.WatchValueBox();
-			this.MovieView = new BizHawk.Client.EmuHawk.VirtualListView();
-			this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-			this.LastFrameCheckbox = new System.Windows.Forms.CheckBox();
-			this.TurboCheckbox = new System.Windows.Forms.CheckBox();
-			this.groupBox1.SuspendLayout();
-			this.contextMenuStrip1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// Cancel
-			// 
-			this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.Cancel.Location = new System.Drawing.Point(687, 363);
-			this.Cancel.Name = "Cancel";
-			this.Cancel.Size = new System.Drawing.Size(75, 23);
-			this.Cancel.TabIndex = 55;
-			this.Cancel.Text = "&Cancel";
-			this.Cancel.UseVisualStyleBackColor = true;
-			this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
-			// 
-			// OK
-			// 
-			this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.OK.Location = new System.Drawing.Point(606, 363);
-			this.OK.Name = "OK";
-			this.OK.Size = new System.Drawing.Size(75, 23);
-			this.OK.TabIndex = 50;
-			this.OK.Text = "&OK";
-			this.toolTip1.SetToolTip(this.OK, "Load selected movie");
-			this.OK.UseVisualStyleBackColor = true;
-			this.OK.Click += new System.EventHandler(this.Ok_Click);
-			// 
-			// BrowseMovies
-			// 
-			this.BrowseMovies.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.BrowseMovies.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.OpenFile;
-			this.BrowseMovies.Location = new System.Drawing.Point(12, 364);
-			this.BrowseMovies.Name = "BrowseMovies";
-			this.BrowseMovies.Size = new System.Drawing.Size(31, 23);
-			this.BrowseMovies.TabIndex = 25;
-			this.toolTip1.SetToolTip(this.BrowseMovies, "Browse for additional movie files");
-			this.BrowseMovies.UseVisualStyleBackColor = true;
-			this.BrowseMovies.Click += new System.EventHandler(this.BrowseMovies_Click);
-			// 
-			// DetailsView
-			// 
-			this.DetailsView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.DetailsView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader5,
-            this.columnHeader6});
-			this.DetailsView.FullRowSelect = true;
-			this.DetailsView.GridLines = true;
-			this.DetailsView.HideSelection = false;
-			this.DetailsView.Location = new System.Drawing.Point(15, 19);
-			this.DetailsView.Name = "DetailsView";
-			this.DetailsView.Size = new System.Drawing.Size(228, 261);
-			this.DetailsView.TabIndex = 10;
-			this.toolTip1.SetToolTip(this.DetailsView, "Contains the header information for the selected movie");
-			this.DetailsView.UseCompatibleStateImageBehavior = false;
-			this.DetailsView.View = System.Windows.Forms.View.Details;
-			this.DetailsView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.DetailsView_ColumnClick);
-			// 
-			// columnHeader5
-			// 
-			this.columnHeader5.Text = "Header";
-			this.columnHeader5.Width = 102;
-			// 
-			// columnHeader6
-			// 
-			this.columnHeader6.Text = "Value";
-			this.columnHeader6.Width = 121;
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.groupBox1.Controls.Add(this.SubtitlesBtn);
-			this.groupBox1.Controls.Add(this.CommentsBtn);
-			this.groupBox1.Controls.Add(this.DetailsView);
-			this.groupBox1.Location = new System.Drawing.Point(503, 28);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(259, 322);
-			this.groupBox1.TabIndex = 6;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Details";
-			// 
-			// SubtitlesBtn
-			// 
-			this.SubtitlesBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.SubtitlesBtn.Enabled = false;
-			this.SubtitlesBtn.Location = new System.Drawing.Point(125, 286);
-			this.SubtitlesBtn.Name = "SubtitlesBtn";
-			this.SubtitlesBtn.Size = new System.Drawing.Size(75, 23);
-			this.SubtitlesBtn.TabIndex = 20;
-			this.SubtitlesBtn.Text = "Subtitles";
-			this.SubtitlesBtn.UseVisualStyleBackColor = true;
-			this.SubtitlesBtn.Click += new System.EventHandler(this.SubtitlesBtn_Click);
-			// 
-			// CommentsBtn
-			// 
-			this.CommentsBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.CommentsBtn.Enabled = false;
-			this.CommentsBtn.Location = new System.Drawing.Point(15, 286);
-			this.CommentsBtn.Name = "CommentsBtn";
-			this.CommentsBtn.Size = new System.Drawing.Size(75, 23);
-			this.CommentsBtn.TabIndex = 15;
-			this.CommentsBtn.Text = "Comments";
-			this.CommentsBtn.UseVisualStyleBackColor = true;
-			this.CommentsBtn.Click += new System.EventHandler(this.CommentsBtn_Click);
-			// 
-			// MovieCount
-			// 
-			this.MovieCount.AutoSize = true;
-			this.MovieCount.Location = new System.Drawing.Point(12, 9);
-			this.MovieCount.Name = "MovieCount";
-			this.MovieCount.Size = new System.Drawing.Size(31, 13);
-			this.MovieCount.TabIndex = 7;
-			this.MovieCount.Text = "        ";
-			// 
-			// ReadOnlyCheckBox
-			// 
-			this.ReadOnlyCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.ReadOnlyCheckBox.AutoSize = true;
-			this.ReadOnlyCheckBox.Checked = true;
-			this.ReadOnlyCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.ReadOnlyCheckBox.Location = new System.Drawing.Point(503, 367);
-			this.ReadOnlyCheckBox.Name = "ReadOnlyCheckBox";
-			this.ReadOnlyCheckBox.Size = new System.Drawing.Size(74, 17);
-			this.ReadOnlyCheckBox.TabIndex = 45;
-			this.ReadOnlyCheckBox.Text = "Read only";
-			this.ReadOnlyCheckBox.UseVisualStyleBackColor = true;
-			// 
-			// IncludeSubDirectories
-			// 
-			this.IncludeSubDirectories.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.IncludeSubDirectories.AutoSize = true;
-			this.IncludeSubDirectories.Location = new System.Drawing.Point(94, 375);
-			this.IncludeSubDirectories.Name = "IncludeSubDirectories";
-			this.IncludeSubDirectories.Size = new System.Drawing.Size(131, 17);
-			this.IncludeSubDirectories.TabIndex = 35;
-			this.IncludeSubDirectories.Text = "Include Subdirectories";
-			this.IncludeSubDirectories.UseVisualStyleBackColor = true;
-			this.IncludeSubDirectories.CheckedChanged += new System.EventHandler(this.IncludeSubDirectories_CheckedChanged);
-			// 
-			// Scan
-			// 
-			this.Scan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.Scan.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.Scan;
-			this.Scan.Location = new System.Drawing.Point(49, 364);
-			this.Scan.Name = "Scan";
-			this.Scan.Size = new System.Drawing.Size(27, 23);
-			this.Scan.TabIndex = 30;
-			this.toolTip1.SetToolTip(this.Scan, "Rescan Movie folder for movie files");
-			this.Scan.UseVisualStyleBackColor = true;
-			this.Scan.Click += new System.EventHandler(this.Scan_Click);
-			// 
-			// MatchHashCheckBox
-			// 
-			this.MatchHashCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.MatchHashCheckBox.AutoSize = true;
-			this.MatchHashCheckBox.Location = new System.Drawing.Point(94, 357);
-			this.MatchHashCheckBox.Name = "MatchHashCheckBox";
-			this.MatchHashCheckBox.Size = new System.Drawing.Size(147, 17);
-			this.MatchHashCheckBox.TabIndex = 56;
-			this.MatchHashCheckBox.Text = "Match current game hash";
-			this.MatchHashCheckBox.UseVisualStyleBackColor = true;
-			this.MatchHashCheckBox.CheckedChanged += new System.EventHandler(this.MatchHashCheckBox_CheckedChanged);
-			// 
-			// contextMenuStrip1
-			// 
-			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.editToolStripMenuItem});
-			this.contextMenuStrip1.Name = "contextMenuStrip1";
-			this.contextMenuStrip1.Size = new System.Drawing.Size(93, 26);
-			// 
-			// editToolStripMenuItem
-			// 
-			this.editToolStripMenuItem.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.CutHS;
-			this.editToolStripMenuItem.Name = "editToolStripMenuItem";
-			this.editToolStripMenuItem.Size = new System.Drawing.Size(92, 22);
-			this.editToolStripMenuItem.Text = "&Edit";
-			this.editToolStripMenuItem.Click += new System.EventHandler(this.EditMenuItem_Click);
-			// 
-			// StopOnFrameCheckbox
-			// 
-			this.StopOnFrameCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.StopOnFrameCheckbox.AutoSize = true;
-			this.StopOnFrameCheckbox.Location = new System.Drawing.Point(342, 357);
-			this.StopOnFrameCheckbox.Name = "StopOnFrameCheckbox";
-			this.StopOnFrameCheckbox.Size = new System.Drawing.Size(95, 17);
-			this.StopOnFrameCheckbox.TabIndex = 57;
-			this.StopOnFrameCheckbox.Text = "Stop on frame:";
-			this.StopOnFrameCheckbox.UseVisualStyleBackColor = true;
-			this.StopOnFrameCheckbox.CheckedChanged += new System.EventHandler(this.StopOnFrameCheckbox_CheckedChanged);
-			// 
-			// StopOnFrameTextBox
-			// 
-			this.StopOnFrameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.StopOnFrameTextBox.ByteSize = BizHawk.Client.Common.WatchSize.DWord;
-			this.StopOnFrameTextBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.StopOnFrameTextBox.Location = new System.Drawing.Point(438, 355);
-			this.StopOnFrameTextBox.MaxLength = 10;
-			this.StopOnFrameTextBox.Name = "StopOnFrameTextBox";
-			this.StopOnFrameTextBox.Nullable = true;
-			this.StopOnFrameTextBox.Size = new System.Drawing.Size(54, 20);
-			this.StopOnFrameTextBox.TabIndex = 58;
-			this.StopOnFrameTextBox.Type = BizHawk.Client.Common.DisplayType.Unsigned;
-			this.StopOnFrameTextBox.TextChanged += new System.EventHandler(this.StopOnFrameTextBox_TextChanged_1);
-			// 
-			// MovieView
-			// 
-			this.MovieView.AllowDrop = true;
-			this.MovieView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.MovieView.BlazingFast = false;
-			this.MovieView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader1,
-            this.columnHeader2,
-            this.columnHeader3,
-            this.columnHeader4});
-			this.MovieView.ContextMenuStrip = this.contextMenuStrip1;
-			this.MovieView.FullRowSelect = true;
-			this.MovieView.GridLines = true;
-			this.MovieView.HideSelection = false;
-			this.MovieView.ItemCount = 0;
-			this.MovieView.Location = new System.Drawing.Point(12, 28);
-			this.MovieView.MultiSelect = false;
-			this.MovieView.Name = "MovieView";
-			this.MovieView.SelectAllInProgress = false;
-			this.MovieView.selectedItem = -1;
-			this.MovieView.Size = new System.Drawing.Size(480, 322);
-			this.MovieView.TabIndex = 5;
-			this.MovieView.UseCompatibleStateImageBehavior = false;
-			this.MovieView.UseCustomBackground = true;
-			this.MovieView.View = System.Windows.Forms.View.Details;
-			this.MovieView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.MovieView_ColumnClick);
-			this.MovieView.SelectedIndexChanged += new System.EventHandler(this.MovieView_SelectedIndexChanged);
-			this.MovieView.DragDrop += new System.Windows.Forms.DragEventHandler(this.MovieView_DragDrop);
-			this.MovieView.DragEnter += new System.Windows.Forms.DragEventHandler(this.MovieView_DragEnter);
-			this.MovieView.DoubleClick += new System.EventHandler(this.MovieView_DoubleClick);
-			this.MovieView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MovieView_KeyDown);
-			// 
-			// columnHeader1
-			// 
-			this.columnHeader1.Text = "File";
-			this.columnHeader1.Width = 221;
-			// 
-			// columnHeader2
-			// 
-			this.columnHeader2.Text = "SysID";
-			this.columnHeader2.Width = 43;
-			// 
-			// columnHeader3
-			// 
-			this.columnHeader3.Text = "Game";
-			this.columnHeader3.Width = 129;
-			// 
-			// columnHeader4
-			// 
-			this.columnHeader4.Text = "Length (est.)";
-			this.columnHeader4.Width = 82;
-			// 
-			// LastFrameCheckbox
-			// 
-			this.LastFrameCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.LastFrameCheckbox.AutoSize = true;
-			this.LastFrameCheckbox.Location = new System.Drawing.Point(342, 376);
-			this.LastFrameCheckbox.Name = "LastFrameCheckbox";
-			this.LastFrameCheckbox.Size = new System.Drawing.Size(75, 17);
-			this.LastFrameCheckbox.TabIndex = 59;
-			this.LastFrameCheckbox.Text = "Last frame";
-			this.LastFrameCheckbox.UseVisualStyleBackColor = true;
-			this.LastFrameCheckbox.CheckedChanged += new System.EventHandler(this.LastFrameCheckbox_CheckedChanged);
-			// 
-			// TurboCheckbox
-			// 
-			this.TurboCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.TurboCheckbox.AutoSize = true;
-			this.TurboCheckbox.Location = new System.Drawing.Point(438, 376);
-			this.TurboCheckbox.Name = "TurboCheckbox";
-			this.TurboCheckbox.Size = new System.Drawing.Size(54, 17);
-			this.TurboCheckbox.TabIndex = 60;
-			this.TurboCheckbox.Text = "Turbo";
-			this.TurboCheckbox.UseVisualStyleBackColor = true;
-			// 
-			// PlayMovie
-			// 
-			this.AcceptButton = this.OK;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.Cancel;
-			this.ClientSize = new System.Drawing.Size(774, 398);
-			this.Controls.Add(this.TurboCheckbox);
-			this.Controls.Add(this.LastFrameCheckbox);
-			this.Controls.Add(this.StopOnFrameTextBox);
-			this.Controls.Add(this.StopOnFrameCheckbox);
-			this.Controls.Add(this.MatchHashCheckBox);
-			this.Controls.Add(this.Scan);
-			this.Controls.Add(this.IncludeSubDirectories);
-			this.Controls.Add(this.ReadOnlyCheckBox);
-			this.Controls.Add(this.MovieCount);
-			this.Controls.Add(this.groupBox1);
-			this.Controls.Add(this.MovieView);
-			this.Controls.Add(this.BrowseMovies);
-			this.Controls.Add(this.OK);
-			this.Controls.Add(this.Cancel);
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.MinimumSize = new System.Drawing.Size(547, 228);
-			this.Name = "PlayMovie";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Play Movie";
-			this.Load += new System.EventHandler(this.PlayMovie_Load);
-			this.groupBox1.ResumeLayout(false);
-			this.contextMenuStrip1.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button Cancel;
-		private System.Windows.Forms.Button OK;
-		private System.Windows.Forms.Button BrowseMovies;
-		private BizHawk.Client.EmuHawk.VirtualListView MovieView;
-		private System.Windows.Forms.ColumnHeader columnHeader1;
-		private System.Windows.Forms.ColumnHeader columnHeader2;
-		private System.Windows.Forms.ColumnHeader columnHeader3;
-		private System.Windows.Forms.ColumnHeader columnHeader4;
-		private System.Windows.Forms.ListView DetailsView;
-		private System.Windows.Forms.ColumnHeader columnHeader5;
-		private System.Windows.Forms.ColumnHeader columnHeader6;
-		private System.Windows.Forms.GroupBox groupBox1;
-		private System.Windows.Forms.Button SubtitlesBtn;
-		private System.Windows.Forms.Button CommentsBtn;
-		private System.Windows.Forms.Label MovieCount;
-		private System.Windows.Forms.CheckBox ReadOnlyCheckBox;
-		private System.Windows.Forms.CheckBox IncludeSubDirectories;
-		private System.Windows.Forms.Button Scan;
-		private System.Windows.Forms.ToolTip toolTip1;
-		private System.Windows.Forms.CheckBox MatchHashCheckBox;
-		private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-		private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
-		private System.Windows.Forms.CheckBox StopOnFrameCheckbox;
-		private BizHawk.Client.EmuHawk.WatchValueBox StopOnFrameTextBox;
-		private System.Windows.Forms.CheckBox LastFrameCheckbox;
-		private System.Windows.Forms.CheckBox TurboCheckbox;
-	}
-}
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/movie/PlayMovie.cs b/BizHawk.Client.MultiHawk/movie/PlayMovie.cs
deleted file mode 100644
index 711369ed27..0000000000
--- a/BizHawk.Client.MultiHawk/movie/PlayMovie.cs
+++ /dev/null
@@ -1,673 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-using BizHawk.Client.Common;
-using BizHawk.Common;
-using BizHawk.Client.EmuHawk;
-namespace BizHawk.Client.MultiHawk
-{
-	public partial class PlayMovie : Form
-	{
-		private readonly PlatformFrameRates PlatformFrameRates = new PlatformFrameRates();
-
-		private List<IMovie> _movieList = new List<IMovie>();
-		private bool _sortReverse;
-		private string _sortedCol;
-
-		private bool _sortDetailsReverse;
-		private string _sortedDetailsCol;
-
-		public PlayMovie()
-		{
-			InitializeComponent();
-			MovieView.QueryItemText += MovieView_QueryItemText;
-			MovieView.VirtualMode = true;
-			_sortReverse = false;
-			_sortedCol = "";
-
-			_sortDetailsReverse = false;
-			_sortedDetailsCol = "";
-		}
-
-		private void PlayMovie_Load(object sender, EventArgs e)
-		{
-			IncludeSubDirectories.Checked = Global.Config.PlayMovie_IncludeSubdir;
-			MatchHashCheckBox.Checked = Global.Config.PlayMovie_MatchHash;
-			ScanFiles();
-			PreHighlightMovie();
-			TurboCheckbox.Checked = Global.Config.TurboSeek;
-		}
-
-		private void MovieView_QueryItemText(int index, int column, out string text)
-		{
-			text = "";
-			if (column == 0) // File
-			{
-				text = Path.GetFileName(_movieList[index].Filename);
-			}
-
-			if (column == 1) // System
-			{
-				text = _movieList[index].SystemID;
-			}
-
-			if (column == 2) // Game
-			{
-				text = _movieList[index].GameName;
-			}
-
-			if (column == 3) // Time
-			{
-				text = PlatformFrameRates.MovieTime(_movieList[index]).ToString(@"hh\:mm\:ss\.fff");
-			}
-		}
-
-		private void Run()
-		{
-			var indices = MovieView.SelectedIndices;
-			if (indices.Count > 0) // Import file if necessary
-			{
-				GlobalWin.MainForm.StartNewMovie(_movieList[MovieView.SelectedIndices[0]], false);
-			}
-		}
-
-		private int? AddMovieToList(string filename, bool force)
-		{
-			using (var file = new HawkFile(filename))
-			{
-				if (!file.Exists)
-				{
-					return null;
-				}
-				
-				var index = IsDuplicateOf(filename);
-				if (!index.HasValue)
-				{
-					//System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch(); watch.Start();
-					var movie = PreLoadMovieFile(file, force);
-					if (movie == null)
-					{
-						return null;
-					}
-					//watch.Stop(); Console.WriteLine("[{0}] {1}",watch.ElapsedMilliseconds,Path.GetFileName(filename));
-					
-					lock (_movieList)
-					{
-						_movieList.Add(movie);
-						index = _movieList.Count - 1;
-					}
-
-					_sortReverse = false;
-					_sortedCol = "";
-				}
-
-				return index;
-			}
-
-		}
-
-		private int? IsDuplicateOf(string filename)
-		{
-			for (var i = 0; i < _movieList.Count; i++)
-			{
-				if (_movieList[i].Filename == filename)
-				{
-					return i;
-				}
-			}
-
-			return null;
-		}
-
-		private IMovie PreLoadMovieFile(HawkFile hf, bool force)
-		{
-			var movie = MovieService.Get(hf.CanonicalFullPath);
-
-			try
-			{
-				movie.PreLoadHeaderAndLength(hf);
-
-				// Don't do this from browse
-				if (movie.Hash == Global.Game.Hash ||
-					Global.Config.PlayMovie_MatchHash == false || force)
-				{
-					return movie;
-				}
-			}
-			catch (Exception ex)
-			{
-				// TODO: inform the user that a movie failed to parse in some way
-				Console.WriteLine(ex.Message);
-			}
-
-			return null;
-		}
-
-		private void UpdateList()
-		{
-			MovieView.Refresh();
-			MovieCount.Text = _movieList.Count + " movie"
-				+ (_movieList.Count != 1 ? "s" : "");
-		}
-
-		private void PreHighlightMovie()
-		{
-			if (Global.Game == null)
-			{
-				return;
-			}
-
-			var indices = new List<int>();
-
-			// Pull out matching names
-			for (var i = 0; i < _movieList.Count; i++)
-			{
-				if (PathManager.FilesystemSafeName(Global.Game) == _movieList[i].GameName)
-				{
-					indices.Add(i);
-				}
-			}
-
-			if (indices.Count == 0)
-			{
-				return;
-			}
-
-			if (indices.Count == 1)
-			{
-				HighlightMovie(indices[0]);
-				return;
-			}
-
-			// Prefer tas files
-			var tas = new List<int>();
-			for (var i = 0; i < indices.Count; i++)
-			{
-				foreach (var ext in MovieService.MovieExtensions)
-				{
-					if (Path.GetExtension(_movieList[indices[i]].Filename).ToUpper() == "." + ext)
-					{
-						tas.Add(i);
-					}
-				}
-			}
-
-			if (tas.Count == 1)
-			{
-				HighlightMovie(tas[0]);
-				return;
-			}
-			
-			if (tas.Count > 1)
-			{
-				indices = new List<int>(tas);
-			}
-
-			// Final tie breaker - Last used file
-			var file = new FileInfo(_movieList[indices[0]].Filename);
-			var time = file.LastAccessTime;
-			var mostRecent = indices.First();
-			for (var i = 1; i < indices.Count; i++)
-			{
-				file = new FileInfo(_movieList[indices[0]].Filename);
-				if (file.LastAccessTime > time)
-				{
-					time = file.LastAccessTime;
-					mostRecent = indices[i];
-				}
-			}
-
-			HighlightMovie(mostRecent);
-			return;
-		}
-
-		private void HighlightMovie(int index)
-		{
-			MovieView.SelectedIndices.Clear();
-			MovieView.setSelection(index);
-			MovieView.SelectItem(index, true);
-		}
-
-		private void ScanFiles()
-		{
-			_movieList.Clear();
-			MovieView.ItemCount = 0;
-			MovieView.Update();
-
-			var directory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null);
-			if (!Directory.Exists(directory))
-			{
-				Directory.CreateDirectory(directory);
-			}
-
-			var dpTodo = new Queue<string>();
-			var fpTodo = new List<string>();
-			dpTodo.Enqueue(directory);
-			Dictionary<string, int> ordinals = new Dictionary<string, int>();
-
-			while (dpTodo.Count > 0)
-			{
-				string dp = dpTodo.Dequeue();
-				
-				//enqueue subdirectories if appropriate
-				if (Global.Config.PlayMovie_IncludeSubdir)
-					foreach(var subdir in Directory.GetDirectories(dp))
-						dpTodo.Enqueue(subdir);
-
-				//add movies
-				fpTodo.AddRange(Directory.GetFiles(dp, "*." + MovieService.DefaultExtension));
-				fpTodo.AddRange(Directory.GetFiles(dp, "*." + TasMovie.Extension));
-			}
-
-			//in parallel, scan each movie
-			Parallel.For(0, fpTodo.Count, (i) =>
-			//for(int i=0;i<fpTodo.Count;i++)
-			{
-				var file = fpTodo[i];
-				lock(ordinals) ordinals[file] = i;
-				AddMovieToList(file, force: false);
-			}
-			);
-
-			//sort by the ordinal key to maintain relatively stable results when rescanning
-			_movieList.Sort((a, b) => ordinals[a.Filename].CompareTo(ordinals[b.Filename]));
-
-			RefreshMovieList();
-		}
-
-		#region Events
-
-		#region Movie List
-
-		void RefreshMovieList()
-		{
-			MovieView.ItemCount = _movieList.Count;
-			UpdateList();
-		}
-
-		private void MovieView_DragEnter(object sender, DragEventArgs e)
-		{
-			e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;
-		}
-
-		private void MovieView_DragDrop(object sender, DragEventArgs e)
-		{
-			var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
-
-			filePaths
-				.Where(path => MovieService.MovieExtensions.Contains(Path.GetExtension(path).Replace(".", "")))
-				.ToList()
-				.ForEach(path => AddMovieToList(path, force: true));
-
-			RefreshMovieList();
-		}
-
-		private void MovieView_KeyDown(object sender, KeyEventArgs e)
-		{
-			if (e.Control && e.KeyCode == Keys.C)
-			{
-				var indexes = MovieView.SelectedIndices;
-				if (indexes.Count > 0)
-				{
-					var copyStr = new StringBuilder();
-					foreach (int index in indexes)
-					{
-						copyStr
-							.Append(_movieList[index].Filename).Append('\t')
-							.Append(_movieList[index].SystemID).Append('\t')
-							.Append(_movieList[index].GameName).Append('\t')
-							.Append(PlatformFrameRates.MovieTime(_movieList[index]).ToString(@"hh\:mm\:ss\.fff"))
-							.AppendLine();
-					}
-					Clipboard.SetDataObject(copyStr.ToString());
-				}
-			}
-		}
-
-		private void MovieView_DoubleClick(object sender, EventArgs e)
-		{
-			Run();
-			Close();
-		}
-
-		private void MovieView_ColumnClick(object sender, ColumnClickEventArgs e)
-		{
-			var columnName = MovieView.Columns[e.Column].Text;
-			switch (columnName)
-			{
-				case "File":
-				default:
-					_movieList = _movieList.OrderBy(x => Path.GetFileName(x.Filename))
-						.ThenBy(x => x.SystemID)
-						.ThenBy(x => x.GameName)
-						.ThenBy(x => x.FrameCount)
-						.ToList();
-					break;
-				case "SysID":
-					_movieList = _movieList.OrderBy(x => x.SystemID)
-						.ThenBy(x => Path.GetFileName(x.Filename))
-						.ThenBy(x => x.GameName)
-						.ThenBy(x => x.FrameCount)
-						.ToList();
-					break;
-				case "Game":
-					_movieList = _movieList.OrderBy(x => x.GameName)
-						.ThenBy(x => Path.GetFileName(x.Filename))
-						.ThenBy(x => x.SystemID)
-						.ThenBy(x => x.FrameCount)
-						.ToList();
-					break;
-				case "Length (est.)":
-					_movieList = _movieList.OrderBy(x => x.FrameCount)
-						.ThenBy(x => Path.GetFileName(x.Filename))
-						.ThenBy(x => x.SystemID)
-						.ThenBy(x => x.GameName)
-						.ToList();
-					break;
-			}
-			if (_sortedCol == columnName && _sortReverse)
-			{
-				_movieList.Reverse();
-				_sortReverse = false;
-			}
-			else
-			{
-				_sortReverse = true;
-				_sortedCol = columnName;
-			}
-			MovieView.Refresh();
-		}
-
-		private void MovieView_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			toolTip1.SetToolTip(DetailsView, "");
-			DetailsView.Items.Clear();
-			if (MovieView.SelectedIndices.Count < 1)
-			{
-				OK.Enabled = false;
-				return;
-			}
-
-			OK.Enabled = true;
-
-			var firstIndex = MovieView.SelectedIndices[0];
-			MovieView.ensureVisible(firstIndex);
-
-			foreach (var kvp in _movieList[firstIndex].HeaderEntries)
-			{
-				var item = new ListViewItem(kvp.Key);
-				item.SubItems.Add(kvp.Value);
-
-				bool add = true;
-
-				switch (kvp.Key)
-				{
-					case HeaderKeys.SHA1:
-						if (kvp.Value != Global.Game.Hash)
-						{
-							item.BackColor = Color.Pink;
-							toolTip1.SetToolTip(DetailsView, "Current SHA1: " + Global.Game.Hash);
-						}
-						break;
-					// TODO
-					//case HeaderKeys.EMULATIONVERSION:
-					//	if (kvp.Value != VersionInfo.GetEmuVersion())
-					//	{
-					//		item.BackColor = Color.Yellow;
-					//	}
-					//	break;
-					case HeaderKeys.PLATFORM:
-						if (kvp.Value != Global.Game.System)
-						{
-							item.BackColor = Color.Pink;
-						}
-						break;
-				}
-
-				if(add)
-					DetailsView.Items.Add(item);
-			}
-
-			var FpsItem = new ListViewItem("Fps");
-			FpsItem.SubItems.Add($"{Fps(_movieList[firstIndex]):0.#######}");
-			DetailsView.Items.Add(FpsItem);
-
-			var FramesItem = new ListViewItem("Frames");
-			FramesItem.SubItems.Add(_movieList[firstIndex].FrameCount.ToString());
-			DetailsView.Items.Add(FramesItem);
-			CommentsBtn.Enabled = _movieList[firstIndex].Comments.Any();
-			SubtitlesBtn.Enabled = _movieList[firstIndex].Subtitles.Any();
-		}
-
-		public double Fps(IMovie movie)
-		{
-			var system = movie.HeaderEntries[HeaderKeys.PLATFORM];
-			var pal = movie.HeaderEntries.ContainsKey(HeaderKeys.PAL) &&
-					movie.HeaderEntries[HeaderKeys.PAL] == "1";
-
-			return new PlatformFrameRates()[system, pal];
-			
-		}
-
-		private void EditMenuItem_Click(object sender, EventArgs e)
-		{
-			MovieView.SelectedIndices
-				.Cast<int>()
-				.Select(index => _movieList[index])
-				.ToList()
-				.ForEach(movie => System.Diagnostics.Process.Start(movie.Filename));
-		}
-
-		#endregion
-
-		#region Details
-
-		private void DetailsView_ColumnClick(object sender, ColumnClickEventArgs e)
-		{
-			var detailsList = new List<MovieDetails>();
-			for (var i = 0; i < DetailsView.Items.Count; i++)
-			{
-				detailsList.Add(new MovieDetails
-				{
-					Keys = DetailsView.Items[i].Text,
-					Values = DetailsView.Items[i].SubItems[1].Text,
-					BackgroundColor = DetailsView.Items[i].BackColor
-				});
-			}
-
-			var columnName = DetailsView.Columns[e.Column].Text;
-			if (_sortedDetailsCol != columnName)
-			{
-				_sortDetailsReverse = false;
-			}
-
-			switch (columnName)
-			{
-				// Header, Value
-				case "Header":
-					if (_sortDetailsReverse)
-					{
-						detailsList = detailsList
-							.OrderByDescending(x => x.Keys)
-							.ThenBy(x => x.Values).ToList();
-					}
-					else
-					{
-						detailsList = detailsList
-						   .OrderBy(x => x.Keys)
-						   .ThenBy(x => x.Values).ToList();
-					}
-
-					break;
-				case "Value":
-					if (_sortDetailsReverse)
-					{
-						detailsList = detailsList
-							.OrderByDescending(x => x.Values)
-							.ThenBy(x => x.Keys).ToList();
-					}
-					else
-					{
-						detailsList = detailsList
-							.OrderBy(x => x.Values)
-							.ThenBy(x => x.Keys).ToList();
-					}
-
-					break;
-			}
-
-			DetailsView.Items.Clear();
-			foreach (var detail in detailsList)
-			{
-				var item = new ListViewItem { Text = detail.Keys, BackColor = detail.BackgroundColor };
-				item.SubItems.Add(detail.Values);
-				DetailsView.Items.Add(item);
-			}
-
-			_sortedDetailsCol = columnName;
-			_sortDetailsReverse = !_sortDetailsReverse;
-		}
-
-		private void CommentsBtn_Click(object sender, EventArgs e)
-		{
-			var indices = MovieView.SelectedIndices;
-			if (indices.Count > 0)
-			{
-				var form = new EditCommentsForm();
-				form.GetMovie(_movieList[MovieView.SelectedIndices[0]]);
-				form.Show();
-			}
-		}
-
-		private void SubtitlesBtn_Click(object sender, EventArgs e)
-		{
-			var indices = MovieView.SelectedIndices;
-			if (indices.Count > 0)
-			{
-				var s = new EditSubtitlesForm { ReadOnly = true };
-				s.GetMovie(_movieList[MovieView.SelectedIndices[0]]);
-				s.Show();
-			}
-		}
-
-		#endregion
-
-		#region Misc Widgets
-
-		private void BrowseMovies_Click(object sender, EventArgs e)
-		{
-			var ofd = new OpenFileDialog
-			{
-				Filter = "Movie Files (*." + MovieService.DefaultExtension + ")|*." + MovieService.DefaultExtension +
-					"|TAS project Files (*." + TasMovie.Extension + ")|*." + TasMovie.Extension +
-					"|All Files|*.*",
-				InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null)
-			};
-
-			var result = ofd.ShowDialog();
-			if (result == DialogResult.OK)
-			{
-				var file = new FileInfo(ofd.FileName);
-				if (!file.Exists)
-				{
-					return;
-				}
-
-				int? index = AddMovieToList(ofd.FileName, true);
-				RefreshMovieList();
-				if (index.HasValue)
-				{
-					MovieView.SelectedIndices.Clear();
-					MovieView.setSelection(index.Value);
-					MovieView.SelectItem(index.Value, true);
-				}
-			}
-		}
-
-		private void Scan_Click(object sender, EventArgs e)
-		{
-			ScanFiles();
-			PreHighlightMovie();
-		}
-
-		private void IncludeSubDirectories_CheckedChanged(object sender, EventArgs e)
-		{
-			Global.Config.PlayMovie_IncludeSubdir = IncludeSubDirectories.Checked;
-			ScanFiles();
-			PreHighlightMovie();
-		}
-
-		private void MatchHashCheckBox_CheckedChanged(object sender, EventArgs e)
-		{
-			Global.Config.PlayMovie_MatchHash = MatchHashCheckBox.Checked;
-			ScanFiles();
-			PreHighlightMovie();
-		}
-
-		private void Ok_Click(object sender, EventArgs e)
-		{
-			Global.Config.TurboSeek = TurboCheckbox.Checked;
-			Run();
-			Global.MovieSession.ReadOnly = ReadOnlyCheckBox.Checked;
-
-			if (StopOnFrameCheckbox.Checked && 
-				(StopOnFrameTextBox.ToRawInt().HasValue || LastFrameCheckbox.Checked))
-			{
-				if (LastFrameCheckbox.Checked)
-				{
-					// TODO
-					//GlobalWin.MainForm.PauseOnFrame = Global.MovieSession.Movie.InputLogLength;
-				}
-				else
-				{
-					//GlobalWin.MainForm.PauseOnFrame = StopOnFrameTextBox.ToRawInt();
-				}
-			}
-
-			Close();
-		}
-
-		private void Cancel_Click(object sender, EventArgs e)
-		{
-			Close();
-		}
-
-		#endregion
-
-		private bool _programmaticallyChangingStopFrameCheckbox = false;
-		private void StopOnFrameCheckbox_CheckedChanged(object sender, EventArgs e)
-		{
-			if (!_programmaticallyChangingStopFrameCheckbox)
-			{
-				StopOnFrameTextBox.Focus();
-			}
-		}
-
-		private void StopOnFrameTextBox_TextChanged_1(object sender, EventArgs e)
-		{
-			_programmaticallyChangingStopFrameCheckbox = true;
-			StopOnFrameCheckbox.Checked = !string.IsNullOrWhiteSpace(StopOnFrameTextBox.Text);
-			_programmaticallyChangingStopFrameCheckbox = false;
-		}
-
-		private void LastFrameCheckbox_CheckedChanged(object sender, EventArgs e)
-		{
-			if (LastFrameCheckbox.Checked == true)
-			{
-				_programmaticallyChangingStopFrameCheckbox = true;
-				StopOnFrameCheckbox.Checked = true;
-				_programmaticallyChangingStopFrameCheckbox = false;
-			}
-
-			StopOnFrameTextBox.Enabled = !LastFrameCheckbox.Checked;
-		}
-
-		#endregion
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/movie/PlayMovie.resx b/BizHawk.Client.MultiHawk/movie/PlayMovie.resx
deleted file mode 100644
index b726d762b7..0000000000
--- a/BizHawk.Client.MultiHawk/movie/PlayMovie.resx
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>114, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA////AP64aABQUFAAwNjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAMDAAMDAwAAAAAAAAAAAAMCAgMDAwMDAwAAAAMDAAADAgICAwMDAwMDAwMCAgMAAAMCAwMD
-        AwMDAwMDAgIDAAMEBAQDAgMDAwMDAwICAgMDBAQEAwICAwQDAwQDAgIDAAMDAwICAgMCAgIDAwMDAAAA
-        AwICAgMCAgIDAgMAAAAAAAAAAwMEBAQEBAQCAwAAAAAAAwMEBAQDAwMDAwMAAAAAAwQEAwMEBAMEBAQC
-        AwAAAAMEBAMDBAMEBAQEAgMAAAAAAwMDBAQDBAMDAwIDAAAAAAMCAgICAgICAgMEBAMAAAAAAwICAgIC
-        AwMEBAQDAAAAAAADAwMDAwAAAwMDAJH/AAAAcwAAAAEAAIABAAAAAAAAAAAAAIABAADABwAA8AMAAOAD
-        AADAAQAAwAEAAOABAADgAAAA8AAAAPgxAAA=
-</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/movie/RecordMovie.Designer.cs b/BizHawk.Client.MultiHawk/movie/RecordMovie.Designer.cs
deleted file mode 100644
index 252508deab..0000000000
--- a/BizHawk.Client.MultiHawk/movie/RecordMovie.Designer.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-namespace BizHawk.Client.MultiHawk
-{
-	partial class RecordMovie
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RecordMovie));
-			this.Cancel = new System.Windows.Forms.Button();
-			this.OK = new System.Windows.Forms.Button();
-			this.BrowseBtn = new System.Windows.Forms.Button();
-			this.RecordBox = new System.Windows.Forms.TextBox();
-			this.StartFromCombo = new System.Windows.Forms.ComboBox();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.DefaultAuthorCheckBox = new System.Windows.Forms.CheckBox();
-			this.AuthorBox = new System.Windows.Forms.TextBox();
-			this.label3 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.label1 = new System.Windows.Forms.Label();
-			this.groupBox1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// Cancel
-			// 
-			this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.Cancel.Location = new System.Drawing.Point(391, 139);
-			this.Cancel.Name = "Cancel";
-			this.Cancel.Size = new System.Drawing.Size(75, 23);
-			this.Cancel.TabIndex = 1;
-			this.Cancel.Text = "&Cancel";
-			this.Cancel.UseVisualStyleBackColor = true;
-			this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
-			// 
-			// OK
-			// 
-			this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.OK.Location = new System.Drawing.Point(310, 139);
-			this.OK.Name = "OK";
-			this.OK.Size = new System.Drawing.Size(75, 23);
-			this.OK.TabIndex = 0;
-			this.OK.Text = "&OK";
-			this.OK.UseVisualStyleBackColor = true;
-			this.OK.Click += new System.EventHandler(this.Ok_Click);
-			// 
-			// BrowseBtn
-			// 
-			this.BrowseBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.BrowseBtn.Image = global::BizHawk.Client.MultiHawk.Properties.Resources.OpenFile;
-			this.BrowseBtn.Location = new System.Drawing.Point(423, 13);
-			this.BrowseBtn.Name = "BrowseBtn";
-			this.BrowseBtn.Size = new System.Drawing.Size(25, 23);
-			this.BrowseBtn.TabIndex = 1;
-			this.BrowseBtn.UseVisualStyleBackColor = true;
-			this.BrowseBtn.Click += new System.EventHandler(this.BrowseBtn_Click);
-			// 
-			// RecordBox
-			// 
-			this.RecordBox.AllowDrop = true;
-			this.RecordBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.RecordBox.Location = new System.Drawing.Point(83, 13);
-			this.RecordBox.Name = "RecordBox";
-			this.RecordBox.Size = new System.Drawing.Size(334, 20);
-			this.RecordBox.TabIndex = 0;
-			this.RecordBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.RecordBox_DragDrop);
-			this.RecordBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.RecordBox_DragEnter);
-			// 
-			// StartFromCombo
-			// 
-			this.StartFromCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.StartFromCombo.Enabled = false;
-			this.StartFromCombo.FormattingEnabled = true;
-			this.StartFromCombo.Items.AddRange(new object[] {
-            "Power-On"});
-			this.StartFromCombo.Location = new System.Drawing.Point(83, 65);
-			this.StartFromCombo.MaxDropDownItems = 32;
-			this.StartFromCombo.Name = "StartFromCombo";
-			this.StartFromCombo.Size = new System.Drawing.Size(152, 21);
-			this.StartFromCombo.TabIndex = 3;
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.groupBox1.Controls.Add(this.DefaultAuthorCheckBox);
-			this.groupBox1.Controls.Add(this.AuthorBox);
-			this.groupBox1.Controls.Add(this.StartFromCombo);
-			this.groupBox1.Controls.Add(this.BrowseBtn);
-			this.groupBox1.Controls.Add(this.label3);
-			this.groupBox1.Controls.Add(this.label2);
-			this.groupBox1.Controls.Add(this.label1);
-			this.groupBox1.Controls.Add(this.RecordBox);
-			this.groupBox1.Location = new System.Drawing.Point(12, 12);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(454, 112);
-			this.groupBox1.TabIndex = 0;
-			this.groupBox1.TabStop = false;
-			// 
-			// DefaultAuthorCheckBox
-			// 
-			this.DefaultAuthorCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Right;
-			this.DefaultAuthorCheckBox.AutoSize = true;
-			this.DefaultAuthorCheckBox.Location = new System.Drawing.Point(327, 64);
-			this.DefaultAuthorCheckBox.Name = "DefaultAuthorCheckBox";
-			this.DefaultAuthorCheckBox.Size = new System.Drawing.Size(121, 17);
-			this.DefaultAuthorCheckBox.TabIndex = 6;
-			this.DefaultAuthorCheckBox.Text = "Make default author";
-			this.DefaultAuthorCheckBox.UseVisualStyleBackColor = true;
-			// 
-			// AuthorBox
-			// 
-			this.AuthorBox.AllowDrop = true;
-			this.AuthorBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.AuthorBox.Location = new System.Drawing.Point(83, 39);
-			this.AuthorBox.Name = "AuthorBox";
-			this.AuthorBox.Size = new System.Drawing.Size(365, 20);
-			this.AuthorBox.TabIndex = 2;
-			// 
-			// label3
-			// 
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(36, 41);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(41, 13);
-			this.label3.TabIndex = 2;
-			this.label3.Text = "Author:";
-			// 
-			// label2
-			// 
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(6, 68);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(71, 13);
-			this.label2.TabIndex = 5;
-			this.label2.Text = "Record From:";
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(51, 16);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(26, 13);
-			this.label1.TabIndex = 4;
-			this.label1.Text = "File:";
-			// 
-			// RecordMovie
-			// 
-			this.AcceptButton = this.OK;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.Cancel;
-			this.ClientSize = new System.Drawing.Size(478, 163);
-			this.Controls.Add(this.groupBox1);
-			this.Controls.Add(this.OK);
-			this.Controls.Add(this.Cancel);
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.MaximizeBox = false;
-			this.MaximumSize = new System.Drawing.Size(1440, 201);
-			this.MinimizeBox = false;
-			this.MinimumSize = new System.Drawing.Size(425, 201);
-			this.Name = "RecordMovie";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Record Movie";
-			this.Load += new System.EventHandler(this.RecordMovie_Load);
-			this.groupBox1.ResumeLayout(false);
-			this.groupBox1.PerformLayout();
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button Cancel;
-		private System.Windows.Forms.Button OK;
-		private System.Windows.Forms.Button BrowseBtn;
-		private System.Windows.Forms.TextBox RecordBox;
-		private System.Windows.Forms.ComboBox StartFromCombo;
-		private System.Windows.Forms.GroupBox groupBox1;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.TextBox AuthorBox;
-		private System.Windows.Forms.CheckBox DefaultAuthorCheckBox;
-	}
-}
\ No newline at end of file
diff --git a/BizHawk.Client.MultiHawk/movie/RecordMovie.cs b/BizHawk.Client.MultiHawk/movie/RecordMovie.cs
deleted file mode 100644
index 4c5cdb4e66..0000000000
--- a/BizHawk.Client.MultiHawk/movie/RecordMovie.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using System;
-using System.IO;
-using System.Windows.Forms;
-using System.Linq;
-
-using BizHawk.Common.ReflectionExtensions;
-using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.IEmulatorExtensions;
-using BizHawk.Client.Common;
-using BizHawk.Client.Common.MovieConversionExtensions;
-
-namespace BizHawk.Client.MultiHawk
-{
-	public partial class RecordMovie : Form
-	{
-		private IEmulator Emulator;
-
-		// TODO - Allow relative paths in record textbox
-		public RecordMovie(IEmulator core)
-		{
-			InitializeComponent();
-
-			Emulator = core;
-
-			if (!Emulator.HasSavestates())
-			{
-				StartFromCombo.Items.Remove(
-					StartFromCombo.Items
-						.OfType<object>()
-						.First(i => i.ToString()
-							.ToLower() == "now"));
-			}
-		}
-
-		private string MakePath()
-		{
-			var path = RecordBox.Text;
-
-			if (!string.IsNullOrWhiteSpace(path))
-			{
-				if (path.LastIndexOf(Path.DirectorySeparatorChar) == -1)
-				{
-					if (path[0] != Path.DirectorySeparatorChar)
-					{
-						path = path.Insert(0, Path.DirectorySeparatorChar.ToString());
-					}
-
-					path = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null) + path;
-
-					if (!MovieService.MovieExtensions.Contains(Path.GetExtension(path)))
-					{
-						// If no valid movie extension, add movie extension
-						path += "." + MovieService.DefaultExtension;
-					}
-				}
-			}
-
-			return path;
-		}
-
-		private void Ok_Click(object sender, EventArgs e)
-		{
-			var path = MakePath();
-			if (!string.IsNullOrWhiteSpace(path))
-			{
-				var test = new FileInfo(path);
-				if (test.Exists)
-				{
-					var result = MessageBox.Show(path + " already exists, overwrite?", "Confirm overwrite", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
-					if (result == DialogResult.Cancel)
-					{
-						return;
-					}
-				}
-
-				var movieToRecord = MovieService.Get(path);
-
-				var fileInfo = new FileInfo(path);
-				if (!fileInfo.Exists)
-				{
-					Directory.CreateDirectory(fileInfo.DirectoryName);
-				}
-
-				//if (StartFromCombo.SelectedItem.ToString() == "Now" && Emulator.HasSavestates())
-				//{
-				//	var core = Emulator.AsStatable();
-
-				//	movieToRecord.StartsFromSavestate = true;
-
-				//	if (core.BinarySaveStatesPreferred)
-				//	{
-				//		movieToRecord.BinarySavestate = (byte[])core.SaveStateBinary().Clone();
-				//	}
-				//	else
-				//	{
-				//		using (var sw = new StringWriter())
-				//		{
-				//			core.SaveStateText(sw);
-				//			movieToRecord.TextSavestate = sw.ToString();
-				//		}
-				//	}
-				//	// TODO: do we want to support optionally not saving this?
-				//	if (true)
-				//	{
-				//		// hack: some IMovies eat the framebuffer, so don't bother with them
-				//		movieToRecord.SavestateFramebuffer = new int[0];
-				//		if (movieToRecord.SavestateFramebuffer != null)
-				//		{
-
-				//			movieToRecord.SavestateFramebuffer = (int[])Emulator.VideoProvider().GetVideoBuffer().Clone();
-				//		}
-				//	}
-				//}
-
-				movieToRecord.PopulateWithDefaultHeaderValues(AuthorBox.Text);
-				movieToRecord.Save();
-				GlobalWin.MainForm.StartNewMovie(movieToRecord, true);
-
-				Global.Config.UseDefaultAuthor = DefaultAuthorCheckBox.Checked;
-				if (DefaultAuthorCheckBox.Checked)
-				{
-					Global.Config.DefaultAuthor = AuthorBox.Text;
-				}
-
-				Close();
-			}
-			else
-			{
-				MessageBox.Show("Please select a movie to record", "File selection error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void Cancel_Click(object sender, EventArgs e)
-		{
-			Close();
-		}
-
-		private void BrowseBtn_Click(object sender, EventArgs e)
-		{
-			var sfd = new SaveFileDialog
-			{
-				InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null),
-				DefaultExt = "." + Global.MovieSession.Movie.PreferredExtension,
-				FileName = RecordBox.Text,
-				OverwritePrompt = false,
-				Filter = "Movie Files (*." + Global.MovieSession.Movie.PreferredExtension + ")|*." + Global.MovieSession.Movie.PreferredExtension + "|All Files|*.*"
-			};
-
-			var result = sfd.ShowDialog();
-			if (result == DialogResult.OK
-				&& !string.IsNullOrWhiteSpace(sfd.FileName))
-			{
-				RecordBox.Text = sfd.FileName;
-			}
-		}
-
-		private void RecordMovie_Load(object sender, EventArgs e)
-		{
-			RecordBox.Text = PathManager.FilesystemSafeName(GlobalWin.MainForm.EmulatorWindows.First().Game);
-			StartFromCombo.SelectedIndex = 0;
-			DefaultAuthorCheckBox.Checked = Global.Config.UseDefaultAuthor;
-			if (Global.Config.UseDefaultAuthor)
-			{
-				AuthorBox.Text = Global.Config.DefaultAuthor;
-			}
-		}
-
-		private void RecordBox_DragEnter(object sender, DragEventArgs e)
-		{
-			e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;
-		}
-
-		private void RecordBox_DragDrop(object sender, DragEventArgs e)
-		{
-			var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
-			RecordBox.Text = filePaths[0];
-		}
-	}
-}
diff --git a/BizHawk.Client.MultiHawk/movie/RecordMovie.resx b/BizHawk.Client.MultiHawk/movie/RecordMovie.resx
deleted file mode 100644
index fb80888459..0000000000
--- a/BizHawk.Client.MultiHawk/movie/RecordMovie.resx
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA////AP64aABQUFAAwNjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAMDAAMDAwAAAAAAAAAAAAMCAgMDAwMDAwAAAAMDAAADAgICAwMDAwMDAwMCAgMAAAMCAwMD
-        AwMDAwMDAgIDAAMEBAQDAgMDAwMDAwICAgMDBAQEAwICAwQDAwQDAgIDAAMDAwICAgMCAgIDAwMDAAAA
-        AwICAgMCAgIDAgMAAAAAAAAAAwMEBAQEBAQCAwAAAAAAAwMEBAQDAwMDAwMAAAAAAwQEAwMEBAMEBAQC
-        AwAAAAMEBAMDBAMEBAQEAgMAAAAAAwMDBAQDBAMDAwIDAAAAAAMCAgICAgICAgMEBAMAAAAAAwICAgIC
-        AwMEBAQDAAAAAAADAwMDAwAAAwMDAJH/AAAAcwAAAAEAAIABAAAAAAAAAAAAAIABAADABwAA8AMAAOAD
-        AADAAQAAwAEAAOABAADgAAAA8AAAAPgxAAA=
-</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj
index 3817a8ca4a..1e89a13523 100644
--- a/BizHawk.Common/BizHawk.Common.csproj
+++ b/BizHawk.Common/BizHawk.Common.csproj
@@ -13,6 +13,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/BizHawk.Common/BizHawk.Common.csproj.DotSettings b/BizHawk.Common/BizHawk.Common.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/BizHawk.Common/BizHawk.Common.csproj.DotSettings
+++ b/BizHawk.Common/BizHawk.Common.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/BizHawk.Common/BizInvoke/BizExvoker.cs b/BizHawk.Common/BizInvoke/BizExvoker.cs
index f5944e7586..2a12630349 100644
--- a/BizHawk.Common/BizInvoke/BizExvoker.cs
+++ b/BizHawk.Common/BizInvoke/BizExvoker.cs
@@ -64,8 +64,7 @@ namespace BizHawk.Common.BizInvoke
 					Info = m,
 					Attr = m.GetCustomAttributes(true).OfType<BizExportAttribute>().FirstOrDefault()
 				})
-				.Where(a => a.Attr != null)
-				.ToList();
+				.Where(a => a.Attr != null);
 
 				var typeBuilder = ImplModuleBuilder.DefineType($"Bizhawk.BizExvokeHolder{type.Name}", TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed);
 
diff --git a/BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs b/BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs
index 3276e64d46..9f4f0ce27b 100644
--- a/BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs
+++ b/BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs
@@ -4,16 +4,15 @@ using System.Reflection;
 
 namespace BizHawk.Common.BizInvoke
 {
+	/// TODO move this and all in IImportResolver.cs to OSTailoredCode.cs and refactor
 	public class DynamicLibraryImportResolver : IImportResolver, IDisposable
 	{
 		private IntPtr _p;
-		private readonly OSTailoredCode.ILinkedLibManager libLoader = OSTailoredCode.LinkedLibManager;
+		private readonly OSTailoredCode.ILinkedLibManager libLoader = OSTailoredCode.LinkedLibManager; //TODO inline?
 
 		public DynamicLibraryImportResolver(string dllName)
 		{
-			if (OSTailoredCode.CurrentOS != OSTailoredCode.DistinctOS.Windows) ResolveFilePath(ref dllName);
-			_p = libLoader.LoadPlatformSpecific(dllName);
-			if (_p == IntPtr.Zero) throw new InvalidOperationException($"null pointer returned by {nameof(libLoader.LoadPlatformSpecific)}");
+			_p = libLoader.LoadOrThrow(dllName);
 		}
 
 		private string[] RelativeSearchPaths = {
@@ -60,8 +59,8 @@ namespace BizHawk.Common.BizInvoke
 
 		private void Free()
 		{
-			if (_p == IntPtr.Zero) return;
-			libLoader.FreePlatformSpecific(_p);
+			if (_p == IntPtr.Zero) return; // already freed
+			libLoader.FreeByPtr(_p);
 			_p = IntPtr.Zero;
 		}
 
diff --git a/BizHawk.Common/Extensions/ReflectionExtensions.cs b/BizHawk.Common/Extensions/ReflectionExtensions.cs
index 505939d717..ec997a25c9 100644
--- a/BizHawk.Common/Extensions/ReflectionExtensions.cs
+++ b/BizHawk.Common/Extensions/ReflectionExtensions.cs
@@ -19,6 +19,12 @@ namespace BizHawk.Common.ReflectionExtensions
 				.Where(p => p.GetCustomAttributes(attributeType, false).Length > 0);
 		}
 
+		public static IEnumerable<MethodInfo> GetMethodsWithAttrib(this Type type, Type attributeType)
+		{
+			return type.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic)
+				.Where(p => p.GetCustomAttributes(attributeType, false).Length > 0);
+		}
+
 		/// <summary>
 		/// Gets the description attribute from an object
 		/// </summary>
diff --git a/BizHawk.Common/OSTailoredCode.cs b/BizHawk.Common/OSTailoredCode.cs
index 9109daeeda..e130cf94e1 100644
--- a/BizHawk.Common/OSTailoredCode.cs
+++ b/BizHawk.Common/OSTailoredCode.cs
@@ -31,11 +31,13 @@ namespace BizHawk.Common
 
 		public static ILinkedLibManager LinkedLibManager => _LinkedLibManager.Value;
 
+		/// <remarks>this interface's inheritors hide OS-specific implementation details</remarks>
 		public interface ILinkedLibManager
 		{
-			IntPtr LoadPlatformSpecific(string dllToLoad);
-			IntPtr GetProcAddr(IntPtr hModule, string procName);
-			int FreePlatformSpecific(IntPtr hModule);
+			IntPtr? LoadOrNull(string dllToLoad);
+			IntPtr LoadOrThrow(string dllToLoad);
+			IntPtr GetProcAddr(IntPtr hModule, string procName); //TODO also split into nullable and throwing?
+			int FreeByPtr(IntPtr hModule);
 		}
 
 		/// <remarks>This class is copied from a tutorial, so don't git blame and then email me expecting insight.</remarks>
@@ -43,46 +45,67 @@ namespace BizHawk.Common
 		{
 			private const int RTLD_NOW = 2;
 			[DllImport("libdl.so.2")]
-			private static extern IntPtr dlopen(string fileName, int flags);
+			private static extern int dlclose(IntPtr handle);
 			[DllImport("libdl.so.2")]
 			private static extern IntPtr dlerror();
 			[DllImport("libdl.so.2")]
-			private static extern IntPtr dlsym(IntPtr handle, string symbol);
+			private static extern IntPtr dlopen(string fileName, int flags);
 			[DllImport("libdl.so.2")]
-			private static extern int dlclose(IntPtr handle);
+			private static extern IntPtr dlsym(IntPtr handle, string symbol);
 
-			public IntPtr LoadPlatformSpecific(string dllToLoad) => dlopen(dllToLoad, RTLD_NOW);
 			public IntPtr GetProcAddr(IntPtr hModule, string procName)
 			{
 				dlerror();
 				var res = dlsym(hModule, procName);
 				var errPtr = dlerror();
-				if (errPtr != IntPtr.Zero) throw new InvalidOperationException($"error in dlsym: {Marshal.PtrToStringAnsi(errPtr)}");
+				if (errPtr != IntPtr.Zero) throw new InvalidOperationException($"error in {nameof(dlsym)}: {Marshal.PtrToStringAnsi(errPtr)}");
 				return res;
 			}
-			public int FreePlatformSpecific(IntPtr hModule) => dlclose(hModule);
+
+			public int FreeByPtr(IntPtr hModule) => dlclose(hModule);
+
+			public IntPtr? LoadOrNull(string dllToLoad)
+			{
+				var p = dlopen(dllToLoad, RTLD_NOW);
+				return p == IntPtr.Zero ? default(IntPtr?) : p;
+			}
+
+			public IntPtr LoadOrThrow(string dllToLoad)
+			{
+				var p = LoadOrNull(dllToLoad);
+				if (!p.HasValue) throw new InvalidOperationException($"got null pointer from {nameof(dlopen)}, error: {Marshal.PtrToStringAnsi(dlerror())}");
+				return p.Value;
+			}
 		}
 
 		private class WindowsLLManager : ILinkedLibManager
 		{
 			// comments reference extern functions removed from SevenZip.NativeMethods
 			[DllImport("kernel32.dll")]
+			private static extern bool FreeLibrary(IntPtr hModule); // return type was annotated MarshalAs(UnmanagedType.Bool)
+			[DllImport("kernel32.dll")]
 			private static extern uint GetLastError();
 			[DllImport("kernel32.dll")] // had BestFitMapping = false, ThrowOnUnmappableChar = true
-			private static extern IntPtr LoadLibrary(string dllToLoad); // param dllToLoad was annotated `[MarshalAs(UnmanagedType.LPStr)]`
-			[DllImport("kernel32.dll")] // had BestFitMapping = false, ThrowOnUnmappableChar = true
 			private static extern IntPtr GetProcAddress(IntPtr hModule, string procName); // param procName was annotated `[MarshalAs(UnmanagedType.LPStr)]`
-			[DllImport("kernel32.dll")]
-			private static extern bool FreeLibrary(IntPtr hModule); // return type was annotated MarshalAs(UnmanagedType.Bool)
+			[DllImport("kernel32.dll")] // had BestFitMapping = false, ThrowOnUnmappableChar = true
+			private static extern IntPtr LoadLibrary(string dllToLoad); // param dllToLoad was annotated `[MarshalAs(UnmanagedType.LPStr)]`
 
-			public IntPtr LoadPlatformSpecific(string dllToLoad)
+			public IntPtr GetProcAddr(IntPtr hModule, string procName) => GetProcAddress(hModule, procName);
+
+			public int FreeByPtr(IntPtr hModule) => FreeLibrary(hModule) ? 1 : 0;
+
+			public IntPtr? LoadOrNull(string dllToLoad)
 			{
 				var p = LoadLibrary(dllToLoad);
-				if (p == IntPtr.Zero) throw new InvalidOperationException($"got null pointer, error code {GetLastError()}");
-				return p;
+				return p == IntPtr.Zero ? default(IntPtr?) : p;
+			}
+
+			public IntPtr LoadOrThrow(string dllToLoad)
+			{
+				var p = LoadOrNull(dllToLoad);
+				if (!p.HasValue) throw new InvalidOperationException($"got null pointer from {nameof(LoadLibrary)}, error code: {GetLastError()}");
+				return p.Value;
 			}
-			public IntPtr GetProcAddr(IntPtr hModule, string procName) => GetProcAddress(hModule, procName);
-			public int FreePlatformSpecific(IntPtr hModule) => FreeLibrary(hModule) ? 1 : 0;
 		}
 
 		public enum DistinctOS : byte
@@ -96,7 +119,7 @@ namespace BizHawk.Common
 		/// <param name="args">POSIX <c>$*</c> (space-delimited)</param>
 		/// <param name="checkStdout">stdout is discarded if false</param>
 		/// <param name="checkStderr">stderr is discarded if false</param>
-		/// <remarks>OS is implicit and needs to be checked at callsite, returned <see cref="Process"/> has not been started</remarks>
+		/// <remarks>OS is implicit and needs to be checked at callsite. Returned <see cref="Process"/> has not been started.</remarks>
 		public static Process ConstructSubshell(string cmd, string args, bool checkStdout = true, bool checkStderr = false) =>
 			new Process {
 				StartInfo = new ProcessStartInfo {
diff --git a/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs b/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs
index 3e3414dac7..52df2946eb 100644
--- a/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs	
@@ -66,8 +66,7 @@ namespace BizHawk.Emulation.Common
 
 		public object GetService(Type t)
 		{
-			object service;
-			if (_services.TryGetValue(t, out service))
+			if (_services.TryGetValue(t, out var service))
 			{
 				return service;
 			}
@@ -86,12 +85,6 @@ namespace BizHawk.Emulation.Common
 			return _services.ContainsKey(t);
 		}
 
-		public IEnumerable<Type> AvailableServices
-		{
-			get
-			{
-				return _services.Select(d => d.Key);
-			}
-		}
+		public IEnumerable<Type> AvailableServices =>_services.Select(d => d.Key);
 	}
 }
diff --git a/BizHawk.Emulation.Common/Base Implementations/CodeDataLog.cs b/BizHawk.Emulation.Common/Base Implementations/CodeDataLog.cs
index 626354c7b7..b7051b3ab7 100644
--- a/BizHawk.Emulation.Common/Base Implementations/CodeDataLog.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/CodeDataLog.cs	
@@ -62,9 +62,9 @@ namespace BizHawk.Emulation.Common
 		/// <summary>
 		/// Whether the CDL is tracking a block with the given name
 		/// </summary>
-		public bool Has(string blockname)
+		public bool Has(string blockName)
 		{
-			return ContainsKey(blockname);
+			return ContainsKey(blockName);
 		}
 
 		/// <summary>
@@ -121,17 +121,17 @@ namespace BizHawk.Emulation.Common
 
 			foreach (var kvp in other)
 			{
-				byte[] fromdata = kvp.Value;
-				byte[] todata = this[kvp.Key];
+				byte[] fromData = kvp.Value;
+				byte[] toData = this[kvp.Key];
 
-				if (fromdata.Length != todata.Length)
+				if (fromData.Length != toData.Length)
 				{
 					throw new InvalidDataException("Memory regions must be the same size!");
 				}
 
-				for (int i = 0; i < todata.Length; i++)
+				for (int i = 0; i < toData.Length; i++)
 				{
-					todata[i] |= fromdata[i];
+					toData[i] |= fromData[i];
 				}
 			}
 		}
@@ -201,7 +201,7 @@ namespace BizHawk.Emulation.Common
 			}
 			else
 			{
-				throw new InvalidDataException("File is not a Bizhawk CDL file!");
+				throw new InvalidDataException("File is not a BizHawk CDL file!");
 			}
 
 			int count = br.ReadInt32();
diff --git a/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs b/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs
index f6488b134a..00fd8c1ba0 100644
--- a/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs	
@@ -82,23 +82,23 @@ namespace BizHawk.Emulation.Common
 				{
 					case AxisConstraintType.Circular:
 						{
-							string xaxis = constraint.Params[0] as string;
-							string yaxis = constraint.Params[1] as string;
+							string xAxis = constraint.Params[0] as string ?? "";
+							string yAxis = constraint.Params[1] as string ?? "";
 							float range = (float)constraint.Params[2];
-							if (!floatButtons.ContainsKey(xaxis)) break;
-							if (!floatButtons.ContainsKey(yaxis)) break;
-							double xval = floatButtons[xaxis];
-							double yval = floatButtons[yaxis];
-							double length = Math.Sqrt((xval * xval) + (yval * yval));
+							if (!floatButtons.ContainsKey(xAxis)) break;
+							if (!floatButtons.ContainsKey(yAxis)) break;
+							double xVal = floatButtons[xAxis];
+							double yVal = floatButtons[yAxis];
+							double length = Math.Sqrt((xVal * xVal) + (yVal * yVal));
 							if (length > range)
 							{
 								double ratio = range / length;
-								xval *= ratio;
-								yval *= ratio;
+								xVal *= ratio;
+								yVal *= ratio;
 							}
 
-							floatButtons[xaxis] = (float)xval;
-							floatButtons[yaxis] = (float)yval;
+							floatButtons[xAxis] = (float)xVal;
+							floatButtons[yAxis] = (float)yVal;
 							break;
 						}
 				}
@@ -167,7 +167,7 @@ namespace BizHawk.Emulation.Common
 				List<string> list = new List<string>(FloatControls);
 				list.AddRange(BoolButtons);
 
-				// starts with console buttons, then each plasyer's buttons individually
+				// starts with console buttons, then each player's buttons individually
 				List<string>[] ret = new List<string>[PlayerCount + 1];
 				for (int i = 0; i < ret.Length; i++)
 				{
diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs
index 3b984eedde..b612eb6861 100644
--- a/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs	
@@ -70,11 +70,11 @@ namespace BizHawk.Emulation.Common
 
 		private static void Call(ObservableCollection<IMemoryCallback> cbs, uint addr, uint value, uint flags, string scope)
 		{
-			for (int i = 0; i < cbs.Count; i++)
+			foreach (var cb in cbs)
 			{
-				if (!cbs[i].Address.HasValue || (cbs[i].Scope == scope && cbs[i].Address == (addr & cbs[i].AddressMask)))
+				if (!cb.Address.HasValue || (cb.Scope == scope && cb.Address == (addr & cb.AddressMask)))
 				{
-					cbs[i].Callback(addr, value, flags);
+					cb.Callback(addr, value, flags);
 				}
 			}
 		}
@@ -134,17 +134,17 @@ namespace BizHawk.Emulation.Common
 
 		public bool HasReadsForScope(string scope)
 		{
-			return _reads.Where(e => e.Scope == scope).Any();
+			return _reads.Any(e => e.Scope == scope);
 		}
 
 		public bool HasWritesForScope(string scope)
 		{
-			return _writes.Where(e => e.Scope == scope).Any();
+			return _writes.Any(e => e.Scope == scope);
 		}
 
 		public bool HasExecutesForScope(string scope)
 		{
-			return _execs.Where(e => e.Scope == scope).Any();
+			return _execs.Any(e => e.Scope == scope);
 		}
 
 		private bool UpdateHasVariables()
diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs
index 6a80b62c62..d7f0f22453 100644
--- a/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs	
@@ -5,22 +5,13 @@ namespace BizHawk.Emulation.Common
 {
 	public class MemoryDomainDelegate : MemoryDomain
 	{
-		private Func<long, byte> _peek;
 		private Action<long, byte> _poke;
 
-		public Func<long, byte> Peek
-		{
-			get { return _peek; }
-			set { _peek = value; }
-		}
+		public Func<long, byte> Peek { get; set; }
 
 		public Action<long, byte> Poke
 		{
-			get
-			{
-				return _poke;
-			}
-
+			get => _poke;
 			set
 			{
 				_poke = value;
@@ -30,7 +21,7 @@ namespace BizHawk.Emulation.Common
 
 		public override byte PeekByte(long addr)
 		{
-			return _peek(addr);
+			return Peek(addr);
 		}
 
 		public override void PokeByte(long addr, byte val)
@@ -43,7 +34,7 @@ namespace BizHawk.Emulation.Common
 			Name = name;
 			EndianType = endian;
 			Size = size;
-			_peek = peek;
+			Peek = peek;
 			_poke = poke;
 			Writable = poke != null;
 			WordSize = wordSize;
@@ -56,11 +47,7 @@ namespace BizHawk.Emulation.Common
 
 		public byte[] Data
 		{
-			get
-			{
-				return _data;
-			}
-
+			get => _data;
 			set
 			{
 				_data = value;
diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryDomainList.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryDomainList.cs
index dfb67ec775..6def6abe23 100644
--- a/BizHawk.Emulation.Common/Base Implementations/MemoryDomainList.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/MemoryDomainList.cs	
@@ -24,13 +24,7 @@ namespace BizHawk.Emulation.Common
 		{
 		}
 
-		public MemoryDomain this[string name]
-		{
-			get
-			{
-				return this.FirstOrDefault(x => x.Name == name);
-			}
-		}
+		public MemoryDomain this[string name] => this.FirstOrDefault(x => x.Name == name);
 
 		public MemoryDomain MainMemory
 		{
@@ -44,24 +38,10 @@ namespace BizHawk.Emulation.Common
 				return this.First();
 			}
 
-			set
-			{
-				_mainMemory = value;
-			}
+			set => _mainMemory = value;
 		}
 
-		public bool HasSystemBus
-		{
-			get
-			{
-				if (_systemBus != null)
-				{
-					return true;
-				}
-
-				return this.Any(x => x.Name == "System Bus");
-			}
-		}
+		public bool HasSystemBus => _systemBus != null || this.Any(x => x.Name == "System Bus");
 
 		public MemoryDomain SystemBus
 		{
@@ -82,10 +62,7 @@ namespace BizHawk.Emulation.Common
 				return MainMemory;
 			}
 
-			set
-			{
-				_systemBus = value;
-			}
+			set => _systemBus = value;
 		}
 
 		/// <summary>
@@ -96,8 +73,7 @@ namespace BizHawk.Emulation.Common
 			var domains = this.ToDictionary(m => m.Name);
 			foreach (var src in other)
 			{
-				MemoryDomain dst;
-				if (domains.TryGetValue(src.Name, out dst))
+				if (domains.TryGetValue(src.Name, out var dst))
 				{
 					TryMerge<MemoryDomainByteArray>(dst, src, (d, s) => d.Data = s.Data);
 					TryMerge<MemoryDomainIntPtr>(dst, src, (d, s) => d.Data = s.Data);
diff --git a/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs b/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs
index 0983f9651c..3792f583f1 100644
--- a/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs	
@@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Common
 
 		public ControllerDefinition ControllerDefinition => NullController.Instance.Definition;
 
-		public bool FrameAdvance(IController controller, bool render, bool rendersound)
+		public bool FrameAdvance(IController controller, bool render, bool renderSound)
 		{
 			if (render == false)
 			{
@@ -249,7 +249,7 @@ namespace BizHawk.Emulation.Common
 			var ms = new MemoryStream();
 			gz.CopyTo(ms);
 			_data = ms.ToArray();
-			for (int i = 0; i < 3800; i++) // compenstate for sample start point
+			for (int i = 0; i < 3800; i++) // compensate for sample start point
 			{
 				Next();
 			}
diff --git a/BizHawk.Emulation.Common/Base Implementations/NullSound.cs b/BizHawk.Emulation.Common/Base Implementations/NullSound.cs
index 27afd57ecc..1598dd5d1f 100644
--- a/BizHawk.Emulation.Common/Base Implementations/NullSound.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/NullSound.cs	
@@ -27,7 +27,7 @@ namespace BizHawk.Emulation.Common
 			: this()
 		{
 			_spfNumerator = spf;
-			_spfDenominator = 1;	
+			_spfDenominator = 1;
 		}
 
 		/// <summary>
diff --git a/BizHawk.Emulation.Common/Base Implementations/TraceBuffer.cs b/BizHawk.Emulation.Common/Base Implementations/TraceBuffer.cs
index 75d64f56c9..3f288cdce6 100644
--- a/BizHawk.Emulation.Common/Base Implementations/TraceBuffer.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/TraceBuffer.cs	
@@ -6,12 +6,7 @@
 	/// <seealso cref="ITraceable" />
 	public class TraceBuffer : ITraceable
 	{
-		public TraceBuffer()
-		{
-			Header = "Instructions";
-		}
-
-		public string Header { get; set; }
+		public string Header { get; set; } = "Instructions";
 
 		public ITraceSink Sink { private get; set; }
 
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index 7287faab8b..5dfecb7cfa 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -38,6 +38,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj.DotSettings b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj.DotSettings
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/BizHawk.Emulation.Common/CoreAttribute.cs b/BizHawk.Emulation.Common/CoreAttribute.cs
index 5d6ddcc496..d0b7012fb7 100644
--- a/BizHawk.Emulation.Common/CoreAttribute.cs
+++ b/BizHawk.Emulation.Common/CoreAttribute.cs
@@ -23,12 +23,12 @@ namespace BizHawk.Emulation.Common
 			SingleInstance = singleInstance;
 		}
 
-		public string CoreName { get; private set; }
-		public string Author { get; private set; }
-		public bool Ported { get; private set; }
-		public bool Released { get; private set; }
-		public string PortedVersion { get; private set; }
-		public string PortedUrl { get; private set; }
-		public bool SingleInstance { get; private set; }
+		public string CoreName { get; }
+		public string Author { get; }
+		public bool Ported { get; }
+		public bool Released { get; }
+		public string PortedVersion { get; }
+		public string PortedUrl { get; }
+		public bool SingleInstance { get; }
 	}
 }
diff --git a/BizHawk.Emulation.Common/CoreComms.cs b/BizHawk.Emulation.Common/CoreComms.cs
index 04a124cd26..9259c6b479 100644
--- a/BizHawk.Emulation.Common/CoreComms.cs
+++ b/BizHawk.Emulation.Common/CoreComms.cs
@@ -36,16 +36,16 @@ namespace BizHawk.Emulation.Common
 		/// <summary>
 		/// Gets a message to show. reasonably annoying (dialog box), shouldn't be used most of the time
 		/// </summary>
-		public Action<string> ShowMessage { get; private set; }
+		public Action<string> ShowMessage { get; }
 
 		/// <summary>
 		/// Gets a message to show. less annoying (OSD message). Should be used for ignorable helpful messages
 		/// </summary>
-		public Action<string> Notify { get; private set; }
+		public Action<string> Notify { get; }
 
 		public Func<int, int, bool, object> RequestGLContext { get; set; }
 		public Action<object> ReleaseGLContext { get; set; }
 		public Action<object> ActivateGLContext { get; set; }
-		public Action DeactivateGLContext { get; set; } // this shouldnt be necessary.. frontend should be changing context before it does anything.. but for now..
+		public Action DeactivateGLContext { get; set; } // this shouldn't be necessary.. frontend should be changing context before it does anything.. but for now..
 	}
 }
diff --git a/BizHawk.Emulation.Common/DSKIdentifier.cs b/BizHawk.Emulation.Common/DSKIdentifier.cs
index b40c6ffdf5..6a3e85a0a6 100644
--- a/BizHawk.Emulation.Common/DSKIdentifier.cs
+++ b/BizHawk.Emulation.Common/DSKIdentifier.cs
@@ -1,421 +1,417 @@
-
-using System.Linq;
-using System.Text;
+using System.Text;
 
 namespace BizHawk.Emulation.Common
 {
-    /// <summary>
-    /// A slightly convoluted way of determining the required System based on a *.dsk file
-    /// This is here because (for probably good reason) there does not appear to be a route
-    /// to BizHawk.Emulation.Cores from Bizhawk.Emultion.Common
-    /// </summary>
-    public class DSKIdentifier
-    {
-        /// <summary>
-        /// Default fallthrough to AppleII
-        /// </summary>
-        public string IdentifiedSystem = "AppleII";
-        private string PossibleIdent = "";
+	/// <summary>
+	/// A slightly convoluted way of determining the required System based on a *.dsk file
+	/// This is here because (for probably good reason) there does not appear to be a route
+	/// to BizHawk.Emulation.Cores from BizHawk.Emulation.Common
+	/// </summary>
+	public class DSKIdentifier
+	{
+		/// <summary>
+		/// Default fallthrough to AppleII
+		/// </summary>
+		public string IdentifiedSystem = "AppleII";
+		private string PossibleIdent = "";
 
-        private byte[] data;
-        
-        // dsk header
-        public byte NumberOfTracks { get; set; }
-        public byte NumberOfSides { get; set; }
-        public int[] TrackSizes { get; set; }
+		private readonly byte[] data;
 
-        // state
-        public int CylinderCount;
-        public int SideCount;
-        public int BytesPerTrack;
+		// dsk header
+		public byte NumberOfTracks { get; set; }
+		public byte NumberOfSides { get; set; }
+		public int[] TrackSizes { get; set; }
 
-        public Track[] Tracks = null;
+		// state
+		public int CylinderCount;
+		public int SideCount;
+		public int BytesPerTrack;
 
-        public DSKIdentifier(byte[] imageData)
-        {
-            data = imageData;
-            ParseDskImage();
-        }
+		public Track[] Tracks = null;
 
-        private void ParseDskImage()
-        {
-            string ident = Encoding.ASCII.GetString(data, 0, 16).ToUpper();
-            if (ident.Contains("MV - CPC"))
-            {
-                ParseDSK();
-            }
-            else if (ident.Contains("EXTENDED CPC DSK"))
-            {
-                ParseEDSK();
-            }
-            else
-            {
-                // fall through
-                return;
-            }
+		public DSKIdentifier(byte[] imageData)
+		{
+			data = imageData;
+			ParseDskImage();
+		}
 
-            CalculateFormat();
-        }
+		private void ParseDskImage()
+		{
+			string ident = Encoding.ASCII.GetString(data, 0, 16).ToUpper();
+			if (ident.Contains("MV - CPC"))
+			{
+				ParseDSK();
+			}
+			else if (ident.Contains("EXTENDED CPC DSK"))
+			{
+				ParseEDSK();
+			}
+			else
+			{
+				// fall through
+				return;
+			}
 
-        private void CalculateFormat()
-        {
-            // uses some of the work done here: https://github.com/damieng/DiskImageManager
-            var trk = Tracks[0];
+			CalculateFormat();
+		}
 
-            // look for standard speccy bootstart
-            if (trk.Sectors[0].SectorData != null && trk.Sectors[0].SectorData.Length > 0)
-            {
-                if (trk.Sectors[0].SectorData[0] == 0 && trk.Sectors[0].SectorData[1] == 0
-                    && trk.Sectors[0].SectorData[2] == 40)
-                {
-                    PossibleIdent = "ZXSpectrum";
-                }
-            }
+		private void CalculateFormat()
+		{
+			// uses some of the work done here: https://github.com/damieng/DiskImageManager
+			var trk = Tracks[0];
 
-            // search for PLUS3DOS string
-            foreach (var t in Tracks)
-            {
-                foreach (var s in t.Sectors)
-                {
-                    if (s.SectorData == null || s.SectorData.Length == 0)
-                        continue;
+			// look for standard speccy bootstart
+			if (trk.Sectors[0].SectorData != null && trk.Sectors[0].SectorData.Length > 0)
+			{
+				if (trk.Sectors[0].SectorData[0] == 0 && trk.Sectors[0].SectorData[1] == 0
+					&& trk.Sectors[0].SectorData[2] == 40)
+				{
+					PossibleIdent = "ZXSpectrum";
+				}
+			}
 
-                    string str = Encoding.ASCII.GetString(s.SectorData, 0, s.SectorData.Length).ToUpper();
-                    if (str.Contains("PLUS3DOS"))
-                    {
-                        IdentifiedSystem = "ZXSpectrum";
-                        return;
-                    }
-                }
-            }
+			// search for PLUS3DOS string
+			foreach (var t in Tracks)
+			{
+				foreach (var s in t.Sectors)
+				{
+					if (s.SectorData == null || s.SectorData.Length == 0)
+						continue;
 
-            // check for bootable status
-            if (trk.Sectors[0].SectorData != null && trk.Sectors[0].SectorData.Length > 0)
-            {
-                int chksm = trk.Sectors[0].GetChecksum256();
+					string str = Encoding.ASCII.GetString(s.SectorData, 0, s.SectorData.Length).ToUpper();
+					if (str.Contains("PLUS3DOS"))
+					{
+						IdentifiedSystem = "ZXSpectrum";
+						return;
+					}
+				}
+			}
 
-                switch(chksm)
-                {
-                    case 3:
-                        IdentifiedSystem = "ZXSpectrum";
-                        return;
-                    case 1:
-                    case 255:
-                        // different Amstrad PCW boot records
-                        // just return CPC for now
-                        IdentifiedSystem = "AmstradCPC";
-                        return;
-                }
+			// check for bootable status
+			if (trk.Sectors[0].SectorData != null && trk.Sectors[0].SectorData.Length > 0)
+			{
+				int chksm = trk.Sectors[0].GetChecksum256();
 
-                switch(trk.GetLowestSectorID())
-                {
-                    case 65:
-                    case 193:
-                        IdentifiedSystem = "AmstradCPC";
-                        return;
-                }
-            }
+				switch (chksm)
+				{
+					case 3:
+						IdentifiedSystem = "ZXSpectrum";
+						return;
+					case 1:
+					case 255:
+						// different Amstrad PCW boot records
+						// just return CPC for now
+						IdentifiedSystem = "AmstradCPC";
+						return;
+				}
 
-            // at this point the disk is not standard bootable
-            // try format analysis
-            if (trk.Sectors.Length == 9 && trk.Sectors[0].SectorSize == 2)
-            {
-                switch(trk.GetLowestSectorID())
-                {
-                    case 1:
-                        switch(trk.Sectors[0].GetChecksum256())
-                        {
-                            case 3:
-                                IdentifiedSystem = "ZXSpectrum";
-                                return;
-                            case 1:
-                            case 255:
-                                // different Amstrad PCW checksums
-                                // just return CPC for now
-                                IdentifiedSystem = "AmstradCPC";
-                                return;
-                        }
-                        break;
-                    case 65:
-                    case 193:
-                        IdentifiedSystem = "AmstradCPC";
-                        return;
-                }
-            }
+				switch (trk.GetLowestSectorID())
+				{
+					case 65:
+					case 193:
+						IdentifiedSystem = "AmstradCPC";
+						return;
+				}
+			}
 
-            // could be an odd format disk
-            switch (trk.GetLowestSectorID())
-            {
-                case 1:
-                    if (trk.Sectors.Length == 8)
-                    {
-                        // CPC IBM
-                        IdentifiedSystem = "AmstradCPC";
-                        return;
-                    }
-                    break;
-                case 65:
-                case 193:
-                    // possible CPC custom
-                    PossibleIdent = "AmstradCPC";
-                    break; 
-            }
+			// at this point the disk is not standard bootable
+			// try format analysis
+			if (trk.Sectors.Length == 9 && trk.Sectors[0].SectorSize == 2)
+			{
+				switch (trk.GetLowestSectorID())
+				{
+					case 1:
+						switch (trk.Sectors[0].GetChecksum256())
+						{
+							case 3:
+								IdentifiedSystem = "ZXSpectrum";
+								return;
+							case 1:
+							case 255:
+								// different Amstrad PCW checksums
+								// just return CPC for now
+								IdentifiedSystem = "AmstradCPC";
+								return;
+						}
+						break;
+					case 65:
+					case 193:
+						IdentifiedSystem = "AmstradCPC";
+						return;
+				}
+			}
 
-            // other custom ZX Spectrum formats
-            if (NumberOfSides == 1 && trk.Sectors.Length == 10)
-            {
-                if (trk.Sectors[0].SectorData.Length > 10)
-                {
-                    if (trk.Sectors[0].SectorData[2] == 42 && trk.Sectors[0].SectorData[8] == 12)
-                    {
-                        switch (trk.Sectors[0].SectorData[5])
-                        {
-                            case 0:
-                                if (trk.Sectors[1].SectorID == 8)
-                                {
-                                    switch (Tracks[1].Sectors[0].SectorID)
-                                    {
-                                        case 7:
-                                            IdentifiedSystem = "ZXSpectrum";
-                                            return;
-                                        default:
-                                            PossibleIdent = "ZXSpectrum";
-                                            break;
-                                    }
-                                }
-                                else
-                                {
-                                    PossibleIdent = "ZXSpectrum";
-                                }
-                                break;
-                            case 1:
-                                if (trk.Sectors[1].SectorID == 8)
-                                {
-                                    switch (Tracks[1].Sectors[0].SectorID)
-                                    {
-                                        case 7:
-                                        case 1:
-                                            IdentifiedSystem = "ZXSpectrum";
-                                            return;
-                                    }
-                                }
-                                else
-                                {
-                                    PossibleIdent = "ZXSpectrum";
-                                }
-                                break;
-                        }
-                    }
+			// could be an odd format disk
+			switch (trk.GetLowestSectorID())
+			{
+				case 1:
+					if (trk.Sectors.Length == 8)
+					{
+						// CPC IBM
+						IdentifiedSystem = "AmstradCPC";
+						return;
+					}
+					break;
+				case 65:
+				case 193:
+					// possible CPC custom
+					PossibleIdent = "AmstradCPC";
+					break;
+			}
 
-                    if (trk.Sectors[0].SectorData[7] == 3 &&
-                        trk.Sectors[0].SectorData[9] == 23 &&
-                        trk.Sectors[0].SectorData[2] == 40)
-                    {
-                        IdentifiedSystem = "ZXSpectrum";
-                        return;
-                    }
-                }
-            }
+			// other custom ZX Spectrum formats
+			if (NumberOfSides == 1 && trk.Sectors.Length == 10)
+			{
+				if (trk.Sectors[0].SectorData.Length > 10)
+				{
+					if (trk.Sectors[0].SectorData[2] == 42 && trk.Sectors[0].SectorData[8] == 12)
+					{
+						switch (trk.Sectors[0].SectorData[5])
+						{
+							case 0:
+								if (trk.Sectors[1].SectorID == 8)
+								{
+									switch (Tracks[1].Sectors[0].SectorID)
+									{
+										case 7:
+											IdentifiedSystem = "ZXSpectrum";
+											return;
+										default:
+											PossibleIdent = "ZXSpectrum";
+											break;
+									}
+								}
+								else
+								{
+									PossibleIdent = "ZXSpectrum";
+								}
+								break;
+							case 1:
+								if (trk.Sectors[1].SectorID == 8)
+								{
+									switch (Tracks[1].Sectors[0].SectorID)
+									{
+										case 7:
+										case 1:
+											IdentifiedSystem = "ZXSpectrum";
+											return;
+									}
+								}
+								else
+								{
+									PossibleIdent = "ZXSpectrum";
+								}
+								break;
+						}
+					}
 
-            // last chance. use the possible value
-            if (IdentifiedSystem == "AppleII" && PossibleIdent != "")
-            {
-                IdentifiedSystem = "ZXSpectrum";
-            }
-        }
+					if (trk.Sectors[0].SectorData[7] == 3 &&
+						trk.Sectors[0].SectorData[9] == 23 &&
+						trk.Sectors[0].SectorData[2] == 40)
+					{
+						IdentifiedSystem = "ZXSpectrum";
+						return;
+					}
+				}
+			}
 
-        private void ParseDSK()
-        {
-            NumberOfTracks = data[0x30];
-            NumberOfSides = data[0x31];
-            TrackSizes = new int[NumberOfTracks * NumberOfSides];
-            Tracks = new Track[NumberOfTracks * NumberOfSides];
-            int pos = 0x32;
-            for (int i = 0; i < NumberOfTracks * NumberOfSides; i++)
-            {
-                TrackSizes[i] = (ushort)(data[pos] | data[pos + 1] << 8);
-            }
-            pos = 0x100;
-            for (int i = 0; i < NumberOfTracks * NumberOfSides; i++)
-            {
-                if (TrackSizes[i] == 0)
-                {
-                    Tracks[i] = new Track();
-                    Tracks[i].Sectors = new Sector[0];
-                    continue;
-                }
-                int p = pos;
-                Tracks[i] = new Track();
-                Tracks[i].TrackIdent = Encoding.ASCII.GetString(data, p, 12);
-                p += 16;
-                Tracks[i].TrackNumber = data[p++];
-                Tracks[i].SideNumber = data[p++];
-                p += 2;
-                Tracks[i].SectorSize = data[p++];
-                Tracks[i].NumberOfSectors = data[p++];
-                Tracks[i].GAP3Length = data[p++];
-                Tracks[i].FillerByte = data[p++];
-                int dpos = pos + 0x100;
-                Tracks[i].Sectors = new Sector[Tracks[i].NumberOfSectors];
-                for (int s = 0; s < Tracks[i].NumberOfSectors; s++)
-                {
-                    Tracks[i].Sectors[s] = new Sector();
+			// last chance. use the possible value
+			if (IdentifiedSystem == "AppleII" && PossibleIdent != "")
+			{
+				IdentifiedSystem = "ZXSpectrum";
+			}
+		}
 
-                    Tracks[i].Sectors[s].TrackNumber = data[p++];
-                    Tracks[i].Sectors[s].SideNumber = data[p++];
-                    Tracks[i].Sectors[s].SectorID = data[p++];
-                    Tracks[i].Sectors[s].SectorSize = data[p++];
-                    Tracks[i].Sectors[s].Status1 = data[p++];
-                    Tracks[i].Sectors[s].Status2 = data[p++];
-                    Tracks[i].Sectors[s].ActualDataByteLength = (ushort)(data[p] | data[p + 1] << 8);
-                    p += 2;
-                    if (Tracks[i].Sectors[s].SectorSize == 0)
-                    {
-                        Tracks[i].Sectors[s].ActualDataByteLength = TrackSizes[i];
-                    }
-                    else if (Tracks[i].Sectors[s].SectorSize > 6)
-                    {
-                        Tracks[i].Sectors[s].ActualDataByteLength = TrackSizes[i];
-                    }
-                    else if (Tracks[i].Sectors[s].SectorSize == 6)
-                    {
-                        Tracks[i].Sectors[s].ActualDataByteLength = 0x1800;
-                    }
-                    else
-                    {
-                        Tracks[i].Sectors[s].ActualDataByteLength = 0x80 << Tracks[i].Sectors[s].SectorSize;
-                    }
-                    Tracks[i].Sectors[s].SectorData = new byte[Tracks[i].Sectors[s].ActualDataByteLength];
-                    for (int b = 0; b < Tracks[i].Sectors[s].ActualDataByteLength; b++)
-                    {
-                        Tracks[i].Sectors[s].SectorData[b] = data[dpos + b];
-                    }
-                    dpos += Tracks[i].Sectors[s].ActualDataByteLength;
-                }
-                pos += TrackSizes[i];
-            }
-        }
+		private void ParseDSK()
+		{
+			NumberOfTracks = data[0x30];
+			NumberOfSides = data[0x31];
+			TrackSizes = new int[NumberOfTracks * NumberOfSides];
+			Tracks = new Track[NumberOfTracks * NumberOfSides];
+			int pos = 0x32;
+			for (int i = 0; i < NumberOfTracks * NumberOfSides; i++)
+			{
+				TrackSizes[i] = (ushort)(data[pos] | data[pos + 1] << 8);
+			}
+			pos = 0x100;
+			for (int i = 0; i < NumberOfTracks * NumberOfSides; i++)
+			{
+				if (TrackSizes[i] == 0)
+				{
+					Tracks[i] = new Track();
+					Tracks[i].Sectors = new Sector[0];
+					continue;
+				}
+				int p = pos;
+				Tracks[i] = new Track();
+				Tracks[i].TrackIdent = Encoding.ASCII.GetString(data, p, 12);
+				p += 16;
+				Tracks[i].TrackNumber = data[p++];
+				Tracks[i].SideNumber = data[p++];
+				p += 2;
+				Tracks[i].SectorSize = data[p++];
+				Tracks[i].NumberOfSectors = data[p++];
+				Tracks[i].GAP3Length = data[p++];
+				Tracks[i].FillerByte = data[p++];
+				int dpos = pos + 0x100;
+				Tracks[i].Sectors = new Sector[Tracks[i].NumberOfSectors];
+				for (int s = 0; s < Tracks[i].NumberOfSectors; s++)
+				{
+					Tracks[i].Sectors[s] = new Sector();
 
-        private void ParseEDSK()
-        {
-            NumberOfTracks = data[0x30];
-            NumberOfSides = data[0x31];
-            TrackSizes = new int[NumberOfTracks * NumberOfSides];
-            Tracks = new Track[NumberOfTracks * NumberOfSides];
-            int pos = 0x34;
-            for (int i = 0; i < NumberOfTracks * NumberOfSides; i++)
-            {
-                TrackSizes[i] = data[pos++] * 256;
-            }
-            pos = 0x100;
-            for (int i = 0; i < NumberOfTracks * NumberOfSides; i++)
-            {
-                if (TrackSizes[i] == 0)
-                {
-                    Tracks[i] = new Track();
-                    Tracks[i].Sectors = new Sector[0];
-                    continue;
-                }
-                int p = pos;
-                Tracks[i] = new Track();
-                Tracks[i].TrackIdent = Encoding.ASCII.GetString(data, p, 12);
-                p += 16;
-                Tracks[i].TrackNumber = data[p++];
-                Tracks[i].SideNumber = data[p++];
-                Tracks[i].DataRate = data[p++];
-                Tracks[i].RecordingMode = data[p++];
-                Tracks[i].SectorSize = data[p++];
-                Tracks[i].NumberOfSectors = data[p++];
-                Tracks[i].GAP3Length = data[p++];
-                Tracks[i].FillerByte = data[p++];
-                int dpos = pos + 0x100;
-                Tracks[i].Sectors = new Sector[Tracks[i].NumberOfSectors];
-                for (int s = 0; s < Tracks[i].NumberOfSectors; s++)
-                {
-                    Tracks[i].Sectors[s] = new Sector();
+					Tracks[i].Sectors[s].TrackNumber = data[p++];
+					Tracks[i].Sectors[s].SideNumber = data[p++];
+					Tracks[i].Sectors[s].SectorID = data[p++];
+					Tracks[i].Sectors[s].SectorSize = data[p++];
+					Tracks[i].Sectors[s].Status1 = data[p++];
+					Tracks[i].Sectors[s].Status2 = data[p++];
+					Tracks[i].Sectors[s].ActualDataByteLength = (ushort)(data[p] | data[p + 1] << 8);
+					p += 2;
+					if (Tracks[i].Sectors[s].SectorSize == 0)
+					{
+						Tracks[i].Sectors[s].ActualDataByteLength = TrackSizes[i];
+					}
+					else if (Tracks[i].Sectors[s].SectorSize > 6)
+					{
+						Tracks[i].Sectors[s].ActualDataByteLength = TrackSizes[i];
+					}
+					else if (Tracks[i].Sectors[s].SectorSize == 6)
+					{
+						Tracks[i].Sectors[s].ActualDataByteLength = 0x1800;
+					}
+					else
+					{
+						Tracks[i].Sectors[s].ActualDataByteLength = 0x80 << Tracks[i].Sectors[s].SectorSize;
+					}
+					Tracks[i].Sectors[s].SectorData = new byte[Tracks[i].Sectors[s].ActualDataByteLength];
+					for (int b = 0; b < Tracks[i].Sectors[s].ActualDataByteLength; b++)
+					{
+						Tracks[i].Sectors[s].SectorData[b] = data[dpos + b];
+					}
+					dpos += Tracks[i].Sectors[s].ActualDataByteLength;
+				}
+				pos += TrackSizes[i];
+			}
+		}
 
-                    Tracks[i].Sectors[s].TrackNumber = data[p++];
-                    Tracks[i].Sectors[s].SideNumber = data[p++];
-                    Tracks[i].Sectors[s].SectorID = data[p++];
-                    Tracks[i].Sectors[s].SectorSize = data[p++];
-                    Tracks[i].Sectors[s].Status1 = data[p++];
-                    Tracks[i].Sectors[s].Status2 = data[p++];
-                    Tracks[i].Sectors[s].ActualDataByteLength = (ushort)(data[p] | data[p + 1] << 8);
-                    p += 2;
-                    Tracks[i].Sectors[s].SectorData = new byte[Tracks[i].Sectors[s].ActualDataByteLength];
-                    for (int b = 0; b < Tracks[i].Sectors[s].ActualDataByteLength; b++)
-                    {
-                        Tracks[i].Sectors[s].SectorData[b] = data[dpos + b];
-                    }
-                    if (Tracks[i].Sectors[s].SectorSize <= 7)
-                    {
-                        int specifiedSize = 0x80 << Tracks[i].Sectors[s].SectorSize;
-                        if (specifiedSize < Tracks[i].Sectors[s].ActualDataByteLength)
-                        {
-                            if (Tracks[i].Sectors[s].ActualDataByteLength % specifiedSize != 0)
-                            {
-                                Tracks[i].Sectors[s].ContainsMultipleWeakSectors = true;
-                            }
-                        }
-                    }
-                    dpos += Tracks[i].Sectors[s].ActualDataByteLength;
-                }
-                pos += TrackSizes[i];
-            }
-        }
+		private void ParseEDSK()
+		{
+			NumberOfTracks = data[0x30];
+			NumberOfSides = data[0x31];
+			TrackSizes = new int[NumberOfTracks * NumberOfSides];
+			Tracks = new Track[NumberOfTracks * NumberOfSides];
+			int pos = 0x34;
+			for (int i = 0; i < NumberOfTracks * NumberOfSides; i++)
+			{
+				TrackSizes[i] = data[pos++] * 256;
+			}
+			pos = 0x100;
+			for (int i = 0; i < NumberOfTracks * NumberOfSides; i++)
+			{
+				if (TrackSizes[i] == 0)
+				{
+					Tracks[i] = new Track();
+					Tracks[i].Sectors = new Sector[0];
+					continue;
+				}
+				int p = pos;
+				Tracks[i] = new Track();
+				Tracks[i].TrackIdent = Encoding.ASCII.GetString(data, p, 12);
+				p += 16;
+				Tracks[i].TrackNumber = data[p++];
+				Tracks[i].SideNumber = data[p++];
+				Tracks[i].DataRate = data[p++];
+				Tracks[i].RecordingMode = data[p++];
+				Tracks[i].SectorSize = data[p++];
+				Tracks[i].NumberOfSectors = data[p++];
+				Tracks[i].GAP3Length = data[p++];
+				Tracks[i].FillerByte = data[p++];
+				int dpos = pos + 0x100;
+				Tracks[i].Sectors = new Sector[Tracks[i].NumberOfSectors];
+				for (int s = 0; s < Tracks[i].NumberOfSectors; s++)
+				{
+					Tracks[i].Sectors[s] = new Sector();
 
-        #region Internal Classes
+					Tracks[i].Sectors[s].TrackNumber = data[p++];
+					Tracks[i].Sectors[s].SideNumber = data[p++];
+					Tracks[i].Sectors[s].SectorID = data[p++];
+					Tracks[i].Sectors[s].SectorSize = data[p++];
+					Tracks[i].Sectors[s].Status1 = data[p++];
+					Tracks[i].Sectors[s].Status2 = data[p++];
+					Tracks[i].Sectors[s].ActualDataByteLength = (ushort)(data[p] | data[p + 1] << 8);
+					p += 2;
+					Tracks[i].Sectors[s].SectorData = new byte[Tracks[i].Sectors[s].ActualDataByteLength];
+					for (int b = 0; b < Tracks[i].Sectors[s].ActualDataByteLength; b++)
+					{
+						Tracks[i].Sectors[s].SectorData[b] = data[dpos + b];
+					}
+					if (Tracks[i].Sectors[s].SectorSize <= 7)
+					{
+						int specifiedSize = 0x80 << Tracks[i].Sectors[s].SectorSize;
+						if (specifiedSize < Tracks[i].Sectors[s].ActualDataByteLength)
+						{
+							if (Tracks[i].Sectors[s].ActualDataByteLength % specifiedSize != 0)
+							{
+								Tracks[i].Sectors[s].ContainsMultipleWeakSectors = true;
+							}
+						}
+					}
+					dpos += Tracks[i].Sectors[s].ActualDataByteLength;
+				}
+				pos += TrackSizes[i];
+			}
+		}
 
-        public class Track
-        {
-            public string TrackIdent { get; set; }
-            public byte TrackNumber { get; set; }
-            public byte SideNumber { get; set; }
-            public byte DataRate { get; set; }
-            public byte RecordingMode { get; set; }
-            public byte SectorSize { get; set; }
-            public byte NumberOfSectors { get; set; }
-            public byte GAP3Length { get; set; }
-            public byte FillerByte { get; set; }
-            public Sector[] Sectors { get; set; }
+		#region Internal Classes
 
-            public byte GetLowestSectorID()
-            {
-                byte res = 0xFF;
-                foreach (var s in Sectors)
-                {
-                    if (s.SectorID < res)
-                        res = s.SectorID;
-                }
-                return res;
-            }
-        }
+		public class Track
+		{
+			public string TrackIdent { get; set; }
+			public byte TrackNumber { get; set; }
+			public byte SideNumber { get; set; }
+			public byte DataRate { get; set; }
+			public byte RecordingMode { get; set; }
+			public byte SectorSize { get; set; }
+			public byte NumberOfSectors { get; set; }
+			public byte GAP3Length { get; set; }
+			public byte FillerByte { get; set; }
+			public Sector[] Sectors { get; set; }
 
-        public class Sector
-        {
-            public byte TrackNumber { get; set; }
-            public byte SideNumber { get; set; }
-            public byte SectorID { get; set; }
-            public byte SectorSize { get; set; }
-            public byte Status1 { get; set; }
-            public byte Status2 { get; set; }
-            public int ActualDataByteLength { get; set; }
-            public byte[] SectorData { get; set; }
-            public bool ContainsMultipleWeakSectors { get; set; }
+			public byte GetLowestSectorID()
+			{
+				byte res = 0xFF;
+				foreach (var s in Sectors)
+				{
+					if (s.SectorID < res)
+						res = s.SectorID;
+				}
+				return res;
+			}
+		}
 
-            public int GetChecksum256()
-            {
-                int res = 0;
-                for (int i = 0; i < SectorData.Length; i++)
-                {
-                    res += SectorData[i] % 256;
-                }
-                return res;
-            }
-        }
+		public class Sector
+		{
+			public byte TrackNumber { get; set; }
+			public byte SideNumber { get; set; }
+			public byte SectorID { get; set; }
+			public byte SectorSize { get; set; }
+			public byte Status1 { get; set; }
+			public byte Status2 { get; set; }
+			public int ActualDataByteLength { get; set; }
+			public byte[] SectorData { get; set; }
+			public bool ContainsMultipleWeakSectors { get; set; }
 
-        #endregion
+			public int GetChecksum256()
+			{
+				int res = 0;
+				for (int i = 0; i < SectorData.Length; i++)
+				{
+					res += SectorData[i] % 256;
+				}
+				return res;
+			}
+		}
 
-
-    }
+		#endregion
+	}
 }
diff --git a/BizHawk.Emulation.Common/Database/Database.cs b/BizHawk.Emulation.Common/Database/Database.cs
index 7c714392c9..efdd513bb3 100644
--- a/BizHawk.Emulation.Common/Database/Database.cs
+++ b/BizHawk.Emulation.Common/Database/Database.cs
@@ -117,7 +117,7 @@ namespace BizHawk.Emulation.Common
 					var line = reader.ReadLine() ?? "";
 					try
 					{
-						if (line.StartsWith(";")) 
+						if (line.StartsWith(";"))
 						{
 							continue; // comment
 						}
@@ -140,7 +140,7 @@ namespace BizHawk.Emulation.Common
 							Hash = RemoveHashType(items[0].ToUpper())
 						};
 
-						// remove a hash type identifier. well don't really need them for indexing (theyre just there for human purposes)
+						// remove a hash type identifier. well don't really need them for indexing (they're just there for human purposes)
 						switch (items[1].Trim())
 						{
 							case "B":
@@ -238,8 +238,8 @@ namespace BizHawk.Emulation.Common
 					break;
 
 				case ".SFC":
-				case ".SMC": 
-					game.System = "SNES"; 
+				case ".SMC":
+					game.System = "SNES";
 					break;
 
 				case ".GB":
@@ -299,30 +299,30 @@ namespace BizHawk.Emulation.Common
 				case ".D64":
 				case ".T64":
 				case ".G64":
-				case ".CRT":				
+				case ".CRT":
 					game.System = "C64";
 					break;
 
-                case ".TZX":
-                case ".PZX":
-                case ".CSW":
-                case ".WAV":
-                    game.System = "ZXSpectrum";
-                    break;
+				case ".TZX":
+				case ".PZX":
+				case ".CSW":
+				case ".WAV":
+					game.System = "ZXSpectrum";
+					break;
 
-                case ".CDT":
-                    game.System = "AmstradCPC";
-                    break;
+				case ".CDT":
+					game.System = "AmstradCPC";
+					break;
 
-                case ".TAP":
-                    byte[] head = romData.Take(8).ToArray();
-                    if (System.Text.Encoding.Default.GetString(head).Contains("C64-TAPE"))
-                        game.System = "C64";
-                    else
-                        game.System = "ZXSpectrum";
-                    break;
+				case ".TAP":
+					byte[] head = romData.Take(8).ToArray();
+					if (System.Text.Encoding.Default.GetString(head).Contains("C64-TAPE"))
+						game.System = "C64";
+					else
+						game.System = "ZXSpectrum";
+					break;
 
-                case ".Z64":
+				case ".Z64":
 				case ".V64":
 				case ".N64":
 					game.System = "N64";
@@ -346,9 +346,9 @@ namespace BizHawk.Emulation.Common
 					break;
 
 				case ".DSK":
-                    var dId = new DSKIdentifier(romData);
-                    game.System = dId.IdentifiedSystem;
-                    break;                    
+					var dId = new DSKIdentifier(romData);
+					game.System = dId.IdentifiedSystem;
+					break;
 
 				case ".PO":
 				case ".DO":
@@ -371,6 +371,7 @@ namespace BizHawk.Emulation.Common
 				case ".UZE":
 					game.System = "UZE";
 					break;
+
 				case ".32X":
 					game.System = "32X";
 					game.AddOption("32X", "true");
@@ -380,6 +381,12 @@ namespace BizHawk.Emulation.Common
 					game.System = "VEC";
 					game.AddOption("VEC", "true");
 					break;
+
+				// refactor to use mame db (output of "mame -listxml" command)
+				// there's no good definition for Arcade anymore, so we might limit to coin-based machines?
+				case ".ZIP":
+					game.System = "Arcade";
+					break;
 			}
 
 			game.Name = Path.GetFileNameWithoutExtension(fileName)?.Replace('_', ' ');
diff --git a/BizHawk.Emulation.Common/EmulationExceptions.cs b/BizHawk.Emulation.Common/EmulationExceptions.cs
index e61d82bf38..585dafc742 100644
--- a/BizHawk.Emulation.Common/EmulationExceptions.cs
+++ b/BizHawk.Emulation.Common/EmulationExceptions.cs
@@ -20,19 +20,19 @@ namespace BizHawk.Emulation.Common
 		}
 	}
 
-    public class NoAvailableCoreException : Exception
-    {
-        public NoAvailableCoreException()
-            : base("System is currently NOT emulated")
-        {
-        }
+	public class NoAvailableCoreException : Exception
+	{
+		public NoAvailableCoreException()
+			: base("System is currently NOT emulated")
+		{
+		}
 
-        public NoAvailableCoreException(string message)
-            : base ($"System is currently NOT emulated: {message}")
-        {
+		public NoAvailableCoreException(string message)
+			: base($"System is currently NOT emulated: {message}")
+		{
 
-        }
-    }
+		}
+	}
 
 	public class CGBNotSupportedException : Exception
 	{
diff --git a/BizHawk.Emulation.Common/Enums.cs b/BizHawk.Emulation.Common/Enums.cs
index fe53ceeed3..152e303292 100644
--- a/BizHawk.Emulation.Common/Enums.cs
+++ b/BizHawk.Emulation.Common/Enums.cs
@@ -35,4 +35,16 @@
 		Overdump,
 		NotInDatabase
 	}
+
+	/// <summary>
+	/// The Advanced ROM Loader type in MainForm/RomLoader/OpenAdvancedChooser
+	/// </summary>
+	public enum AdvancedRomLoaderType
+	{
+		None,
+		LibretroLaunchNoGame,
+		LibretroLaunchGame,
+		ClassicLaunchGame,
+		MAMELaunchGame
+	}
 }
diff --git a/BizHawk.Emulation.Common/Extensions.cs b/BizHawk.Emulation.Common/Extensions.cs
index 75e9a5d69b..d732222a88 100644
--- a/BizHawk.Emulation.Common/Extensions.cs
+++ b/BizHawk.Emulation.Common/Extensions.cs
@@ -44,12 +44,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool HasSoundProvider(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<ISoundProvider>();
+			return core != null && core.ServiceProvider.HasService<ISoundProvider>();
 		}
 
 		public static ISoundProvider AsSoundProvider(this IEmulator core)
@@ -70,12 +65,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool HasMemoryDomains(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<IMemoryDomains>();
+			return core != null && core.ServiceProvider.HasService<IMemoryDomains>();
 		}
 
 		public static IMemoryDomains AsMemoryDomains(this IEmulator core)
@@ -85,12 +75,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool HasSaveRam(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<ISaveRam>();
+			return core != null && core.ServiceProvider.HasService<ISaveRam>();
 		}
 
 		public static ISaveRam AsSaveRam(this IEmulator core)
@@ -100,12 +85,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool HasSavestates(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<IStatable>();
+			return core != null && core.ServiceProvider.HasService<IStatable>();
 		}
 
 		public static IStatable AsStatable(this IEmulator core)
@@ -115,12 +95,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool CanPollInput(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<IInputPollable>();
+			return core != null && core.ServiceProvider.HasService<IInputPollable>();
 		}
 
 		public static IInputPollable AsInputPollable(this IEmulator core)
@@ -130,13 +105,8 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool InputCallbacksAvailable(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
 			// TODO: this is a pretty ugly way to handle this
-			var pollable = core.ServiceProvider.GetService<IInputPollable>();
+			var pollable = core?.ServiceProvider.GetService<IInputPollable>();
 			if (pollable != null)
 			{
 				try
@@ -155,12 +125,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool HasDriveLight(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<IDriveLight>();
+			return core != null && core.ServiceProvider.HasService<IDriveLight>();
 		}
 
 		public static IDriveLight AsDriveLight(this IEmulator core)
@@ -170,12 +135,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool CanDebug(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<IDebuggable>();
+			return core != null && core.ServiceProvider.HasService<IDebuggable>();
 		}
 
 		public static IDebuggable AsDebuggable(this IEmulator core)
@@ -185,12 +145,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool CpuTraceAvailable(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<ITraceable>();
+			return core != null && core.ServiceProvider.HasService<ITraceable>();
 		}
 
 		public static ITraceable AsTracer(this IEmulator core)
@@ -200,13 +155,8 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool MemoryCallbacksAvailable(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
 			// TODO: this is a pretty ugly way to handle this
-			var debuggable = (IDebuggable)core.ServiceProvider.GetService<IDebuggable>();
+			var debuggable = (IDebuggable) core?.ServiceProvider.GetService<IDebuggable>();
 			if (debuggable != null)
 			{
 				try
@@ -251,7 +201,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 			return core.ServiceProvider.HasService<IDisassemblable>();
 		}
 
-		public static IDisassemblable AsDissassembler(this IEmulator core)
+		public static IDisassemblable AsDisassembler(this IEmulator core)
 		{
 			return core.ServiceProvider.GetService<IDisassemblable>();
 		}
@@ -284,12 +234,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool CanCDLog(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<ICodeDataLogger>();
+			return core != null && core.ServiceProvider.HasService<ICodeDataLogger>();
 		}
 
 		public static ICodeDataLogger AsCodeDataLogger(this IEmulator core)
@@ -304,22 +249,12 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool UsesLinkCable(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<ILinkable>();
+			return core != null && core.ServiceProvider.HasService<ILinkable>();
 		}
 
 		public static bool CanGenerateGameDBEntries(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<ICreateGameDBEntries>();
+			return core != null && core.ServiceProvider.HasService<ICreateGameDBEntries>();
 		}
 
 		public static ICreateGameDBEntries AsGameDBEntryGenerator(this IEmulator core)
@@ -329,12 +264,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
 
 		public static bool HasBoardInfo(this IEmulator core)
 		{
-			if (core == null)
-			{
-				return false;
-			}
-
-			return core.ServiceProvider.HasService<IBoardInfo>();
+			return core != null && core.ServiceProvider.HasService<IBoardInfo>();
 		}
 
 		public static IBoardInfo AsBoardInfo(this IEmulator core)
diff --git a/BizHawk.Emulation.Common/Interfaces/Services/ICycleTiming.cs b/BizHawk.Emulation.Common/Interfaces/Services/ICycleTiming.cs
index 5fd648e9f7..9982216981 100644
--- a/BizHawk.Emulation.Common/Interfaces/Services/ICycleTiming.cs
+++ b/BizHawk.Emulation.Common/Interfaces/Services/ICycleTiming.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BizHawk.Emulation.Common
+namespace BizHawk.Emulation.Common
 {
 	public interface ICycleTiming
 	{
@@ -12,6 +6,7 @@ namespace BizHawk.Emulation.Common
 		/// Total elapsed emulation time relative to <see cref="ClockRate"/>
 		/// </summary>
 		long CycleCount { get; }
+
 		/// <summary>
 		/// Clock Rate in hz for <see cref="CycleCount"/>
 		/// </summary>
diff --git a/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs b/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs
index 977ff10ae8..748d93fe90 100644
--- a/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs
+++ b/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs
@@ -46,8 +46,8 @@ namespace BizHawk.Emulation.Common
 
 	public class RegisterValue
 	{
-		public ulong Value { get; private set; }
-		public byte BitSize { get; private set; }
+		public ulong Value { get; }
+		public byte BitSize { get; }
 
 		public RegisterValue(ulong val, byte bitSize)
 		{
diff --git a/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs b/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs
index a95ed0d625..378b7090e2 100644
--- a/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs
+++ b/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs
@@ -42,11 +42,7 @@ namespace BizHawk.Emulation.Common
 
 		public virtual string Cpu
 		{
-			get
-			{
-				return _cpu;
-			}
-
+			get => _cpu;
 			set
 			{
 				if (!AvailableCpus.Contains(value))
diff --git a/BizHawk.Emulation.Common/Interfaces/Services/ISaveRam.cs b/BizHawk.Emulation.Common/Interfaces/Services/ISaveRam.cs
index a1e7b1e2b9..0415e61bd5 100644
--- a/BizHawk.Emulation.Common/Interfaces/Services/ISaveRam.cs
+++ b/BizHawk.Emulation.Common/Interfaces/Services/ISaveRam.cs
@@ -22,9 +22,9 @@
 		/// <summary>
 		/// Gets a value indicating whether or not SaveRAM has been modified since the last save
 		/// TODO: This is not the best interface. What defines a "save"? I suppose a Clone(), right? at least specify that here.
-		/// Clone() should probably take an optionthat says whether to clear the dirty flag.
+		/// Clone() should probably take an option that says whether to clear the dirty flag.
 		/// And anyway, cores might not know if they can even track a functional dirty flag -- we should convey that fact somehow
-		/// (reminder: do that with flags, so we dont have to change the interface 10000 times)
+		/// (reminder: do that with flags, so we don't have to change the interface 10000 times)
 		/// Dirty SaveRAM can in principle be determined by the frontend in that case, but it could possibly be too slow for the file menu dropdown or other things
 		/// </summary>
 		bool SaveRamModified { get; }
diff --git a/BizHawk.Emulation.Common/Interfaces/Services/ISettable.cs b/BizHawk.Emulation.Common/Interfaces/Services/ISettable.cs
index fcfaa211dc..ec92488bf1 100644
--- a/BizHawk.Emulation.Common/Interfaces/Services/ISettable.cs
+++ b/BizHawk.Emulation.Common/Interfaces/Services/ISettable.cs
@@ -71,10 +71,10 @@ namespace BizHawk.Emulation.Common
 			else
 			{
 				var tt = impl.GetGenericArguments();
-				var settingtype = tt[0];
-				var synctype = tt[1];
-				HasSettings = settingtype != typeof(object); // object is used for a placeholder where an emu doesn't have both s and ss
-				HasSyncSettings = synctype != typeof(object);
+				var settingType = tt[0];
+				var syncType = tt[1];
+				HasSettings = settingType != typeof(object); // object is used for a placeholder where an emu doesn't have both s and ss
+				HasSyncSettings = syncType != typeof(object);
 
 				if (HasSettings)
 				{
diff --git a/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs b/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs
index 454bd38dfc..35d9fed2fb 100644
--- a/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs
+++ b/BizHawk.Emulation.Common/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/BizHawk.Emulation.Common/SaveController.cs b/BizHawk.Emulation.Common/SaveController.cs
index d54e99f62c..8db556f656 100644
--- a/BizHawk.Emulation.Common/SaveController.cs
+++ b/BizHawk.Emulation.Common/SaveController.cs
@@ -45,8 +45,8 @@ namespace BizHawk.Emulation.Common
 		public void DeSerialize(BinaryReader b)
 		{
 			_buttons.Clear();
-			int numbuttons = b.ReadInt32();
-			for (int i = 0; i < numbuttons; i++)
+			int numButtons = b.ReadInt32();
+			for (int i = 0; i < numButtons; i++)
 			{
 				string k = b.ReadString();
 				float v = b.ReadSingle();
diff --git a/BizHawk.Emulation.Common/ServiceAttributes.cs b/BizHawk.Emulation.Common/ServiceAttributes.cs
index 9d5fc2db9a..768539b0ae 100644
--- a/BizHawk.Emulation.Common/ServiceAttributes.cs
+++ b/BizHawk.Emulation.Common/ServiceAttributes.cs
@@ -25,9 +25,9 @@ namespace BizHawk.Emulation.Common
 	{
 		public ServiceNotApplicableAttribute(params Type[] types)
 		{
-			NotApplicableTypes = types?.ToList() ?? new List<Type>();
+			NotApplicableTypes = types?.AsEnumerable() ?? Enumerable.Empty<Type>();
 		}
 
-		public IEnumerable<Type> NotApplicableTypes { get; private set; }
+		public IEnumerable<Type> NotApplicableTypes { get; }
 	}
 }
diff --git a/BizHawk.Emulation.Common/ServiceInjector.cs b/BizHawk.Emulation.Common/ServiceInjector.cs
index 15ffb76f85..a80973a932 100644
--- a/BizHawk.Emulation.Common/ServiceInjector.cs
+++ b/BizHawk.Emulation.Common/ServiceInjector.cs
@@ -18,11 +18,11 @@ namespace BizHawk.Emulation.Common
 			Type targetType = target.GetType();
 			object[] tmp = new object[1];
 
-			foreach (var propinfo in
+			foreach (var propInfo in
 				targetType.GetPropertiesWithAttrib(typeof(RequiredServiceAttribute))
 				.Concat(targetType.GetPropertiesWithAttrib(typeof(OptionalServiceAttribute))))
 			{
-				propinfo.GetSetMethod(true).Invoke(target, tmp);
+				propInfo.GetSetMethod(true).Invoke(target, tmp);
 			}
 		}
 
@@ -35,21 +35,21 @@ namespace BizHawk.Emulation.Common
 			Type targetType = target.GetType();
 			object[] tmp = new object[1];
 
-			foreach (var propinfo in targetType.GetPropertiesWithAttrib(typeof(RequiredServiceAttribute)))
+			foreach (var propInfo in targetType.GetPropertiesWithAttrib(typeof(RequiredServiceAttribute)))
 			{
-				tmp[0] = source.GetService(propinfo.PropertyType);
+				tmp[0] = source.GetService(propInfo.PropertyType);
 				if (tmp[0] == null)
 				{
 					return false;
 				}
 
-				propinfo.GetSetMethod(true).Invoke(target, tmp);
+				propInfo.GetSetMethod(true).Invoke(target, tmp);
 			}
 
-			foreach (var propinfo in targetType.GetPropertiesWithAttrib(typeof(OptionalServiceAttribute)))
+			foreach (var propInfo in targetType.GetPropertiesWithAttrib(typeof(OptionalServiceAttribute)))
 			{
-				tmp[0] = source.GetService(propinfo.PropertyType);
-				propinfo.GetSetMethod(true).Invoke(target, tmp);
+				tmp[0] = source.GetService(propInfo.PropertyType);
+				propInfo.GetSetMethod(true).Invoke(target, tmp);
 			}
 
 			return true;
diff --git a/BizHawk.Emulation.Common/Sound/Utilities/DCFilter.cs b/BizHawk.Emulation.Common/Sound/Utilities/DCFilter.cs
index 19067916d7..0fb52e423a 100644
--- a/BizHawk.Emulation.Common/Sound/Utilities/DCFilter.cs
+++ b/BizHawk.Emulation.Common/Sound/Utilities/DCFilter.cs
@@ -15,44 +15,44 @@ namespace BizHawk.Emulation.Common
 		private int _accumL;
 		private int _accumR;
 
-		private static int DepthFromFilterwidth(int filterwidth)
+		private static int DepthFromFilterWidth(int filterWidth)
 		{
 			int ret = -2;
-			while (filterwidth > 0)
+			while (filterWidth > 0)
 			{
-				filterwidth >>= 1;
+				filterWidth >>= 1;
 				ret++;
 			}
 
 			return ret;
 		}
 
-		public DCFilter(ISoundProvider input, int filterwidth)
+		public DCFilter(ISoundProvider input, int filterWidth)
 		{
 			if (input == null)
 			{
 				throw new ArgumentNullException();
 			}
 
-			if (filterwidth < 8 || filterwidth > 65536)
+			if (filterWidth < 8 || filterWidth > 65536)
 			{
 				throw new ArgumentOutOfRangeException();
 			}
 
-			_depth = DepthFromFilterwidth(filterwidth);
+			_depth = DepthFromFilterWidth(filterWidth);
 
 			_soundProvider = input;
 		}
 
 		// Detached mode
-		public DCFilter(int filterwidth)
+		public DCFilter(int filterWidth)
 		{
-			if (filterwidth < 8 || filterwidth > 65536)
+			if (filterWidth < 8 || filterWidth > 65536)
 			{
 				throw new ArgumentOutOfRangeException();
 			}
 
-			_depth = DepthFromFilterwidth(filterwidth);
+			_depth = DepthFromFilterWidth(filterWidth);
 
 			_soundProvider = null;
 		}
@@ -67,12 +67,12 @@ namespace BizHawk.Emulation.Common
 			PushThroughSamples(samples, samples, length);
 		}
 
-		private void PushThroughSamples(short[] samplesin, short[] samplesout, int length)
+		private void PushThroughSamples(short[] samplesIn, short[] samplesOut, int length)
 		{
 			for (int i = 0; i < length; i += 2)
 			{
-				int l = samplesin[i] << 12;
-				int r = samplesin[i + 1] << 12;
+				int l = samplesIn[i] << 12;
+				int r = samplesIn[i + 1] << 12;
 				_accumL -= _accumL >> _depth;
 				_accumR -= _accumR >> _depth;
 				_accumL += l - _latchL;
@@ -86,28 +86,28 @@ namespace BizHawk.Emulation.Common
 				// check for clipping
 				if (bigL > 32767)
 				{
-					samplesout[i] = 32767;
+					samplesOut[i] = 32767;
 				}
 				else if (bigL < -32768)
 				{
-					samplesout[i] = -32768;
+					samplesOut[i] = -32768;
 				}
 				else
 				{
-					samplesout[i] = (short)bigL;
+					samplesOut[i] = (short)bigL;
 				}
 
 				if (bigR > 32767)
 				{
-					samplesout[i + 1] = 32767;
+					samplesOut[i + 1] = 32767;
 				}
 				else if (bigR < -32768)
 				{
-					samplesout[i + 1] = -32768;
+					samplesOut[i + 1] = -32768;
 				}
 				else
 				{
-					samplesout[i + 1] = (short)bigR;
+					samplesOut[i + 1] = (short)bigR;
 				}
 			}
 		}
@@ -125,15 +125,12 @@ namespace BizHawk.Emulation.Common
 
 		public void GetSamplesSync(out short[] samples, out int nsamp)
 		{
-			short[] sampin;
-			int nsampin;
+			_soundProvider.GetSamplesSync(out var sampIn, out var nsampIn);
 
-			_soundProvider.GetSamplesSync(out sampin, out nsampin);
-
-			short[] ret = new short[nsampin * 2];
-			PushThroughSamples(sampin, ret, nsampin * 2);
+			short[] ret = new short[nsampIn * 2];
+			PushThroughSamples(sampIn, ret, nsampIn * 2);
 			samples = ret;
-			nsamp = nsampin;
+			nsamp = nsampIn;
 		}
 
 		public SyncSoundMode SyncMode => _soundProvider.SyncMode;
diff --git a/BizHawk.Emulation.Common/Sound/Utilities/ISynchronizingAudioBuffer.cs b/BizHawk.Emulation.Common/Sound/Utilities/ISynchronizingAudioBuffer.cs
index 28558763d5..06f782f64f 100644
--- a/BizHawk.Emulation.Common/Sound/Utilities/ISynchronizingAudioBuffer.cs
+++ b/BizHawk.Emulation.Common/Sound/Utilities/ISynchronizingAudioBuffer.cs
@@ -75,8 +75,7 @@ namespace BizHawk.Emulation.Common
 					}
 
 					done++;
-					short left, right;
-					_adjustobuf.Dequeue(out left, out right);
+					_adjustobuf.Dequeue(out var left, out var right);
 					buf[ctr++] = left;
 					buf[ctr++] = right;
 				}
diff --git a/BizHawk.Emulation.Common/SystemLookup.cs b/BizHawk.Emulation.Common/SystemLookup.cs
index 88f7fe8e6c..929abce021 100644
--- a/BizHawk.Emulation.Common/SystemLookup.cs
+++ b/BizHawk.Emulation.Common/SystemLookup.cs
@@ -22,19 +22,19 @@ namespace BizHawk.Emulation.Common
 			new SystemInfo { SystemId = "PSX", FullName = "Playstation" },
 
 			new SystemInfo { SystemId = "SMS", FullName = "Sega Master System" },
-			new SystemInfo { SystemId = "GEN", FullName = "Sega Genesis/Megadrive" },
+			new SystemInfo { SystemId = "GEN", FullName = "Sega Genesis/Mega Drive" },
 			new SystemInfo { SystemId = "SAT", FullName = "Sega Saturn" },
 
 			new SystemInfo { SystemId = "PCE", FullName = "PC Engine/TurboGrafx 16" },
-			new SystemInfo { SystemId = "Coleco", FullName = "Colecovision" },
+			new SystemInfo { SystemId = "Coleco", FullName = "ColecoVision" },
 			new SystemInfo { SystemId = "TI83", FullName = "TI-83 Calculator" },
 			new SystemInfo { SystemId = "WSWAN", FullName = "WonderSwan" },
 
 			new SystemInfo { SystemId = "C64", FullName = "Commodore 64" },
 			new SystemInfo { SystemId = "AppleII", FullName = "Apple II" },
-			new SystemInfo { SystemId = "INTV", FullName = "Intellivision" },
-            new SystemInfo { SystemId = "ZXSpectrum", FullName = "Sinclair ZX Spectrum" },
-            new SystemInfo { SystemId = "AmstradCPC", FullName = "Amstrad CPC" },
+			new SystemInfo { SystemId = "INTV", FullName = "IntelliVision" },
+			new SystemInfo { SystemId = "ZXSpectrum", FullName = "Sinclair ZX Spectrum" },
+			new SystemInfo { SystemId = "AmstradCPC", FullName = "Amstrad CPC" },
 			new SystemInfo { SystemId = "ChannelF", FullName = "Fairchild Channel F"},
 		};
 
@@ -43,13 +43,7 @@ namespace BizHawk.Emulation.Common
 			get
 			{
 				var system = _systems.FirstOrDefault(s => s.SystemId == systemId);
-
-				if (system != null)
-				{
-					return system;
-				}
-
-				return new SystemInfo { SystemId = "Unknown", FullName = "Unknown" };
+				return system ?? new SystemInfo { SystemId = "Unknown", FullName = "Unknown" };
 			}
 		}
 
diff --git a/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs b/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs
new file mode 100644
index 0000000000..476ddf78ef
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace BizHawk.Emulation.Cores.Arcades.MAME
+{
+    public static class LibMAME
+    {
+        const string dll = "libmamearcade64.dll"; // libmamearcade64.dll libpacmansh64d.dll
+		const CallingConvention cc = CallingConvention.Cdecl;
+
+		public enum OutputChannel
+		{
+			ERROR, WARNING, INFO, DEBUG, VERBOSE, LOG, COUNT
+		};
+
+		// main launcher
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern UInt32 mame_launch(int argc, string[] argv);
+		
+		#region Lua API
+
+		// execute
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern void mame_lua_execute(string code);
+
+		// get int
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern int mame_lua_get_int(string code);
+
+		// get double
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern double mame_lua_get_double(string code);
+
+		// get bool
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern bool mame_lua_get_bool(string code);
+
+		// get string
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern IntPtr mame_lua_get_string(string code, out int length);
+
+		// free string
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern bool mame_lua_free_string(IntPtr pointer);
+
+		#endregion
+
+		#region Callbacks
+
+		// periodic
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		public delegate void PeriodicCallbackDelegate();
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern void mame_set_periodic_callback(PeriodicCallbackDelegate cb);
+
+		// sound
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		public delegate void SoundCallbackDelegate();
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern void mame_set_sound_callback(SoundCallbackDelegate cb);
+
+		// boot
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		public delegate void BootCallbackDelegate();
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern void mame_set_boot_callback(BootCallbackDelegate cb);
+
+		// log
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		public delegate void LogCallbackDelegate(OutputChannel channel, int size, string data);
+		[DllImport(dll, CallingConvention = cc)]
+		public static extern void mame_set_log_callback(LogCallbackDelegate cb);
+
+		#endregion
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
new file mode 100644
index 0000000000..5776c9f879
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
@@ -0,0 +1,484 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Diagnostics;
+
+using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Common.IEmulatorExtensions;
+
+namespace BizHawk.Emulation.Cores.Arcades.MAME
+{
+	[Core(
+		name: "MAME",
+		author: "MAMEDev",
+		isPorted: true,
+		portedVersion: "0.214",
+		portedUrl: "https://github.com/mamedev/mame.git",
+		singleInstance: false)]
+	public partial class MAME : IEmulator, IVideoProvider, ISoundProvider
+	{
+		public MAME(CoreComm comm, string dir, string file)
+		{
+			ServiceProvider = new BasicServiceProvider(this);
+
+			CoreComm = comm;
+			gameDirectory = dir;
+			gameFilename = file;
+			MAMEThread = new Thread(ExecuteMAMEThread);
+
+			AsyncLaunchMAME();
+		}
+
+		#region Properties
+
+		public CoreComm CoreComm { get; private set; }
+		public IEmulatorServiceProvider ServiceProvider { get; private set; }
+		public ControllerDefinition ControllerDefinition => MAMEController;
+		public string SystemId => "MAME";
+		public int[] GetVideoBuffer() => frameBuffer;
+		public bool DeterministicEmulation => true;
+		public bool CanProvideAsync => false;
+		public SyncSoundMode SyncMode => SyncSoundMode.Sync;
+		public int BackgroundColor => 0;
+		public int Frame { get; private set; }
+		public int VirtualWidth { get; private set; } = 320;
+		public int VirtualHeight { get; private set; } = 240;
+		public int BufferWidth { get; private set; } = 320;
+		public int BufferHeight { get; private set; } = 240;
+		public int VsyncNumerator { get; private set; } = 60;
+		public int VsyncDenominator { get; private set; } = 1;
+		private int samplesPerFrame => (int)Math.Round(sampleRate / this.VsyncRate());
+
+		#endregion
+
+		#region Fields
+
+		private Thread MAMEThread;
+		private ManualResetEvent MAMEStartupComplete = new ManualResetEvent(false);
+		private ManualResetEvent MAMEFrameComplete = new ManualResetEvent(false);
+		private SortedDictionary<string, string> fieldsPorts = new SortedDictionary<string, string>();
+		private IController Controller = NullController.Instance;
+		private int[] frameBuffer = new int[0];
+		private short[] audioBuffer = new short[0];
+		private Queue<short> audioSamples = new Queue<short>();
+		private int sampleRate = 44100;
+		private bool paused = true;
+		private bool exiting = false;
+		private bool frameDone = true;
+		private int numSamples = 0;
+		private string gameDirectory;
+		private string gameFilename;
+		private LibMAME.PeriodicCallbackDelegate periodicCallback;
+		private LibMAME.SoundCallbackDelegate soundCallback;
+		private LibMAME.BootCallbackDelegate bootCallback;
+		private LibMAME.LogCallbackDelegate logCallback;
+
+		#endregion
+
+		#region IEmulator
+
+		public bool FrameAdvance(IController controller, bool render, bool rendersound = true)
+		{
+			if (exiting)
+			{
+				return false;
+			}
+
+			Controller = controller;
+			paused = false;
+			frameDone = false;
+
+			for (; frameDone == false;)
+			{
+				MAMEFrameComplete.WaitOne();
+			}
+
+			Frame++;
+
+			return true;
+		}
+
+		public void ResetCounters()
+		{
+			Frame = 0;
+		}
+
+		public void Dispose()
+		{
+			exiting = true;
+			MAMEThread.Join();
+		}
+
+		#endregion
+
+		#region ISoundProvider
+
+		public void SetSyncMode(SyncSoundMode mode)
+		{
+			if (mode == SyncSoundMode.Async)
+			{
+				throw new NotSupportedException("Async mode is not supported.");
+			}
+		}
+
+		public void GetSamplesSync(out short[] samples, out int nsamp)
+		{
+			nsamp = samplesPerFrame;
+			samples = new short[samplesPerFrame * 2];
+
+			for (int i = 0; i < samplesPerFrame * 2; i++)
+			{
+				if (audioSamples.Any())
+				{
+					samples[i] = audioSamples.Dequeue();
+				}
+				else
+				{
+					samples[i] = 0;
+				}
+			}
+		}
+
+		public void GetSamplesAsync(short[] samples)
+		{
+			throw new InvalidOperationException("Async mode is not supported.");
+		}
+
+		public void DiscardSamples()
+		{
+			audioSamples.Clear();
+		}
+
+		#endregion
+
+		#region Launchers
+
+		private void AsyncLaunchMAME()
+		{
+			MAMEThread.Start();
+			MAMEStartupComplete.WaitOne();
+		}
+
+		private void ExecuteMAMEThread()
+		{
+			// dodge GC
+			periodicCallback = MAMEPeriodicCallback;
+			soundCallback = MAMESoundCallback;
+			bootCallback = MAMEBootCallback;
+			logCallback = MAMELogCallback;
+
+			LibMAME.mame_set_periodic_callback(periodicCallback);
+			LibMAME.mame_set_sound_callback(soundCallback);
+			LibMAME.mame_set_boot_callback(bootCallback);
+			LibMAME.mame_set_log_callback(logCallback);
+
+			// https://docs.mamedev.org/commandline/commandline-index.html
+			string[] args = new string[] {
+				 "mame"                                // dummy, internally discarded by index, so has to go first
+				, gameFilename                         // no dash for rom names
+				, "-noreadconfig"                      // forbid reading any config files
+				, "-norewind"                          // forbid rewind savestates (captured upon frame advance)
+				, "-skip_gameinfo"                     // forbid this blocking screen that requires user input
+				, "-nothrottle"                        // forbid throttling to "real" speed of the device
+				, "-update_in_pause"                   // ^ including frame-advancing
+				, "-rompath",            gameDirectory // mame doesn't load roms from full paths, only from dirs to scan
+				, "-volume",                     "-32" // lowest attenuation means mame osd remains silent
+				, "-output",                 "console" // print everyting to hawk console
+				, "-samplerate", sampleRate.ToString() // match hawk samplerate
+				, "-video",                     "none" // forbid mame window altogether
+				, "-keyboardprovider",          "none"
+				, "-mouseprovider",             "none"
+				, "-lightgunprovider",          "none"
+				, "-joystickprovider",          "none"
+			};
+
+			LibMAME.mame_launch(args.Length, args);
+		}
+
+		#endregion
+
+		#region Updaters
+
+		private void UpdateFramerate()
+		{
+			VsyncNumerator = 1000000000;
+			UInt64 refresh = (UInt64)LibMAME.mame_lua_get_double(MAMELuaCommand.GetRefresh);
+			VsyncDenominator = (int)(refresh / 1000000000);
+		}
+
+		private void UpdateAspect()
+		{
+			int x = (int)LibMAME.mame_lua_get_double(MAMELuaCommand.GetBoundX);
+			int y = (int)LibMAME.mame_lua_get_double(MAMELuaCommand.GetBoundY);
+			VirtualHeight = BufferWidth > BufferHeight * x / y
+				? BufferWidth * y / x
+				: BufferHeight;
+			VirtualWidth = VirtualHeight * x / y;
+		}
+
+		private void UpdateVideo()
+		{
+			BufferWidth = LibMAME.mame_lua_get_int(MAMELuaCommand.GetWidth);
+			BufferHeight = LibMAME.mame_lua_get_int(MAMELuaCommand.GetHeight);
+			int expectedSize = BufferWidth * BufferHeight;
+			int bytesPerPixel = 4;
+			int lengthInBytes;
+			IntPtr ptr = LibMAME.mame_lua_get_string(MAMELuaCommand.GetPixels, out lengthInBytes);
+
+			if (ptr == IntPtr.Zero)
+			{
+				Console.WriteLine("LibMAME ERROR: frame buffer pointer is null");
+				return;
+			}
+
+			if (expectedSize * bytesPerPixel != lengthInBytes)
+			{
+				Console.WriteLine(
+					"LibMAME ERROR: frame buffer has wrong size\n" +
+					$"width:    { BufferWidth                  } pixels\n" +
+					$"height:   { BufferHeight                 } pixels\n" +
+					$"expected: { expectedSize * bytesPerPixel } bytes\n" +
+					$"received: { lengthInBytes                } bytes\n");
+				return;
+			}
+
+			frameBuffer = new int[expectedSize];
+			Marshal.Copy(ptr, frameBuffer, 0, expectedSize);
+
+			if (!LibMAME.mame_lua_free_string(ptr))
+			{
+				Console.WriteLine("LibMAME ERROR: frame buffer wasn't freed");
+			}
+		}
+
+		private void UpdateInput()
+		{
+			foreach (var fieldPort in fieldsPorts)
+			{
+				LibMAME.mame_lua_execute(
+					"manager:machine():ioport()" +
+					$".ports  [\"{ fieldPort.Value }\"]" +
+					$".fields [\"{ fieldPort.Key   }\"]" +
+					$":set_value({ (Controller.IsPressed(fieldPort.Key) ? 1 : 0) })");
+			}
+		}
+
+		private void Update()
+		{
+			UpdateFramerate();
+			UpdateVideo();
+			UpdateAspect();
+			UpdateInput();
+		}
+
+		private void CheckVersions()
+		{
+			int lengthInBytes;
+			IntPtr ptr = LibMAME.mame_lua_get_string(MAMELuaCommand.GetVersion, out lengthInBytes);
+			string MAMEVersion = Marshal.PtrToStringAnsi(ptr, lengthInBytes);
+
+			if (!LibMAME.mame_lua_free_string(ptr))
+			{
+				Console.WriteLine("LibMAME ERROR: string buffer wasn't freed");
+			}
+
+			string version = this.Attributes().PortedVersion;
+			Debug.Assert(version == MAMEVersion,
+				"MAME versions desync!\n\n" +
+				$"MAME is { MAMEVersion }\n" +
+				$"MAMEHawk is { version }");
+		}
+
+		#endregion
+
+		#region Callbacks
+
+		/*
+		 * FrameAdvance() and MAME
+		 * 
+		 * MAME fires the periodic callback on every video and debugger update,
+		 * which happens every VBlank and also repeatedly at certain time
+		 * intervals while paused. Since MAME's luaengine runs in a separate
+		 * thread, it's only safe to update everything we need per frame during
+		 * this callback, when it's explicitly waiting for further lua commands.
+		 * 
+		 * If we disable throttling and pass -update_in_pause, there will be no
+		 * delay between video updates. This allows to run at full speed while
+		 * frame-stepping.
+		 * 
+		 * MAME only captures new frame data once per VBlank, while unpaused.
+		 * But it doesn't have an exclusive VBlank callback we could attach to.
+		 * It has a LUA_ON_FRAME_DONE callback, but that fires even more
+		 * frequently and updates all sorts of other non-video stuff, and we
+		 * need none of that here.
+		 * 
+		 * So we filter out all the calls that happen while paused (non-VBlank
+		 * updates). Then, when Hawk asks us to advance a frame, we virtually
+		 * unpause and declare the new frame unfinished. This informs MAME that
+		 * it should advance one frame internally. Hawk starts waiting for the
+		 * MAME thread to complete the request.
+		 * 
+		 * After MAME's done advancing, it fires the periodic callback again.
+		 * That's when we update everything and declare the new frame finished,
+		 * filtering out any further updates again. Then we allow Hawk to
+		 * complete frame-advancing.
+		 */
+		private void MAMEPeriodicCallback()
+		{
+			if (exiting)
+			{
+				LibMAME.mame_lua_execute(MAMELuaCommand.Exit);
+				exiting = false;
+			}
+
+			int MAMEFrame = LibMAME.mame_lua_get_int(MAMELuaCommand.GetFrameNumber);
+
+			if (!paused)
+			{
+				LibMAME.mame_lua_execute(MAMELuaCommand.Step);
+				frameDone = false;
+				paused = true;
+			}
+			else if (!frameDone)
+			{
+				Update();
+				frameDone = true;
+				MAMEFrameComplete.Set();
+			}
+		}
+
+		private void MAMESoundCallback()
+		{
+			int bytesPerSample = 2;
+			int lengthInBytes;
+			IntPtr ptr = LibMAME.mame_lua_get_string(MAMELuaCommand.GetSamples, out lengthInBytes);
+
+			if (ptr == IntPtr.Zero)
+			{
+				Console.WriteLine("LibMAME ERROR: audio buffer pointer is null");
+				return;
+			}
+
+			numSamples = lengthInBytes / bytesPerSample;
+
+			unsafe
+			{
+				short* pSample = (short*)ptr.ToPointer();
+				for (int i = 0; i < numSamples; i++)
+				{
+					audioSamples.Enqueue(*(pSample + i));
+				}
+			}
+
+			if (!LibMAME.mame_lua_free_string(ptr))
+			{
+				Console.WriteLine("LibMAME ERROR: audio buffer wasn't freed");
+			}
+		}
+
+		private void MAMEBootCallback()
+		{
+			LibMAME.mame_lua_execute(MAMELuaCommand.Pause);
+			CheckVersions();
+			GetInputFields();
+			Update();
+			MAMEStartupComplete.Set();
+		}
+		
+		private void MAMELogCallback(LibMAME.OutputChannel channel, int size, string data)
+		{
+			// mame sends osd_output_channel casted to int, we implicitly cast is back
+			if (!data.Contains("pause = "))
+			{
+				Console.WriteLine(
+					$"[MAME { channel.ToString() }] " +
+					$"{ data.Replace('\n', ' ') }");
+			}
+		}
+
+		#endregion
+
+		#region Input
+
+		public static ControllerDefinition MAMEController = new ControllerDefinition
+		{
+			Name = "MAME Controller",
+			BoolButtons = new List<string>()
+		};
+
+		private void GetInputFields()
+		{
+			int lengthInBytes;
+
+			IntPtr ptr = LibMAME.mame_lua_get_string(MAMELuaCommand.GetInputFields, out lengthInBytes);
+
+			if (ptr == IntPtr.Zero)
+			{
+				Console.WriteLine("LibMAME ERROR: string buffer pointer is null");
+				return;
+			}
+
+			string inputFields = Marshal.PtrToStringAnsi(ptr, lengthInBytes);
+			string[] portFields = inputFields.Split(';');
+			MAMEController.BoolButtons.Clear();
+
+			foreach (string portField in portFields)
+			{
+				if (portField != string.Empty)
+				{
+					string[] substrings = portField.Split(',');
+					string tag = substrings.First();
+					string field = substrings.Last();
+
+					fieldsPorts.Add(field, tag);
+					MAMEController.BoolButtons.Add(field);
+				}
+			}
+
+			if (!LibMAME.mame_lua_free_string(ptr))
+			{
+				Console.WriteLine("LibMAME ERROR: string buffer wasn't freed");
+			}
+		}
+
+		#endregion
+
+		#region Lua Commands
+
+		private class MAMELuaCommand
+		{
+			public const string Step = "emu.step()";
+			public const string Pause = "emu.pause()";
+			public const string Unpause = "emu.unpause()";
+			public const string Exit = "manager:machine():exit()";
+			public const string GetVersion = "return emu.app_version()";
+			public const string GetPixels = "return manager:machine():video():pixels()";
+			public const string GetSamples = "return manager:machine():sound():samples()";
+			public const string GetFrameNumber = "return select(2, next(manager:machine().screens)):frame_number()";
+			public const string GetRefresh = "return select(2, next(manager:machine().screens)):refresh_attoseconds()";
+			public const string GetWidth = "return (select(1, manager:machine():video():size()))";
+			public const string GetHeight = "return (select(2, manager:machine():video():size()))";
+			public const string GetBoundX =
+				"local x0,x1,y0,y1 = manager:machine():render():ui_target():view_bounds() " +
+				"return x1-x0";
+			public const string GetBoundY =
+				"local x0,x1,y0,y1 = manager:machine():render():ui_target():view_bounds() " +
+				"return y1-y0";
+			public const string GetInputFields =
+				"final = {} " +
+				"for tag, _ in pairs(manager:machine():ioport().ports) do " +
+					"for name, field in pairs(manager:machine():ioport().ports[tag].fields) do " +
+						"if field.type_class ~= \"dipswitch\" then " +
+							"table.insert(final, string.format(\"%s,%s;\", tag, name)) " +
+						"end " +
+					"end " +
+				"end " +
+				"table.sort(final) " +
+				"return table.concat(final)";
+		}
+
+		#endregion
+	}
+}
diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 80088fb826..157b849a24 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -32,6 +32,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +69,10 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\References\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\References\OpenTK.dll</HintPath>
+    </Reference>
     <Reference Include="PeNet">
       <HintPath>..\References\PeNet.dll</HintPath>
     </Reference>
@@ -98,6 +103,8 @@
     <Compile Include="..\Version\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Arcades\MAME\LibMAME.cs" />
+    <Compile Include="Arcades\MAME\MAME.cs" />
     <Compile Include="Calculator\TI83.IEmulator.cs">
       <DependentUpon>TI83.cs</DependentUpon>
     </Compile>
diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj.DotSettings b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj.DotSettings
index 6e05d923f6..c3052f1709 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj.DotSettings
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj.DotSettings
@@ -1,5 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String>
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StyleCop_002ESA1401/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 </wpf:ResourceDictionary>
 	
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/Disassembler.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/Disassembler.cs
new file mode 100644
index 0000000000..bd325ae77d
--- /dev/null
+++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/Disassembler.cs
@@ -0,0 +1,494 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BizHawk.Emulation.Common.Components.I8048
+{
+	public sealed partial class I8048
+	{
+		static string[] table =
+		{
+			"NEG   DP+i8", // 00
+			"???", // 01
+			"???", // 02
+			"COM   DP+i8", // 03
+			"LSR   DP+i8", // 04
+			"???", // 05
+			"ROR   DP+i8", // 06
+			"ASR   DP+i8", // 07
+			"ASL   DP+i8", // 08
+			"ROL   DP+i8", // 09
+			"DEC   DP+i8", // 0a
+			"???", // 0b
+			"INC   DP+i8", // 0c
+			"TST   DP+i8", // 0d
+			"JMP   DP+i8", // 0e
+			"CLR   DP+i8", // 0f
+			"PAGE 2", // 10
+			"PAGE 3", // 11
+			"NOP", // 12
+			"SYNC", // 13
+			"???", // 14
+			"???", // 15
+			"LBRA  i16", // 16
+			"LBSR  i16", // 17
+			"???", // 18
+			"DAA", // 19
+			"ORCC  i8", // 1a
+			"???", // 1b
+			"ANDCC i8", // 1c
+			"SEX", // 1d
+			"EXG   i8", // 1e
+			"TFR   i8", // 1f
+			"BRA   i8", // 20
+			"BRN   i8", // 21
+			"BHI   i8", // 22
+			"BLS   i8", // 23
+			"BHS   i8", // 24
+			"BLO   i8", // 25
+			"BNE   i8", // 26
+			"BEQ   i8", // 27
+			"BVC   i8", // 28
+			"BVS   i8", // 29
+			"BPL   i8", // 2a
+			"BMI   i8", // 2b
+			"BGE   i8", // 2c
+			"BLT   i8", // 2d
+			"BGT   i8", // 2e
+			"BLE   i8", // 2f
+			"LEAX  ix16", // 30
+			"LEAY  ix16", // 31
+			"LEAS  ix16", // 32
+			"LEAU  ix16", // 33
+			"PSHS  i8", // 34
+			"PULS  i8", // 35
+			"PSHU  i8", // 36
+			"PULU  i8", // 37
+			"???", // 38
+			"RTS", // 39
+			"ABX", // 3a
+			"RTI", // 3b
+			"CWAI  i8", // 3c
+			"MUL", // 3d
+			"???", // 3e
+			"SWI1", // 3f
+			"NEG   A", // 40
+			"???", // 41
+			"???", // 42
+			"COM   A", // 43
+			"LSR   A", // 44
+			"???", // 45
+			"ROR   A", // 46
+			"ASR   A", // 47
+			"ASL   A", // 48
+			"ROL   A", // 49
+			"DEC   A", // 4a
+			"???", // 4b
+			"INC   A", // 4c
+			"TST   A", // 4d
+			"???", // 4e
+			"CLR   A", // 4f
+			"NEG   B", // 50
+			"???", // 51
+			"???", // 52
+			"COM   B", // 53
+			"LSR   B", // 54
+			"???", // 55
+			"ROR   B", // 56
+			"ASR   B", // 57
+			"ASL   B", // 58
+			"ROL   B", // 59
+			"DEC   B", // 5a
+			"???", // 5b
+			"INC   B", // 5c
+			"TST   B", // 5d
+			"???", // 5e
+			"CLR   B", // 5f
+			"NEG   ix16", // 60
+			"???", // 61
+			"???", // 62
+			"COM   ix16", // 63
+			"LSR   ix16", // 64
+			"???", // 65
+			"ROR   ix16", // 66
+			"ASR   ix16", // 67
+			"ASL   ix16", // 68
+			"ROL   ix16", // 69
+			"DEC   ix16", // 6a
+			"???", // 6b
+			"INC   ix16", // 6c
+			"TST   ix16", // 6d
+			"JMP   ix16", // 6e
+			"CLR   ix16", // 6f
+			"NEG   ex16", // 70
+			"???", // 71
+			"???", // 72
+			"COM   ex16", // 73
+			"LSR   ex16", // 74
+			"???", // 75
+			"ROR   ex16", // 76
+			"ASR   ex16", // 77
+			"ASL   ex16", // 78
+			"ROL   ex16", // 79
+			"DEC   ex16", // 7a
+			"???", // 7b
+			"INC   ex16", // 7c
+			"TST   ex16", // 7d
+			"JMP   ex16", // 7e
+			"CLR   ex16", // 7f
+			"SUB   A,i8", // 80
+			"CMP   A,i8", // 81
+			"SBC   A,i8", // 82
+			"SUB   D,i16", // 83
+			"AND   A,i8", // 84
+			"BIT   A,i8", // 85
+			"LD    A,i8", // 86
+			"???", // 87
+			"EOR   A,i8", // 88
+			"ADC   A,i8", // 89
+			"OR    A,i8", // 8a
+			"ADD   A,i8", // 8b
+			"CMP   X,i16", // 8c
+			"BSR   i8", // 8d
+			"LD    X,i16", // 8e
+			"???", // 8f
+			"SUB   A,DP+i8", // 90
+			"CMP   A,DP+i8", // 91
+			"SBC   A,DP+i8", // 92
+			"SUB   D,DP+i8", // 93
+			"AND   A,DP+i8", // 94
+			"BIT   A,DP+i8", // 95
+			"LD    A,DP+i8", // 96
+			"ST    A,DP+i8", // 97
+			"EOR   A,DP+i8", // 98
+			"ADC   A,DP+i8", // 99
+			"OR    A,DP+i8", // 9a
+			"ADD   A,DP+i8", // 9b
+			"CMP   X,DP+i8", // 9c
+			"JSR   DP+i8", // 9d
+			"LD    X,DP+i8", // 9e
+			"ST    X,DP+i8", // 9f
+			"SUB   A,ix16", // a0
+			"CMP   A,ix16", // a1
+			"SBC   A,ix16", // a2
+			"SUB   D,ix16", // a3
+			"AND   A,ix16", // a4
+			"BIT   A,ix16", // a5
+			"LD    A,ix16", // a6
+			"ST    A,ix16", // a7
+			"EOR   A,ix16", // a8
+			"ADC   A,ix16", // a9
+			"OR    A,ix16", // aa
+			"ADD   A,ix16", // ab
+			"CMP   X,ix16", // ac
+			"JSR   ix16", // ad
+			"LD    X,ix16", // ae
+			"ST    X,ix16", // af
+			"SUB   A,ex16", // b0
+			"CMP   A,ex16", // b1
+			"SBC   A,ex16", // b2
+			"SUB   D,ex16", // b3
+			"AND   A,ex16", // b4
+			"BIT   A,ex16", // b5
+			"LD    A,ex16", // b6
+			"ST    A,ex16", // b7
+			"EOR   A,ex16", // b8
+			"ADC   A,ex16", // b9
+			"OR    A,ex16", // ba
+			"ADD   A,ex16", // bb
+			"CMP   X,ex16", // bc
+			"JSR   ex16", // bd
+			"LD    X,ex16", // be
+			"ST    X,ex16", // bf
+			"SUB   B,i8", // c0
+			"CMP   B,i8", // c1
+			"SBC   B,i8", // c2
+			"ADD   D,i16", // c3
+			"AND   B,i8", // c4
+			"BIT   B,i8", // c5
+			"LD    B,i8", // c6
+			"???", // c7
+			"EOR   B,i8", // c8
+			"ADC   B,i8", // c9
+			"OR    B,i8", // ca
+			"ADD   B,i8", // cb
+			"LD    D,i16", // cc
+			"???", // cd
+			"LD    U,i16", // ce
+			"???", // cf
+			"SUB   B,DP+i8", // d0
+			"CMP   B,DP+i8", // d1
+			"SBC   B,DP+i8", // d2
+			"ADD   D,DP+i8", // d3
+			"AND   B,DP+i8", // d4
+			"BIT   B,DP+i8", // d5
+			"LD    B,DP+i8", // d6
+			"ST    B,DP+i8", // d7
+			"EOR   B,DP+i8", // d8
+			"ADC   B,DP+i8", // d9
+			"OR    B,DP+i8", // da
+			"ADD   B,DP+i8", // db
+			"LD    D,DP+i8", // dc
+			"ST    D,DP+i8", // dd
+			"LD    U,DP+i8", // de
+			"ST    U,DP+i8", // df
+			"SUB   B,ix16", // e0
+			"CMP   B,ix16", // e1
+			"SBC   B,ix16", // e2
+			"ADD   D,ix16", // e3
+			"AND   B,ix16", // e4
+			"BIT   B,ix16", // e5
+			"LD    B,ix16", // e6
+			"ST    B,ix16", // e7
+			"EOR   B,ix16", // e8
+			"ADC   B,ix16", // e9
+			"OR    B,ix16", // ea
+			"ADD   B,ix16", // eb
+			"LD    D,ix16", // ec
+			"ST    D,ix16", // ed
+			"LD    U,ix16", // ee
+			"ST    U,ix16", // ef
+			"SUB   B,ex16", // f0
+			"CMP   B,ex16", // f1
+			"SBC   B,ex16", // f2
+			"ADD   D,ex16", // f3
+			"AND   B,ex16", // f4
+			"BIT   B,ex16", // f5
+			"LD    B,ex16", // f6
+			"ST    B,ex16", // f7
+			"EOR   B,ex16", // f8
+			"ADC   B,ex16", // f9
+			"OR    B,ex16", // fa
+			"ADD   B,ex16", // fb
+			"LD    D,ex16", // fc
+			"ST    D,ex16", // fd
+			"LD    U,ex16", // fe
+			"ST    U,ex16", // ff
+		};
+
+		public static string Disassemble(ushort addr, Func<ushort, byte> reader, out ushort size)
+		{
+			ushort origaddr = addr;
+			List<byte> bytes = new List<byte>();
+			bytes.Add(reader(addr++));
+
+			string result = table[bytes[0]];
+
+			if (result.Contains("i8"))
+			{
+				byte d = reader(addr++);
+				bytes.Add(d);
+				result = result.Replace("i8", string.Format("#{0:X2}h", d));
+			}
+			else if (result.Contains("i16"))
+			{
+				byte dhi = reader(addr++);
+				byte dlo = reader(addr++);
+				bytes.Add(dhi);
+				bytes.Add(dlo);
+				result = result.Replace("i16", string.Format("#{0:X2}{1:X2}h", dhi, dlo));
+			}
+			else if (result.Contains("ex16"))
+			{
+				byte dhi = reader(addr++);
+				byte dlo = reader(addr++);
+				bytes.Add(dhi);
+				bytes.Add(dlo);
+				result = result.Replace("ex16", "(" + string.Format("#{0:X2}{1:X2}h", dhi, dlo) + ")");
+			}
+			else if (result.Contains("ix16"))
+			{
+				byte d = reader(addr++);
+				bytes.Add(d);
+
+				string temp_reg = "";
+
+				switch ((d >> 5) & 3)
+				{
+					case 0: temp_reg = "X"; break;
+					case 1: temp_reg = "Y"; break;
+					case 2: temp_reg = "US"; break;
+					case 3: temp_reg = "SP"; break;
+				}
+
+				if ((d & 0x80) == 0)
+				{
+					short tempdis = (short)(d & 0x1F);
+					if (tempdis >= 16)
+						tempdis -= 32;
+
+					result = result.Replace("ix16", temp_reg + " + ea");
+					result = result.Replace("ea", string.Format("{0:N}h", tempdis));
+				}
+				else
+				{
+					if ((d & 0x10) == 0x10)
+					{
+						switch (d & 0xF)
+						{
+							case 0x0:
+								result = result.Replace("ix16", "???");
+								break;
+							case 0x1:
+								result = result.Replace("ix16","(" + temp_reg + ")++");
+								break;
+							case 0x2:
+								result = result.Replace("ix16", "???");
+								break;
+							case 0x3:
+								result = result.Replace("ix16", "--(" + temp_reg + ")");
+								break;
+							case 0x4:
+								result = result.Replace("ix16", "(" + temp_reg + ")");
+								break;
+							case 0x5:
+								result = result.Replace("ix16", "(" + temp_reg + " + B)");
+								break;
+							case 0x6:
+								result = result.Replace("ix16", "(" + temp_reg + " + A)");
+								break;
+							case 0x7:
+								result = result.Replace("ix16", "???");
+								break;
+							case 0x8:
+								byte e = reader(addr++);
+								bytes.Add(e);
+								result = result.Replace("ix16", "(" + temp_reg + " + ea)");
+								result = result.Replace("ea", string.Format("{0:X2}h", e));
+								break;
+							case 0x9:
+								byte f = reader(addr++);
+								bytes.Add(f);
+								byte g = reader(addr++);
+								bytes.Add(g);
+								result = result.Replace("ix16", "(" + temp_reg + " + ea)");
+								result = result.Replace("ea", string.Format("{0:X2}{1:X2}h", f, g));
+								break;
+							case 0xA:
+								result = result.Replace("ix16", "???");
+								break;
+							case 0xB:
+								result = result.Replace("ix16", "(" + temp_reg + " + D)");
+								break;
+							case 0xC:
+								temp_reg = "PC";
+								byte h = reader(addr++);
+								bytes.Add(h);
+								result = result.Replace("ix16", "(" + temp_reg + " + ea)");
+								result = result.Replace("ea", string.Format("{0:X2}h", h));
+								break;
+							case 0xD:
+								temp_reg = "PC";
+								byte i = reader(addr++);
+								bytes.Add(i);
+								byte j = reader(addr++);
+								bytes.Add(j);
+								result = result.Replace("ix16", "(" + temp_reg + " + ea)");
+								result = result.Replace("ea", string.Format("{0:X2}{1:X2}h", i, j));
+								break;
+							case 0xE:
+								result = result.Replace("ix16", "???");
+								break;
+							case 0xF:
+								if (((d >> 5) & 3) == 0)
+								{
+									byte k = reader(addr++);
+									bytes.Add(k);
+									byte l = reader(addr++);
+									bytes.Add(l);
+									result = result.Replace("ix16", "(" + string.Format("{0:X2}{1:X2}h", k, l) + ")");
+								}
+								else
+								{
+									result = result.Replace("ix16", "???");
+								}
+								break;
+						}
+					}
+					else
+					{
+						switch (d & 0xF)
+						{
+							case 0x0:
+								result = result.Replace("ix16", temp_reg + "+");
+								break;
+							case 0x1:
+								result = result.Replace("ix16", temp_reg + "++");
+								break;
+							case 0x2:
+								result = result.Replace("ix16", "-" + temp_reg);
+								break;
+							case 0x3:
+								result = result.Replace("ix16", "--" + temp_reg);
+								break;
+							case 0x4:
+								result = result.Replace("ix16", temp_reg);
+								break;
+							case 0x5:
+								result = result.Replace("ix16", temp_reg + " + B");
+								break;
+							case 0x6:
+								result = result.Replace("ix16", temp_reg + " + A");
+								break;
+							case 0x7:
+								result = result.Replace("ix16", "???");
+								break;
+							case 0x8:
+								byte e = reader(addr++);
+								bytes.Add(e);
+								result = result.Replace("ix16", temp_reg + " + ea");
+								result = result.Replace("ea", string.Format("{0:X2}h", e));
+								break;
+							case 0x9:
+								byte f = reader(addr++);
+								bytes.Add(f);
+								byte g = reader(addr++);
+								bytes.Add(g);
+								result = result.Replace("ix16", temp_reg + " + ea");
+								result = result.Replace("ea", string.Format("{0:X2}{1:X2}h", f, g));
+								break;
+							case 0xA:
+								result = result.Replace("ix16", "???");
+								break;
+							case 0xB:
+								result = result.Replace("ix16", temp_reg + " + D");
+								break;
+							case 0xC:
+								temp_reg = "PC";
+								byte h = reader(addr++);
+								bytes.Add(h);
+								result = result.Replace("ix16", temp_reg + " + ea");
+								result = result.Replace("ea", string.Format("{0:X2}h", h));
+								break;
+							case 0xD:
+								temp_reg = "PC";
+								byte i = reader(addr++);
+								bytes.Add(i);
+								byte j = reader(addr++);
+								bytes.Add(j);
+								result = result.Replace("ix16", temp_reg + " + ea");
+								result = result.Replace("ea", string.Format("{0:X2}{1:X2}h", i, j));
+								break;
+							case 0xE:
+								result = result.Replace("ix16", "???");
+								break;
+							case 0xF:
+								result = result.Replace("ix16", "???");
+								break;
+						}
+					}
+				}				
+			}
+
+			StringBuilder ret = new StringBuilder();
+			ret.Append(string.Format("{0:X4}:  ", origaddr));
+			foreach (var b in bytes)
+				ret.Append(string.Format("{0:X2} ", b));
+			while (ret.Length < 22)
+				ret.Append(' ');
+			ret.Append(result);
+			size = (ushort)(addr - origaddr);
+			return ret.ToString();
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/Execute.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/Execute.cs
new file mode 100644
index 0000000000..279b9b1d54
--- /dev/null
+++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/Execute.cs
@@ -0,0 +1,285 @@
+using System;
+
+namespace BizHawk.Emulation.Common.Components.I8048
+{
+	public partial class I8048
+	{
+		public ulong TotalExecutedCycles;
+
+		// variables for executing instructions
+		public int instr_pntr = 0;
+		public ushort[] cur_instr = new ushort[60];
+		public int opcode_see;
+
+		public int IRQS;
+		public int irq_pntr;
+
+		ushort reg_d_ad;
+		ushort reg_h_ad;
+		ushort reg_l_ad;
+
+		public void FetchInstruction(byte opcode)
+		{
+			opcode_see = opcode;
+			switch (opcode)
+			{
+				case 0x00: OP_IMP(IDLE);							break; // NOP
+				case 0x01: ILLEGAL();								break; // ILLEGAL
+				case 0x02: ILLEGAL();								break; // ILLEGAL
+				case 0x03: OP_A_DIR(ADD8);							break; // ADD A,#
+				case 0x04: ILLEGAL();							break; // LSR				(Direct)
+				case 0x05: OP_IMP(EI);								break; // EI
+				case 0x06: ILLEGAL();							break; // ROR				(Direct)
+				case 0x07: OP_IMP(DECA);							break; // DEC A
+				case 0x08: ILLEGAL();							break; // ASL , LSL			(Direct)
+				case 0x09: ILLEGAL();							break; // ROL				(Direct)
+				case 0x0A: ILLEGAL();						break; // DEC				(Direct)
+				case 0x0B: ILLEGAL();								break; // ILLEGAL
+				case 0x0C: ILLEGAL();						break; // INC				(Direct)
+				case 0x0D: ILLEGAL();							break; // TST				(Direct)
+				case 0x0E: ILLEGAL();								break; // JMP				(Direct)
+				case 0x0F: ILLEGAL();							break; // CLR				(Direct)
+				case 0x10: ILLEGAL();								break; // Page 2
+				case 0x11: ILLEGAL();								break; // Page 3
+				case 0x12: ILLEGAL();									break; // NOP				(Inherent)
+				case 0x13: OP_A_DIR(ADC8);							break; // ADC A,#
+				case 0x14: CALL(0);									break; // CALL
+				case 0x15: OP_IMP(DI);								break; // DI
+				case 0x16: ILLEGAL();								break; // LBRA				(Relative)
+				case 0x17: OP_IMP(INCA);							break; // INC A
+				case 0x18: ILLEGAL();								break; // ILLEGAL
+				case 0x19: ILLEGAL();							break; // DAA				(Inherent)
+				case 0x1A: ILLEGAL();						break; // ORCC				(Immediate)
+				case 0x1B: ILLEGAL();								break; // ILLEGAL
+				case 0x1C: ILLEGAL();						break; // ANDCC				(Immediate)
+				case 0x1D: ILLEGAL();							break; // SEX				(Inherent)
+				case 0x1E: ILLEGAL();									break; // EXG				(Immediate)
+				case 0x1F: ILLEGAL();									break; // TFR				(Immediate)
+				case 0x20: ILLEGAL();								break; // BRA				(Relative)
+				case 0x21: ILLEGAL();								break; // BRN				(Relative)
+				case 0x22: ILLEGAL();					break; // BHI				(Relative)
+				case 0x23: ILLEGAL();						break; // BLS				(Relative)
+				case 0x24: ILLEGAL();								break; // BHS , BCC			(Relative)
+				case 0x25: OP_IMP(EN);								break; // EN
+				case 0x26: ILLEGAL();								break; // BNE				(Relative)
+				case 0x27: OP_IMP(CLR);								break; // CLR A
+				case 0x28: ILLEGAL();								break; // BVC				(Relative)
+				case 0x29: ILLEGAL();								break; // BVS				(Relative)
+				case 0x2A: ILLEGAL();								break; // BPL				(Relative)
+				case 0x2B: ILLEGAL();								break; // BMI				(Relative)
+				case 0x2C: ILLEGAL();						break; // BGE				(Relative)
+				case 0x2D: ILLEGAL();						break; // BLT				(Relative)
+				case 0x2E: ILLEGAL();		break; // BGT				(Relative)
+				case 0x2F: ILLEGAL();			break; // BLE				(Relative)
+				case 0x30: ILLEGAL();							break; // LEAX				(Indexed)
+				case 0x31: ILLEGAL();							break; // LEAY				(Indexed)
+				case 0x32: ILLEGAL();							break; // LEAS				(Indexed)
+				case 0x33: ILLEGAL();							break; // LEAU				(Indexed)
+				case 0x34: CALL(1);									break; // CALL
+				case 0x35: OP_IMP(DN);								break; // DN
+				case 0x36: ILLEGAL();									break; // PSHU				(Immediate)
+				case 0x37: OP_IMP(COM);								break; // COM A
+				case 0x38: ILLEGAL();								break; // ILLEGAL
+				case 0x39: ILLEGAL();									break; // RTS				(Inherent)
+				case 0x3A: ILLEGAL();									break; // ABX				(Inherent)
+				case 0x3B: ILLEGAL();									break; // RTI				(Inherent)
+				case 0x3C: ILLEGAL();									break; // CWAI				(Inherent)
+				case 0x3D: ILLEGAL();									break; // MUL				(Inherent)
+				case 0x3E: ILLEGAL();								break; // ILLEGAL
+				case 0x3F: ILLEGAL();									break; // SWI				(Inherent)
+				case 0x40: OP_A_R(OR8RAM, R0);						break; // OR A,@R0
+				case 0x41: OP_A_R(OR8RAM, R1);						break; // OR A,@R1
+				case 0x42: ILLEGAL();								break; // ILLEGAL
+				case 0x43: OP_A_DIR(OR8);							break; // OR A,#
+				case 0x44: ILLEGAL();								break; // LSRA				(Inherent)
+				case 0x45: ILLEGAL();								break; // ILLEGAL
+				case 0x46: ILLEGAL();								break; // RORA				(Inherent)
+				case 0x47: OP_IMP(SWP);								break; // SWP
+				case 0x48: OP_A_R(OR8, R0);							break; // OR A,R0
+				case 0x49: OP_A_R(OR8, R1);							break; // OR A,R1
+				case 0x4A: OP_A_R(OR8, R2);							break; // OR A,R2
+				case 0x4B: OP_A_R(OR8, R3);							break; // OR A,R3
+				case 0x4C: OP_A_R(OR8, R4);							break; // OR A,R4
+				case 0x4D: OP_A_R(OR8, R5);							break; // OR A,R5
+				case 0x4E: OP_A_R(OR8, R6);							break; // OR A,R6
+				case 0x4F: OP_A_R(OR8, R7);							break; // OR A,R7
+				case 0x50: OP_A_R(AND8RAM, R0);						break; // AND A,@R0
+				case 0x51: OP_A_R(AND8RAM, R1);						break; // AND A,@R1
+				case 0x52: ILLEGAL();							    break; // ILLEGAL
+				case 0x53: OP_A_DIR(AND8);							break; // AND A,#
+				case 0x54: CALL(2);									break; // CALL
+				case 0x55: ILLEGAL();								break; // ILLEGAL
+				case 0x56: ILLEGAL();							break; // RORB				(Inherent)
+				case 0x57: OP_IMP(DA);								break; // DA A
+				case 0x58: OP_A_R(AND8, R0);						break; // AND A,R0
+				case 0x59: OP_A_R(AND8, R1);						break; // AND A,R1
+				case 0x5A: OP_A_R(AND8, R2);						break; // AND A,R2
+				case 0x5B: OP_A_R(AND8, R3);						break; // AND A,R3
+				case 0x5C: OP_A_R(AND8, R4);						break; // AND A,R4
+				case 0x5D: OP_A_R(AND8, R5);						break; // AND A,R5
+				case 0x5E: OP_A_R(AND8, R6);						break; // AND A,R6
+				case 0x5F: OP_A_R(AND8, R7);						break; // AND A,R7
+				case 0x60: OP_A_R(ADD8RAM, R0);						break; // ADD A,@R0
+				case 0x61: OP_A_R(ADD8RAM, R1);						break; // ADD A,@R1
+				case 0x62: ILLEGAL();								break; // ILLEGAL
+				case 0x63: ILLEGAL();							break; // COM				(Indexed)
+				case 0x64: ILLEGAL();							break; // LSR				(Indexed)
+				case 0x65: ILLEGAL();								break; // ILLEGAL
+				case 0x66: ILLEGAL();							break; // ROR				(Indexed)
+				case 0x67: OP_IMP(RRC);								break; // RRC
+				case 0x68: OP_A_R(ADD8, R0);						break; // ADD A,R0
+				case 0x69: OP_A_R(ADD8, R1);						break; // ADD A,R1
+				case 0x6A: OP_A_R(ADD8, R2);						break; // ADD A,R2
+				case 0x6B: OP_A_R(ADD8, R3);						break; // ADD A,R3
+				case 0x6C: OP_A_R(ADD8, R4);						break; // ADD A,R4
+				case 0x6D: OP_A_R(ADD8, R5);						break; // ADD A,R5
+				case 0x6E: OP_A_R(ADD8, R6);						break; // ADD A,R6
+				case 0x6F: OP_A_R(ADD8, R7);						break; // ADD A,R7
+				case 0x70: OP_A_R(ADC8RAM, R0);						break; // ADC A,@R0
+				case 0x71: OP_A_R(ADC8RAM, R1);						break; // ADC A,@R1
+				case 0x72: ILLEGAL();								break; // ILLEGAL
+				case 0x73: ILLEGAL();							break; // COM				(Extended)
+				case 0x74: CALL(3);									break; // CALL
+				case 0x75: ILLEGAL();								break; // ILLEGAL
+				case 0x76: ILLEGAL();							break; // ROR				(Extended)
+				case 0x77: OP_IMP(ROR);								break; // ROR
+				case 0x78: OP_A_R(ADC8, R0);						break; // ADC A,R0
+				case 0x79: OP_A_R(ADC8, R1);						break; // ADC A,R1
+				case 0x7A: OP_A_R(ADC8, R2);						break; // ADC A,R2
+				case 0x7B: OP_A_R(ADC8, R3);						break; // ADC A,R3
+				case 0x7C: OP_A_R(ADC8, R4);						break; // ADC A,R4
+				case 0x7D: OP_A_R(ADC8, R5);						break; // ADC A,R5
+				case 0x7E: OP_A_R(ADC8, R6);						break; // ADC A,R6
+				case 0x7F: OP_A_R(ADC8, R7);						break; // ADC A,R7
+				case 0x80: ILLEGAL();						break; // SUBA				(Immediate)
+				case 0x81: ILLEGAL();						break; // CMPA				(Immediate)
+				case 0x82: ILLEGAL();						break; // SBCA				(Immediate)
+				case 0x83: ILLEGAL();						break; // SUBD				(Immediate)
+				case 0x84: ILLEGAL();						break; // ANDA				(Immediate)
+				case 0x85: OP_IMP(CL0);								break; // CLR F0
+				case 0x86: ILLEGAL();						break; // LDA				(Immediate)
+				case 0x87: ILLEGAL();								break; // ILLEGAL
+				case 0x88: OP_PB_DIR(OR8, BUS);						break; // OR BUS,#
+				case 0x89: OP_PB_DIR(OR8, P1);						break; // OR P1,#
+				case 0x8A: OP_PB_DIR(OR8, P2);						break; // OR P2,#
+				case 0x8B: ILLEGAL();								break; // ILLEGAL
+				case 0x8C: OP_EXP_A(OR8, P4);						break; // OR P4,A
+				case 0x8D: OP_EXP_A(OR8, P5);						break; // OR P5,A
+				case 0x8E: OP_EXP_A(OR8, P6);						break; // OR P6,A
+				case 0x8F: OP_EXP_A(OR8, P7);						break; // OR P7,A
+				case 0x90: ILLEGAL();					break; // SUBA				(Direct)
+				case 0x91: ILLEGAL();					break; // CMPA				(Direct)
+				case 0x92: ILLEGAL();					break; // SBCA				(Direct)
+				case 0x93: ILLEGAL();						break; // SUBD				(Direct)
+				case 0x94: CALL(4);									break; // CALL
+				case 0x95: OP_IMP(CM0);								break; // COM F0
+				case 0x96: ILLEGAL();					break; // LDA				(Direct)
+				case 0x97: OP_IMP(CLC);								break; // CLR C
+				case 0x98: OP_PB_DIR(AND8, BUS);					break; // AND BUS,#
+				case 0x99: OP_PB_DIR(AND8, P1);						break; // AND P1,#
+				case 0x9A: OP_PB_DIR(AND8, P2);						break; // AND P2,#
+				case 0x9B: ILLEGAL();								break; // ILLEGAL
+				case 0x9C: OP_EXP_A(AND8, P4);						break; // AND P4,A
+				case 0x9D: OP_EXP_A(AND8, P5);						break; // AND P5,A
+				case 0x9E: OP_EXP_A(AND8, P6);						break; // AND P6,A
+				case 0x9F: OP_EXP_A(AND8, P7);						break; // AND P7,A
+				case 0xA0: ILLEGAL();					break; // SUBA				(Indexed)
+				case 0xA1: ILLEGAL();					break; // CMPA				(Indexed)
+				case 0xA2: ILLEGAL();					break; // SBCA				(Indexed)
+				case 0xA3: ILLEGAL();					break; // SUBD				(Indexed)
+				case 0xA4: ILLEGAL();					break; // ANDA				(Indexed)
+				case 0xA5: OP_IMP(CL1);								break; // CLR F1
+				case 0xA6: ILLEGAL();					break; // LDA				(Indexed)
+				case 0xA7: OP_IMP(CMC);								break; // COM C
+				case 0xA8: ILLEGAL();					break; // EORA				(Indexed)
+				case 0xA9: ILLEGAL();					break; // ADCA				(Indexed)
+				case 0xAA: ILLEGAL();					break; // ORA				(Indexed)
+				case 0xAB: ILLEGAL();					break; // ADDA				(Indexed)
+				case 0xAC: ILLEGAL();				break; // CMPX				(Indexed)
+				case 0xAD: ILLEGAL();							break; // JSR				(Indexed)
+				case 0xAE: ILLEGAL();					break; // LDX				(Indexed)
+				case 0xAF: ILLEGAL();					break; // STX				(Indexed)
+				case 0xB0: ILLEGAL();						break; // SUBA				(Extended)
+				case 0xB1: ILLEGAL();						break; // CMPA				(Extended)
+				case 0xB2: ILLEGAL();						break; // SBCA				(Extended)
+				case 0xB3: ILLEGAL();						break; // SUBD				(Extended)
+				case 0xB4: CALL(5);									break; // CALL
+				case 0xB5: OP_IMP(CM1);								break; // COM F1
+				case 0xB6: ILLEGAL();						break; // LDA				(Extended)
+				case 0xB7: ILLEGAL();								break; // STA				(Extended)
+				case 0xB8: ILLEGAL();						break; // EORA				(Extended)
+				case 0xB9: ILLEGAL();						break; // ADCA				(Extended)
+				case 0xBA: ILLEGAL();							break; // ORA				(Extended)
+				case 0xBB: ILLEGAL();						break; // ADDA				(Extended)
+				case 0xBC: ILLEGAL();					break; // CMPX				(Extended)
+				case 0xBD: ILLEGAL();								break; // JSR				(Extended)
+				case 0xBE: ILLEGAL();							break; // LDX				(Extended)
+				case 0xBF: ILLEGAL();							break; // STX				(Extended)
+				case 0xC0: ILLEGAL();						break; // SUBB				(Immediate)
+				case 0xC1: ILLEGAL();						break; // CMPB				(Immediate)
+				case 0xC2: ILLEGAL();						break; // SBCB				(Immediate)
+				case 0xC3: ILLEGAL();						break; // ADDD				(Immediate)
+				case 0xC4: ILLEGAL();						break; // ANDB				(Immediate)
+				case 0xC5: ILLEGAL();						break; // BITB				(Immediate)
+				case 0xC6: ILLEGAL();						break; // LDB				(Immediate)
+				case 0xC7: ILLEGAL();								break; // ILLEGAL
+				case 0xC8: OP_R_IMP(DEC8, R0);						break; // DEC R0
+				case 0xC9: OP_R_IMP(DEC8, R1);						break; // DEC R1
+				case 0xCA: OP_R_IMP(DEC8, R2);						break; // DEC R2
+				case 0xCB: OP_R_IMP(DEC8, R3);						break; // DEC R3
+				case 0xCC: OP_R_IMP(DEC8, R4);						break; // DEC R4
+				case 0xCD: OP_R_IMP(DEC8, R5);						break; // DEC R5
+				case 0xCE: OP_R_IMP(DEC8, R6);						break; // DEC R6
+				case 0xCF: OP_R_IMP(DEC8, R7);						break; // DEC R7
+				case 0xD0: OP_A_R(XOR8RAM, R0);						break; // XOR A,@R0
+				case 0xD1: OP_A_R(XOR8RAM, R1);						break; // XOR A,@R1
+				case 0xD2: ILLEGAL();								break; // ILLEGAL
+				case 0xD3: OP_A_DIR(XOR8);							break; // XOR A,#
+				case 0xD4: CALL(6);									break; // CALL
+				case 0xD5: ILLEGAL();					break; // BITB				(Direct)
+				case 0xD6: ILLEGAL();					break; // LDB				(Direct)
+				case 0xD7: ILLEGAL();							break; // STB				(Direct)
+				case 0xD8: OP_A_R(XOR8, R0);						break; // XOR A,R0
+				case 0xD9: OP_A_R(XOR8, R1);						break; // XOR A,R1
+				case 0xDA: OP_A_R(XOR8, R2);						break; // XOR A,R2
+				case 0xDB: OP_A_R(XOR8, R3);						break; // XOR A,R3
+				case 0xDC: OP_A_R(XOR8, R4);						break; // XOR A,R4
+				case 0xDD: OP_A_R(XOR8, R5);						break; // XOR A,R5
+				case 0xDE: OP_A_R(XOR8, R6);						break; // XOR A,R6
+				case 0xDF: OP_A_R(XOR8, R7);						break; // XOR A,R7
+				case 0xE0: ILLEGAL();					break; // SUBB				(Indexed)
+				case 0xE1: ILLEGAL();					break; // CMPB				(Indexed)
+				case 0xE2: ILLEGAL();					break; // SBCB				(Indexed)
+				case 0xE3: ILLEGAL();					break; // ADDD				(Indexed)
+				case 0xE4: ILLEGAL();					break; // ANDB				(Indexed)
+				case 0xE5: ILLEGAL();					break; // BITB				(Indexed)
+				case 0xE6: ILLEGAL();					break; // LDB				(Indexed)
+				case 0xE7: OP_IMP(ROL);								break; // ROL
+				case 0xE8: ILLEGAL();					break; // EORB				(Indexed)
+				case 0xE9: ILLEGAL();					break; // ADCB				(Indexed)
+				case 0xEA: ILLEGAL();					break; // ORB				(Indexed)
+				case 0xEB: ILLEGAL();					break; // ADDB				(Indexed)
+				case 0xEC: ILLEGAL();				break; // LDD				(Indexed)
+				case 0xED: ILLEGAL();				break; // STD				(Indexed)
+				case 0xEE: ILLEGAL();				break; // LDU				(Indexed)
+				case 0xEF: ILLEGAL();				break; // STU				(Indexed)
+				case 0xF0: ILLEGAL();						break; // SUBB				(Extended)
+				case 0xF1: ILLEGAL();                       break; // CMPB				(Extended)
+				case 0xF2: ILLEGAL();						break; // SBCB				(Extended)
+				case 0xF3: ILLEGAL();						break; // ADDD				(Extended)
+				case 0xF4: CALL(7);									break; // CALL
+				case 0xF5: ILLEGAL();							break; // BITB				(Extended)
+				case 0xF6: ILLEGAL();						break; // LDB				(Extended)
+				case 0xF7: OP_IMP(RLC);								break; // RLC
+				case 0xF8: ILLEGAL();						break; // EORB				(Extended)
+				case 0xF9: ILLEGAL();						break; // ADCB				(Extended)
+				case 0xFA: ILLEGAL();							break; // ORB				(Extended)
+				case 0xFB: ILLEGAL();						break; // ADDB				(Extended)
+				case 0xFC: ILLEGAL();							break; // LDD				(Extended)
+				case 0xFD: ILLEGAL();							break; // STD				(Extended)
+				case 0xFE: ILLEGAL();						break; // LDU				(Extended)
+				case 0xFF: ILLEGAL();						break; // STU				(Extended)
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs
new file mode 100644
index 0000000000..28ffdd7633
--- /dev/null
+++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs
@@ -0,0 +1,369 @@
+using System;
+
+using BizHawk.Common;
+
+// Intel Corp 8048
+namespace BizHawk.Emulation.Common.Components.I8048
+{
+	public sealed partial class I8048
+	{
+		// operations that can take place in an instruction
+		public const ushort IDLE = 0; 
+		public const ushort OP = 1;
+		public const ushort RD = 2;
+		public const ushort WR = 3;
+		public const ushort TR = 4;
+		public const ushort ADD16BR = 5;
+		public const ushort ADD8 = 6;
+		public const ushort ADD8RAM = 7;
+		public const ushort ADC8 = 8;
+		public const ushort ADC8RAM = 9;
+		public const ushort INC16 = 10;
+		public const ushort INC8 = 11;
+		public const ushort INCA = 12;
+		public const ushort DEC16 = 13;
+		public const ushort DEC8 = 14;
+		public const ushort DECA = 15;
+		public const ushort ROL = 16;
+		public const ushort ROR = 17;
+		public const ushort RLC = 18;
+		public const ushort RRC = 19;
+		public const ushort SWP = 20;
+		public const ushort COM = 21;
+		public const ushort CMC = 22;
+		public const ushort CM0 = 23;
+		public const ushort CM1 = 24;
+		public const ushort DA = 25;
+		public const ushort AND8 = 26;
+		public const ushort AND8RAM = 27;
+		public const ushort XOR8 = 28;
+		public const ushort XOR8RAM = 29;
+		public const ushort OR8 = 30;
+		public const ushort OR8RAM = 31;
+		public const ushort ASL = 32;
+		public const ushort ASR = 33;
+		public const ushort LSR = 34;
+		public const ushort BIT = 35;
+		public const ushort RD_INC = 36;
+		public const ushort SET_ADDR = 37;
+		public const ushort NEG = 38;
+		public const ushort TST = 39;
+		public const ushort CLR = 40;
+		public const ushort CLC = 41;
+		public const ushort CL0 = 42;
+		public const ushort CL1 = 43;
+		public const ushort EI = 44;
+		public const ushort EN = 45;
+		public const ushort DI = 46;
+		public const ushort DN = 47;
+		public const ushort TFR = 48;
+		public const ushort ADD8BR = 49;
+		public const ushort ABX = 50;
+		public const ushort JPE = 51;
+		public const ushort MSK = 52;
+		public const ushort CMP8 = 53;
+		public const ushort SUB16 = 54;
+		public const ushort ADD16 = 55;
+		public const ushort CMP16 = 56;
+		public const ushort CMP16D = 57;
+		public const ushort CLR_E = 63;
+
+		public I8048()
+		{
+			Reset();
+		}
+
+		public void Reset()
+		{
+			ResetRegisters();
+			ResetInterrupts();
+			TotalExecutedCycles = 0;
+			Regs[PC] = 0xFFFE;
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							RD_INC, ALU, PC,
+							RD_INC, ALU2, PC,
+							SET_ADDR, PC, ALU, ALU2);
+
+			IRQS = 6;
+			instr_pntr = irq_pntr = 0;
+		}
+
+		// Memory Access 
+
+		public Func<ushort, byte> ReadMemory;
+		public Action<ushort, byte> WriteMemory;
+		public Func<ushort, byte> PeekMemory;
+		public Func<ushort, byte> DummyReadMemory;
+
+		//this only calls when the first byte of an instruction is fetched.
+		public Action<ushort> OnExecFetch;
+
+		public void UnregisterMemoryMapper()
+		{
+			ReadMemory = null;
+			ReadMemory = null;
+			PeekMemory = null;
+			DummyReadMemory = null;
+		}
+
+		public void SetCallbacks
+		(
+			Func<ushort, byte> ReadMemory,
+			Func<ushort, byte> DummyReadMemory,
+			Func<ushort, byte> PeekMemory,
+			Action<ushort, byte> WriteMemory
+		)
+		{
+			this.ReadMemory = ReadMemory;
+			this.DummyReadMemory = DummyReadMemory;
+			this.PeekMemory = PeekMemory;
+			this.WriteMemory = WriteMemory;
+		}
+
+		//a little CDL related stuff
+		public delegate void DoCDLCallbackType(ushort addr, I8048.eCDLogMemFlags flags);
+
+		public DoCDLCallbackType CDLCallback;
+
+		public enum eCDLogMemFlags
+		{
+			FetchFirst = 1,
+			FetchOperand = 2,
+			Data = 4,
+			Write = 8
+		};
+
+		// Execute instructions
+		public void ExecuteOne()
+		{
+			//Console.Write(opcode_see + " ");
+			//Console.WriteLine(Regs[PC] + " ");
+			switch (cur_instr[instr_pntr++])
+			{
+				case IDLE:
+					// do nothing
+					break;
+				case OP:
+					// Read the opcode of the next instruction					
+					if (OnExecFetch != null) OnExecFetch(PC);
+					if (TraceCallback != null) TraceCallback(State());
+					if (CDLCallback != null) CDLCallback(PC, eCDLogMemFlags.FetchFirst);
+					FetchInstruction(ReadMemory(Regs[PC]++));
+					instr_pntr = 0;
+					irq_pntr = -1;
+					break;
+				case RD:
+					Read_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case RD_INC:
+					Read_Inc_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case WR:
+					Write_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case TR:
+					TR_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case TFR:
+					TFR_Func(cur_instr[instr_pntr++]);
+					break;
+				case SET_ADDR:
+					reg_d_ad = cur_instr[instr_pntr++];
+					reg_h_ad = cur_instr[instr_pntr++];
+					reg_l_ad = cur_instr[instr_pntr++];
+
+					// Console.WriteLine(reg_d_ad + " " + reg_h_ad + " " + reg_l_ad);
+					// Console.WriteLine(Regs[reg_d_ad] + " " + Regs[reg_h_ad] + " " + Regs[reg_l_ad]);
+
+					Regs[reg_d_ad] = (ushort)((Regs[reg_h_ad] << 8) | Regs[reg_l_ad]);
+					break;
+				case TST:
+					TST_Func(cur_instr[instr_pntr++]);
+					break;
+				case CLR:
+					CLR_Func(cur_instr[instr_pntr++]);
+					break;
+				case CLR_E:
+
+					break;
+				case ADD16BR:
+					ADD16BR_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case ADD8BR:
+					ADD8BR_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case ADD8:
+					ADD8_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case ADC8:
+					ADC8_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case CMP8:
+					CMP8_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case INC16:
+					INC16_Func(cur_instr[instr_pntr++]);
+					break;
+				case INC8:
+					INC8_Func(cur_instr[instr_pntr++]);
+					break;
+				case DEC16:
+					DEC16_Func(cur_instr[instr_pntr++]);
+					break;
+				case CMP16:
+					CMP16_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case DEC8:
+					DEC8_Func(cur_instr[instr_pntr++]);
+					break;
+				case ROL:
+					ROL_Func(cur_instr[instr_pntr++]);
+					break;
+				case ROR:
+					ROR_Func(cur_instr[instr_pntr++]);
+					break;
+				case COM:
+					COM_Func(cur_instr[instr_pntr++]);
+					break;
+				case DA:
+					DA_Func(cur_instr[instr_pntr++]);
+					break;
+				case AND8:
+					AND8_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case XOR8:
+					XOR8_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case OR8:
+					OR8_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+				case ASL:
+					ASL_Func(cur_instr[instr_pntr++]);
+					break;
+				case ASR:
+					ASR_Func(cur_instr[instr_pntr++]);
+					break;
+				case LSR:
+					LSR_Func(cur_instr[instr_pntr++]);
+					break;
+				case BIT:
+					BIT_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);
+					break;
+			}
+
+			if (++irq_pntr == IRQS)
+			{
+				// then regular IRQ				
+				if (IRQPending && IntEn)
+				{
+					IRQPending = false;
+
+					if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====IRQ====", RegisterInfo = "" }); }
+
+					IRQ_();
+					IRQCallback();
+					instr_pntr = irq_pntr = 0;
+				}				
+				// otherwise start the next instruction
+				else
+				{
+					PopulateCURINSTR(OP);
+					instr_pntr = irq_pntr = 0;
+					IRQS = -1;
+				}
+			}
+
+			TotalExecutedCycles++;
+		}
+
+		// tracer stuff
+
+		public Action<TraceInfo> TraceCallback;
+
+		public string TraceHeader
+		{
+			get { return "MC6809: PC, machine code, mnemonic, operands, registers (A, B, X, Y, US, SP, DP, CC), Cy, flags (EFHINZVC)"; }
+		}
+
+		public TraceInfo State(bool disassemble = true)
+		{
+			ushort notused;
+
+			return new TraceInfo
+			{
+				Disassembly = $"{(disassemble ? Disassemble(Regs[PC], ReadMemory, out notused) : "---")} ".PadRight(50),
+				RegisterInfo = string.Format(
+					"A:{0:X2} R0:{1:X2} R1:{2:X2} R2:{3:X2} R3:{4:X2} R4:{5:X2} R5:{6:X2} R6:{7:X2} R7:{8:X2} PSW:{9:X4} Cy:{10} {11}{12}{13}{14}  {15}{16}{17}{18}",
+					Regs[A],
+					Regs[R0],
+					Regs[R1],
+					Regs[R2],
+					Regs[R3],
+					Regs[R4],
+					Regs[R5],
+					Regs[R6],
+					Regs[R7],
+					Regs[PSW],
+					TotalExecutedCycles,
+					FlagC ? "C" : "c",
+					FlagAC ? "A" : "a",
+					FlagF0 ? "F" : "f",
+					FlagBS ? "B" : "b",
+					IntEn ? "I" : "i",
+					F1 ? "F" : "f",
+					T0 ? "T" : "t",
+					T1 ? "T" : "t"
+					)
+			};
+		}
+
+		/// <summary>
+		/// Optimization method to set cur_instr
+		/// </summary>	
+		private void PopulateCURINSTR(ushort d0 = 0, ushort d1 = 0, ushort d2 = 0, ushort d3 = 0, ushort d4 = 0, ushort d5 = 0, ushort d6 = 0, ushort d7 = 0, ushort d8 = 0,
+			ushort d9 = 0, ushort d10 = 0, ushort d11 = 0, ushort d12 = 0, ushort d13 = 0, ushort d14 = 0, ushort d15 = 0, ushort d16 = 0, ushort d17 = 0, ushort d18 = 0,
+			ushort d19 = 0, ushort d20 = 0, ushort d21 = 0, ushort d22 = 0, ushort d23 = 0, ushort d24 = 0, ushort d25 = 0, ushort d26 = 0, ushort d27 = 0, ushort d28 = 0,
+			ushort d29 = 0, ushort d30 = 0, ushort d31 = 0, ushort d32 = 0, ushort d33 = 0, ushort d34 = 0, ushort d35 = 0, ushort d36 = 0, ushort d37 = 0, ushort d38 = 0)
+		{
+			cur_instr[0] = d0; cur_instr[1] = d1; cur_instr[2] = d2;
+			cur_instr[3] = d3; cur_instr[4] = d4; cur_instr[5] = d5;
+			cur_instr[6] = d6; cur_instr[7] = d7; cur_instr[8] = d8;
+			cur_instr[9] = d9; cur_instr[10] = d10; cur_instr[11] = d11;
+			cur_instr[12] = d12; cur_instr[13] = d13; cur_instr[14] = d14;
+			cur_instr[15] = d15; cur_instr[16] = d16; cur_instr[17] = d17;
+			cur_instr[18] = d18; cur_instr[19] = d19; cur_instr[20] = d20;
+			cur_instr[21] = d21; cur_instr[22] = d22; cur_instr[23] = d23;
+			cur_instr[24] = d24; cur_instr[25] = d25; cur_instr[26] = d26;
+			cur_instr[27] = d27; cur_instr[28] = d28; cur_instr[29] = d29;
+			cur_instr[30] = d30; cur_instr[31] = d31; cur_instr[32] = d32;
+			cur_instr[33] = d33; cur_instr[34] = d34; cur_instr[35] = d35;
+			cur_instr[36] = d36; cur_instr[37] = d37; cur_instr[38] = d38;
+		}
+
+		// State Save/Load
+		public void SyncState(Serializer ser)
+		{
+			ser.BeginSection("MC6809");
+
+			ser.Sync(nameof(IntEn), ref IntEn);
+			ser.Sync(nameof(IRQPending), ref IRQPending);
+
+			ser.Sync(nameof(instr_pntr), ref instr_pntr);
+			ser.Sync(nameof(cur_instr), ref cur_instr, false);
+			ser.Sync(nameof(opcode_see), ref opcode_see);
+			ser.Sync(nameof(IRQS), ref IRQS);
+			ser.Sync(nameof(irq_pntr), ref irq_pntr);
+
+			ser.Sync(nameof(Regs), ref Regs, false);
+			ser.Sync(nameof(RAM), ref RAM, false);
+			ser.Sync(nameof(F1), ref F1);
+			ser.Sync(nameof(T0), ref T0);
+			ser.Sync(nameof(T1), ref T1);
+			ser.Sync(nameof(TotalExecutedCycles), ref TotalExecutedCycles);
+
+			ser.EndSection();
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs
new file mode 100644
index 0000000000..ca157fb333
--- /dev/null
+++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace BizHawk.Emulation.Common.Components.I8048
+{
+	public partial class I8048
+	{
+		private void IRQ_()
+		{
+			Regs[ADDR] = 0xFFF8;
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							RD_INC, ALU, ADDR,
+							RD_INC, ALU2, ADDR,
+							SET_ADDR, PC, ALU, ALU2);
+
+			IRQS = 19;
+		}
+
+		public bool IRQPending;
+		public bool IntEn;
+
+		public Action IRQCallback = delegate () { };
+
+		private void ResetInterrupts()
+		{
+			IntEn = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/OP_Tables.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/OP_Tables.cs
new file mode 100644
index 0000000000..d122a47d61
--- /dev/null
+++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/OP_Tables.cs
@@ -0,0 +1,113 @@
+using System;
+using BizHawk.Common.NumberExtensions;
+
+namespace BizHawk.Emulation.Common.Components.I8048
+{
+	public partial class I8048
+	{
+		// this contains the vectors of instrcution operations
+		// NOTE: This list is NOT confirmed accurate for each individual cycle
+		public void ILLEGAL()
+		{
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							IDLE);
+
+			IRQS = 4;
+		}
+
+		public void OP_IMP(ushort oper)
+		{
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							oper);
+
+			IRQS = 4;
+		}
+
+		public void OP_R_IMP(ushort oper, ushort reg)
+		{
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							oper, reg);
+
+			IRQS = 4;
+		}
+
+
+		public void OP_A_R(ushort oper, ushort reg)
+		{
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							oper,A,reg);
+
+			IRQS = 4;
+		}
+
+		public void OP_A_DIR(ushort oper)
+		{
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							RD, ALU, PC,
+							INC16, PC,
+							IDLE,
+							IDLE,
+							IDLE,
+							oper, A, ALU);
+
+			IRQS = 9;
+		}
+
+		public void OP_PB_DIR(ushort oper, ushort reg)
+		{
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							RD, ALU, PC,
+							INC16, PC,
+							IDLE,
+							IDLE,
+							IDLE,
+							oper, reg, ALU);
+
+			IRQS = 9;
+		}
+
+		public void OP_EXP_A(ushort oper, ushort reg)
+		{
+			// Lower 4 bits only		
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							TR, ALU, A,
+							IDLE,
+							IDLE,
+							MSK, ALU,
+							IDLE,
+							oper, reg, ALU);
+
+			IRQS = 9;
+		}
+
+		public void CALL(ushort dest_h)
+		{
+			// Lower 4 bits only		
+			PopulateCURINSTR(IDLE,
+							IDLE,
+							IDLE,
+							TR, ALU, A,
+							IDLE,
+							IDLE,
+							MSK, ALU,
+							IDLE,
+							ALU);
+
+			IRQS = 9;
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/Operations.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/Operations.cs
new file mode 100644
index 0000000000..24f54091c9
--- /dev/null
+++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/Operations.cs
@@ -0,0 +1,291 @@
+using System;
+using BizHawk.Common.NumberExtensions;
+
+namespace BizHawk.Emulation.Common.Components.I8048
+{
+	public partial class I8048
+	{
+		public void Read_Func(ushort dest, ushort src)
+		{
+			if (CDLCallback != null)
+			{
+				if (src == PC) CDLCallback(Regs[src], eCDLogMemFlags.FetchOperand);
+				else CDLCallback(Regs[src], eCDLogMemFlags.Data);
+			}
+			Regs[dest] = ReadMemory(Regs[src]);
+		}
+
+		public void Read_Inc_Func(ushort dest, ushort src)
+		{
+			if (CDLCallback != null)
+			{
+				if (src == PC) CDLCallback(Regs[src], eCDLogMemFlags.FetchOperand);
+				else CDLCallback(Regs[src], eCDLogMemFlags.Data);
+			}
+			//Console.WriteLine(dest + " " + src + " " + opcode_see);
+
+			Regs[dest] = ReadMemory(Regs[src]);
+
+			Regs[src]++;
+		}
+
+		public void Write_Func(ushort dest, ushort src)
+		{
+			if (CDLCallback != null) CDLCallback(Regs[dest], eCDLogMemFlags.Write | eCDLogMemFlags.Data);
+			WriteMemory(Regs[dest], (byte)Regs[src]);
+		}
+
+		public void TR_Func(ushort dest, ushort src)
+		{
+			Regs[dest] = Regs[src];
+		}
+
+		public void LD_8_Func(ushort dest, ushort src)
+		{
+			Regs[dest] = Regs[src];
+		}
+
+		public void TST_Func(ushort src)
+		{
+
+		}
+
+		public void CLR_Func(ushort src)
+		{
+			Regs[src] = 0;
+
+			FlagC = false;
+		}
+
+		// source is considered a 16 bit signed value, used for long relative branch
+		// no flags used
+		public void ADD16BR_Func(ushort dest, ushort src)
+		{
+			Regs[dest] = (ushort)(Regs[dest] + (short)Regs[src]);
+		}
+
+		public void ADD8BR_Func(ushort dest, ushort src)
+		{
+			if (Regs[src] > 127) { Regs[src] |= 0xFF00; }
+			Regs[dest] = (ushort)(Regs[dest] + (short)Regs[src]);
+		}
+
+		public void ADD8_Func(ushort dest, ushort src)
+		{
+			int Reg16_d = Regs[dest];
+			Reg16_d += Regs[src];
+
+			FlagC = Reg16_d.Bit(8);
+
+			ushort ans = (ushort)(Reg16_d & 0xFF);
+
+			// redo for half carry flag
+			Reg16_d = Regs[dest] & 0xF;
+			Reg16_d += (Regs[src] & 0xF);
+
+			Regs[dest] = ans;
+		}
+
+		public void SUB8_Func(ushort dest, ushort src)
+		{
+			int Reg16_d = Regs[dest];
+			Reg16_d -= Regs[src];
+
+			FlagC = Reg16_d.Bit(8);
+
+			ushort ans = (ushort)(Reg16_d & 0xFF);
+
+			// redo for half carry flag
+			Reg16_d = Regs[dest] & 0xF;
+			Reg16_d -= (Regs[src] & 0xF);
+
+			Regs[dest] = ans;
+		}
+
+		// same as SUB8 but result not stored
+		public void CMP8_Func(ushort dest, ushort src)
+		{
+			int Reg16_d = Regs[dest];
+			Reg16_d -= Regs[src];
+
+			FlagC = Reg16_d.Bit(8);
+
+			ushort ans = (ushort)(Reg16_d & 0xFF);
+
+			// redo for half carry flag
+			Reg16_d = Regs[dest] & 0xF;
+			Reg16_d -= (Regs[src] & 0xF);
+		}
+
+		public void BIT_Func(ushort dest, ushort src)
+		{
+			ushort ans = (ushort)(Regs[dest] & Regs[src]);
+		}
+
+		public void ASL_Func(ushort src)
+		{
+			FlagC = Regs[src].Bit(7);
+
+			Regs[src] = (ushort)((Regs[src] << 1) & 0xFF);
+		}
+
+		public void ASR_Func(ushort src)
+		{
+			FlagC = Regs[src].Bit(0);
+
+			ushort temp = (ushort)(Regs[src] & 0x80); // MSB doesn't change in this operation
+
+			Regs[src] = (ushort)((Regs[src] >> 1) | temp);
+		}
+
+		public void LSR_Func(ushort src)
+		{
+			FlagC = Regs[src].Bit(0);
+
+			Regs[src] = (ushort)(Regs[src] >> 1);
+		}
+
+		public void COM_Func(ushort src)
+		{
+			Regs[src] = (ushort)((~Regs[src]) & 0xFF);
+
+			FlagC = true;
+		}
+
+		public void AND8_Func(ushort dest, ushort src)
+		{
+			Regs[dest] = (ushort)(Regs[dest] & Regs[src]);
+		}
+
+		public void OR8_Func(ushort dest, ushort src)
+		{
+			Regs[dest] = (ushort)(Regs[dest] | Regs[src]);
+		}
+
+		public void XOR8_Func(ushort dest, ushort src)
+		{
+			Regs[dest] = (ushort)(Regs[dest] ^ Regs[src]);
+		}
+
+		public void ROR_Func(ushort src)
+		{
+			ushort c = (ushort)(FlagC ? 0x80 : 0);
+
+			FlagC = Regs[src].Bit(0);
+
+			Regs[src] = (ushort)(c | (Regs[src] >> 1));
+		}
+
+		public void ROL_Func(ushort src)
+		{
+			ushort c = (ushort)(FlagC ? 1 : 0);
+			FlagC = Regs[src].Bit(7);
+
+			Regs[src] = (ushort)(((Regs[src] << 1) & 0xFF) | c);
+		}
+
+		public void RRC_Func(ushort src)
+		{
+			ushort c = (ushort)(FlagC ? 0x80 : 0);
+
+			FlagC = Regs[src].Bit(0);
+
+			Regs[src] = (ushort)(c | (Regs[src] >> 1));
+		}
+
+		public void RLC_Func(ushort src)
+		{
+			ushort c = (ushort)(FlagC ? 1 : 0);
+			FlagC = Regs[src].Bit(7);
+
+			Regs[src] = (ushort)(((Regs[src] << 1) & 0xFF) | c);
+		}
+
+		public void INC8_Func(ushort src)
+		{
+			Regs[src] = (ushort)((Regs[src] + 1) & 0xFF);
+		}
+
+		public void DEC8_Func(ushort src)
+		{
+			Regs[src] = (ushort)((Regs[src] - 1) & 0xFF);
+		}
+
+		public void INC16_Func(ushort src)
+		{
+			Regs[src] += 1;
+		}
+
+		public void DEC16_Func(ushort src)
+		{
+			Regs[src] -= 1;
+		}
+
+		public void ADC8_Func(ushort dest, ushort src)
+		{
+			int Reg16_d = Regs[dest];
+			int c = FlagC ? 1 : 0;
+
+			Reg16_d += (Regs[src] + c);
+
+			FlagC = Reg16_d.Bit(8);
+
+			ushort ans = (ushort)(Reg16_d & 0xFF);
+
+			// redo for half carry flag
+			Reg16_d = Regs[dest] & 0xF;
+			Reg16_d += ((Regs[src] & 0xF) + c);
+
+			Regs[dest] = ans;
+		}
+
+		public void DA_Func(ushort src)
+		{
+			int a = Regs[src];
+
+			byte CF = 0;
+			if (FlagC || ((a & 0xF) > 9))
+			{
+				CF = 6;
+			}
+			if (FlagC || (((a >> 4) & 0xF) > 9) || ((((a >> 4) & 0xF) > 8) && ((a & 0xF) > 9)))
+			{
+				CF |= (byte)(6 << 4);
+			}
+
+			a += CF;
+
+			if ((a > 0xFF) || FlagC)
+			{
+				FlagC = true;
+			}
+			else
+			{
+				FlagC = false;
+			}
+			Regs[src] = (byte)a;
+		}
+
+		public void CMP16_Func(ushort dest, ushort src)
+		{
+			int Reg16_d = Regs[dest];
+			int Reg16_s = Regs[src];
+
+			Reg16_d -= Reg16_s;
+
+			FlagC = Reg16_d.Bit(16);
+
+			ushort ans = (ushort)(Reg16_d & 0xFFFF);
+		}
+
+		public void EXG_Func(ushort sel)
+		{
+
+		}
+
+		public void TFR_Func(ushort sel)
+		{
+
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/ReadMe.txt b/BizHawk.Emulation.Cores/CPUs/Intel8048/ReadMe.txt
new file mode 100644
index 0000000000..115b568cb8
--- /dev/null
+++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/ReadMe.txt
@@ -0,0 +1 @@
+TODO: STOP for second byte nonzero
diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs
new file mode 100644
index 0000000000..7db008df57
--- /dev/null
+++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs
@@ -0,0 +1,86 @@
+using System;
+
+namespace BizHawk.Emulation.Common.Components.I8048
+{
+	public partial class I8048
+	{
+		// registers
+		public ushort[] Regs = new ushort[21];
+
+		// 64 bytes of onboard ram
+		public ushort[] RAM = new ushort[64];
+
+		// The 8048 has 2 flags that can be used for conditionals
+		// F0 is on the PSW, F1 is seperate
+		public bool F1;
+
+		// The 8048 has 2 test lines which can be used for conditionals, T0 can be used as an output
+		public bool T0, T1;
+
+		public const ushort PC = 0;
+		public const ushort PSW = 1;
+		public const ushort BUS = 2;
+		public const ushort A = 3;
+		public const ushort R0 = 4;
+		public const ushort R1 = 5;
+		public const ushort R2 = 6;
+		public const ushort R3 = 7;
+		public const ushort R4 = 8;
+		public const ushort R5 = 9;
+		public const ushort R6 = 10;
+		public const ushort R7 = 11;
+		public const ushort ADDR = 12; // internal
+		public const ushort ALU = 13; // internal
+		public const ushort ALU2 = 14; // internal
+		public const ushort P1 = 15;
+		public const ushort P2 = 16;
+		public const ushort P4 = 17;
+		public const ushort P5 = 18;
+		public const ushort P6 = 19;
+		public const ushort P7 = 20;
+
+		public bool Flag3
+		{
+			get { return (Regs[PSW] & 0x08) != 0; }
+			set { Regs[PSW] = (byte)((Regs[PSW] & ~0x08) | 0x08); }
+		}
+
+		public bool FlagBS
+		{
+			get { return (Regs[PSW] & 0x10) != 0; }
+			set { Regs[PSW] = (byte)((Regs[PSW] & ~0x10) | (value ? 0x10 : 0x00)); }
+		}
+
+		public bool FlagF0
+		{
+			get { return (Regs[PSW] & 0x20) != 0; }
+			set { Regs[PSW] = (byte)((Regs[PSW] & ~0x20) | (value ? 0x20 : 0x00)); }
+		}
+
+		public bool FlagAC
+		{
+			get { return (Regs[PSW] & 0x40) != 0; }
+			set { Regs[PSW] = (byte)((Regs[PSW] & ~0x40) | (value ? 0x40 : 0x00)); }
+		}
+
+		public bool FlagC
+		{
+			get { return (Regs[PSW] & 0x80) != 0; }
+			set { Regs[PSW] = (byte)((Regs[PSW] & ~0x80) | (value ? 0x80 : 0x00)); }
+		}
+
+		private void ResetRegisters()
+		{
+			for (int i = 0; i < 21; i++)
+			{
+				Regs[i] = 0;
+			}
+
+			F1 = false;
+
+			T0 = T1 = false;
+
+			Flag3 = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/CPUs/LR35902/Interrupts.cs b/BizHawk.Emulation.Cores/CPUs/LR35902/Interrupts.cs
index 12979e363d..2f2d8a5185 100644
--- a/BizHawk.Emulation.Cores/CPUs/LR35902/Interrupts.cs
+++ b/BizHawk.Emulation.Cores/CPUs/LR35902/Interrupts.cs
@@ -13,19 +13,19 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 						WR, SPl, SPh, PCh,
 						IDLE,
 						DEC16, SPl, SPh,
-						INT_GET, W,// NOTE: here is where we check for a cancelled IRQ
+						IDLE,
 						WR, SPl, SPh, PCl,
 						IDLE,
 						IDLE,
 						IDLE,
 						IDLE,
 						IDLE,
-						IDLE,
-						IDLE,
-						IDLE,
-						TR, PCl, W,
 						ASGN, PCh, 0,
 						IDLE,
+						INT_GET, W,// NOTE: here is where we check for a cancelled IRQ
+						TR, PCl, W,
+						IRQ_CLEAR,
+						IDLE,
 						OP };
 		}
 
@@ -37,30 +37,31 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 						IDLE,
 						WR, SPl, SPh, PCh,
 						IDLE,
-						INT_GET, W,// NOTE: here is where we check for a cancelled IRQ
 						DEC16, SPl, SPh,
+						IDLE,
 						WR, SPl, SPh, PCl,
 						IDLE,
 						IDLE,
 						IDLE,
 						IDLE,
+						IDLE,
+						IDLE,
+						IDLE,
+						IDLE,
+						INT_GET, W,// NOTE: here is where we check for a cancelled IRQ
+						IDLE,
 						TR, PCl, W,
+						IDLE,
 						ASGN, PCh, 0,
-						IDLE,
-						IDLE,
-						IDLE,
-						IDLE,
-						IDLE,
-						IDLE,
-						IDLE,
-						IDLE,
-						IDLE,
+						IRQ_CLEAR,
+						IDLE,				
 						OP };
 		}
 
 		private static ushort[] INT_vectors = new ushort[] {0x40, 0x48, 0x50, 0x58, 0x60, 0x00};
 
 		public ushort int_src;
+		public byte int_clear;
 		public int stop_time;
 		public bool stop_check;
 		public bool is_GBC; // GBC automatically adds a NOP to avoid the HALT bug (according to Sinimas)
diff --git a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
index 5977a4cabf..79d5e2f62e 100644
--- a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
+++ b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
@@ -58,6 +58,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 		public const ushort EI_RETI = 43; // reti has no delay in interrupt enable
 		public const ushort INT_GET = 44;
 		public const ushort HALT_CHK = 45; // when in halt mode, actually check I Flag here
+		public const ushort IRQ_CLEAR = 46;
 
 		public LR35902()
 		{
@@ -311,13 +312,12 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 							if (!Halt_bug_3)
 							{
 								INTERRUPT_GBC_NOP();
-								//INTERRUPT_();
 							}
 							else
 							{
 								INTERRUPT_();
 								Halt_bug_3 = false;
-								Console.WriteLine("Hit INT");
+								//Console.WriteLine("Hit INT");
 							}
 						}
 						else
@@ -352,7 +352,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 								RegPC++;
 								FetchInstruction(ReadMemory(RegPC));
 								Halt_bug_3 = false;
-								Console.WriteLine("Hit un");
+								//Console.WriteLine("Hit un");
 							}
 							else
 							{
@@ -520,15 +520,14 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 				case INT_GET:
 					// check if any interrupts got cancelled along the way
 					// interrupt src = 5 sets the PC to zero as observed
+					// also the triggering interrupt seems like it is held low (i.e. annot trigger I flag) until the interrupt is serviced
 
-					if (interrupt_src.Bit(0) && interrupt_enable.Bit(0)) { int_src = 0; interrupt_src -= 1; }
-					else if (interrupt_src.Bit(1) && interrupt_enable.Bit(1)) { int_src = 1; interrupt_src -= 2; }
-					else if (interrupt_src.Bit(2) && interrupt_enable.Bit(2)) { int_src = 2; interrupt_src -= 4; }
-					else if (interrupt_src.Bit(3) && interrupt_enable.Bit(3)) { int_src = 3; interrupt_src -= 8; }
-					else if (interrupt_src.Bit(4) && interrupt_enable.Bit(4)) { int_src = 4; interrupt_src -= 16; }
-					else { int_src = 5; }
-						
-					if ((interrupt_src & interrupt_enable) == 0) { FlagI = false; }
+					if (interrupt_src.Bit(0) && interrupt_enable.Bit(0)) { int_src = 0; int_clear = 1; }
+					else if (interrupt_src.Bit(1) && interrupt_enable.Bit(1)) { int_src = 1; int_clear = 2; }
+					else if (interrupt_src.Bit(2) && interrupt_enable.Bit(2)) { int_src = 2; int_clear = 4; }
+					else if (interrupt_src.Bit(3) && interrupt_enable.Bit(3)) { int_src = 3; int_clear = 8; }
+					else if (interrupt_src.Bit(4) && interrupt_enable.Bit(4)) { int_src = 4; int_clear = 16; }
+					else { int_src = 5; int_clear = 0; }
 
 					Regs[cur_instr[instr_pntr++]] = INT_vectors[int_src];
 					break;
@@ -538,11 +537,17 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 					{
 						RegPC--;
 						Halt_bug_3 = true;
-						Console.WriteLine("Halt_bug_3");
-						Console.WriteLine(TotalExecutedCycles);
+						//Console.WriteLine("Halt_bug_3");
+						//Console.WriteLine(TotalExecutedCycles);
 					}
 					
 					Halt_bug_2 = false;
+					break;
+				case IRQ_CLEAR:
+					if (interrupt_src.Bit(int_src)) { interrupt_src -= int_clear; }
+
+					if ((interrupt_src & interrupt_enable) == 0) { FlagI = false; }
+
 					break;
 			}
 			TotalExecutedCycles++;
@@ -591,23 +596,24 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 		{
 			ser.BeginSection(nameof(LR35902));
 			ser.Sync(nameof(Regs), ref Regs, false);
-			ser.Sync("IRQ", ref interrupts_enabled);
+			ser.Sync(nameof(interrupts_enabled), ref interrupts_enabled);
 			ser.Sync(nameof(I_use), ref I_use);
 			ser.Sync(nameof(skip_once), ref skip_once);
 			ser.Sync(nameof(Halt_bug_2), ref Halt_bug_2);
 			ser.Sync(nameof(Halt_bug_3), ref Halt_bug_3);
-			ser.Sync("Halted", ref halted);
+			ser.Sync(nameof(halted), ref halted);
 			ser.Sync(nameof(TotalExecutedCycles), ref TotalExecutedCycles);
 			ser.Sync(nameof(EI_pending), ref EI_pending);
 			ser.Sync(nameof(int_src), ref int_src);
+			ser.Sync(nameof(int_clear), ref int_clear);
 			ser.Sync(nameof(stop_time), ref stop_time);
 			ser.Sync(nameof(stop_check), ref stop_check);
 			ser.Sync(nameof(is_GBC), ref is_GBC);
 
 			ser.Sync(nameof(instr_pntr), ref instr_pntr);
 			ser.Sync(nameof(cur_instr), ref cur_instr, false);
-			ser.Sync("CB Prefix", ref CB_prefix);
-			ser.Sync("Stopped", ref stopped);
+			ser.Sync(nameof(CB_prefix), ref CB_prefix);
+			ser.Sync(nameof(stopped), ref stopped);
 			ser.Sync(nameof(opcode), ref opcode);
 			ser.Sync(nameof(jammed), ref jammed);
 			ser.Sync(nameof(LY), ref LY);
diff --git a/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs b/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs
index 69dc1b2339..84b29f164f 100644
--- a/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs
+++ b/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs
@@ -473,16 +473,13 @@ namespace BizHawk.Emulation.Common.Components.MC6800
 				// then regular IRQ				
 				else if (IRQPending && !FlagI)
 				{
-					if (!FlagI)
-					{
-						IRQPending = false;
+					IRQPending = false;
 
-						if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====IRQ====", RegisterInfo = "" }); }
+					if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====IRQ====", RegisterInfo = "" }); }
 
-						IRQ_();
-						IRQCallback();
-						instr_pntr = irq_pntr = 0;
-					}
+					IRQ_();
+					IRQCallback();
+					instr_pntr = irq_pntr = 0;
 				}				
 				// otherwise start the next instruction
 				else
diff --git a/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs b/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs
index 14dfc124f4..4551374220 100644
--- a/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs
+++ b/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs
@@ -503,16 +503,85 @@ namespace BizHawk.Emulation.Common.Components.MC6809
 					else
 					{
 						PopulateCURINSTR(CWAI);
-						irq_pntr = 0;
+						irq_pntr = instr_pntr = 0;
 						IRQS = -1;
 					}
 					instr_pntr = 0;
 					break;
 				case SYNC:
-					IN_SYNC = true;
-					IRQS = 1;				
-					instr_pntr = irq_pntr = 0;
-					PopulateCURINSTR(SYNC);
+					if (NMIPending)
+					{
+						NMIPending = false;
+						IN_SYNC = false;
+
+						Regs[ADDR] = 0xFFFC;
+						PopulateCURINSTR(RD_INC, ALU, ADDR,
+										RD_INC, ALU2, ADDR,
+										SET_ADDR, PC, ALU, ALU2);
+						irq_pntr = -1;
+						IRQS = 3;
+
+						if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====SYNC NMI====", RegisterInfo = "" }); }
+					}
+					else if (FIRQPending)
+					{
+						if (!FlagF)
+						{
+							FIRQPending = false;
+
+							Regs[ADDR] = 0xFFF6;
+							PopulateCURINSTR(RD_INC, ALU, ADDR,
+											RD_INC, ALU2, ADDR,
+											SET_ADDR, PC, ALU, ALU2);
+							irq_pntr = -1;
+							IRQS = 3;
+
+							if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====SYNC FIRQ====", RegisterInfo = "" }); }
+						}
+						else
+						{
+							FIRQPending = false;					
+							IN_SYNC = false;
+							IRQS = 2;
+							instr_pntr = irq_pntr = 0;
+							PopulateCURINSTR(IDLE,
+											IDLE);
+						}
+					}
+					else if (IRQPending)
+					{
+						if (!FlagI)
+						{
+							IRQPending = false;
+							IN_SYNC = false;
+
+							Regs[ADDR] = 0xFFF8;
+							PopulateCURINSTR(RD_INC, ALU, ADDR,
+											RD_INC, ALU2, ADDR,
+											SET_ADDR, PC, ALU, ALU2);
+							irq_pntr = -1;
+							IRQS = 3;
+
+							if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====SYNC IRQ====", RegisterInfo = "" }); }
+						}
+						else
+						{
+							FIRQPending = false;
+							IN_SYNC = false;
+							IRQS = 2;
+							instr_pntr = irq_pntr = 0;
+							PopulateCURINSTR(IDLE,
+											IDLE);
+						}
+					}
+					else
+					{
+						IN_SYNC = true;
+						IRQS = -1;
+						instr_pntr = irq_pntr = 0;
+						PopulateCURINSTR(SYNC);
+					}
+					
 					break;
 			}
 
@@ -525,62 +594,31 @@ namespace BizHawk.Emulation.Common.Components.MC6809
 
 					if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====NMI====", RegisterInfo = "" }); }
 
-					IN_SYNC = false;
 					NMI_();
 					NMICallback();
 					instr_pntr = irq_pntr = 0;
 				}
 				// fast IRQ has next priority
-				else if (FIRQPending)
+				else if (FIRQPending && !FlagF)
 				{
-					if (!FlagF)
-					{
-						FIRQPending = false;
+					FIRQPending = false;
 
-						if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====FIRQ====", RegisterInfo = "" }); }
+					if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====FIRQ====", RegisterInfo = "" }); }
 
-						IN_SYNC = false;
-						FIRQ_();
-						FIRQCallback();
-						instr_pntr = irq_pntr = 0;
-					}
-					else if (IN_SYNC)
-					{
-						FIRQPending = false;
-
-						if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====SYNC====", RegisterInfo = "" }); }
-
-						IN_SYNC = false;
-						IRQS = 1;
-						instr_pntr = irq_pntr = 0;
-						PopulateCURINSTR(IDLE);
-					}
+					FIRQ_();
+					FIRQCallback();
+					instr_pntr = irq_pntr = 0;
 				}
 				// then regular IRQ				
 				else if (IRQPending && !FlagI)
 				{
-					if (!FlagI)
-					{
-						IRQPending = false;
+					IRQPending = false;
 
-						if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====IRQ====", RegisterInfo = "" }); }
+					if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====IRQ====", RegisterInfo = "" }); }
 
-						IN_SYNC = false;
-						IRQ_();
-						IRQCallback();
-						instr_pntr = irq_pntr = 0;
-					}
-					else if (IN_SYNC)
-					{
-						IRQPending = false;
-
-						if (TraceCallback != null) { TraceCallback(new TraceInfo { Disassembly = "====SYNC====", RegisterInfo = "" }); }
-
-						IN_SYNC = false;
-						IRQS = 1;
-						instr_pntr = irq_pntr = 0;
-						PopulateCURINSTR(IDLE);
-					}
+					IRQ_();
+					IRQCallback();
+					instr_pntr = irq_pntr = 0;
 				}				
 				// otherwise start the next instruction
 				else
diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs
index 685893689e..38c2da72d9 100644
--- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs
+++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs
@@ -1035,8 +1035,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
         public int[] GetVideoBuffer()
         {
             // get only lines that have pixel data
-            var lines = ScreenLines.Where(a => a.Pixels.Count > 0).ToList();
-            var height = lines.Count();
+            var lines = ScreenLines.Where(a => a.Pixels.Count > 0);
 
             int pos = 0;
             int lCount = 0;
diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
index 56ab7163c1..64c31d87c4 100644
--- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
+++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
@@ -152,12 +152,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
         /// </summary>
         public void SetDataPeriodsArray(int[] periodArray)
         {
-            DataPeriods = new List<int>();
-
-            if (periodArray == null)
-                return;
-
-            DataPeriods = periodArray.ToList();
+            DataPeriods = periodArray?.ToList() ?? new List<int>();
         }
 
         /// <summary>
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/FFT.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/FFT.cs
index 1948acbf60..b87c8f5b38 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/FFT.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/FFT.cs
@@ -6,7 +6,6 @@
 
 namespace BizHawk.Emulation.Cores.Computers.Commodore64
 {
-
 	public class RealFFT
 	{
 		private readonly int _length;
@@ -15,12 +14,13 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 
 		public readonly double ForwardScaleFactor;
 		public readonly double ReverseScaleFactor;
+		public readonly double CorrectionScaleFactor;
 
 		public RealFFT(int length)
 		{
 			if (length < 2 || (length & (length - 1)) != 0)
 			{
-				throw new ArgumentException("length", "FFT length must be at least 2 and a power of 2.");
+				throw new ArgumentException("FFT length must be at least 2 and a power of 2.", nameof(length));
 			}
 
 			_length = length;
@@ -29,6 +29,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 
 			ForwardScaleFactor = length;
 			ReverseScaleFactor = 0.5;
+			CorrectionScaleFactor = 1.0 / (ForwardScaleFactor * ReverseScaleFactor);
 		}
 
 		public void ComputeForward(double[] buff)
@@ -45,7 +46,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 		{
 			if (buff.Length < _length)
 			{
-				throw new ArgumentException("buff", "Buffer length must be greater than or equal to the FFT length.");
+				throw new ArgumentException("Buffer length must be greater than or equal to the FFT length.", nameof(buff));
 			}
 
 			rdft(_length, reverse, buff, _ip, _w);
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.cs
index b96573b995..f3f3a56e5c 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.cs
@@ -324,7 +324,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 			//re-sample back down to the original number of samples
 			for (double i = 0; i < nsamp; i++)
 			{
-				_outputBufferFiltered[(int)i + _filterIndex] = (int)(_fftBuffer[(int)Math.Ceiling((i / (nsamp - 1) * (nsamp_2 - 1)))]/(nsamp_2/2));
+				_outputBufferFiltered[(int)i + _filterIndex] = (int)(_fftBuffer[(int)Math.Ceiling((i / (nsamp - 1) * (nsamp_2 - 1)))] * _fft.CorrectionScaleFactor);
 
 				if (_outputBufferFiltered[(int)i + _filterIndex] < 0)
 				{
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs
index c1560f3339..8133e7a66b 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs
@@ -65,7 +65,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             // now process the blocks
             var infoBlock = blocks.Where(a => a.RecordType == RecordHeaderType.INFO).FirstOrDefault();
             var IMGEblocks = blocks.Where(a => a.RecordType == RecordHeaderType.IMGE).ToList();
-            var DATAblocks = blocks.Where(a => a.RecordType == RecordHeaderType.DATA).ToList();
+            var DATAblocks = blocks.Where(a => a.RecordType == RecordHeaderType.DATA);
 
             DiskHeader.NumberOfTracks = (byte)(IMGEblocks.Count());
             DiskHeader.NumberOfSides = (byte)(infoBlock.INFOmaxSide + 1);
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs
index d60267bf76..489f425b6e 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs
@@ -153,12 +153,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
         /// </summary>
         public void SetDataPeriodsArray(int[] periodArray)
         {
-            DataPeriods = new List<int>();
-
-            if (periodArray == null)
-                return;
-
-            DataPeriods = periodArray.ToList();
+            DataPeriods = periodArray?.ToList() ?? new List<int>();
         }
 
         /// <summary>
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IStatable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IStatable.cs
index eabaf20fdc..7751a535f5 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IStatable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IStatable.cs
@@ -7,7 +7,10 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	public partial class Atari2600 : IStatable
 	{
-		public bool BinarySaveStatesPreferred => false;
+		public bool BinarySaveStatesPreferred
+		{
+			get { return true; }
+		}
 
 		public void SaveStateText(TextWriter writer)
 		{
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
index 436fdd3371..ef89535611 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
@@ -75,7 +75,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			{
 				Name = _game.Name,
 				System = "A26",
-				MetaData = "m=" + _mapper.GetType().ToString().Split('.').ToList().Last(),
+				MetaData = "m=" + _mapper.GetType().ToString().Split('.').Last(),
 				Hash = Rom.HashSHA1(),
 				Region = _game.Region,
 				Status = RomStatus.Unknown
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Audio.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Audio.cs
new file mode 100644
index 0000000000..9a459bf8f5
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Audio.cs
@@ -0,0 +1,220 @@
+using System;
+
+using BizHawk.Common;
+using BizHawk.Common.BufferExtensions;
+using BizHawk.Emulation.Common;
+using BizHawk.Common.NumberExtensions;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	// Audio Emulation
+	public class Audio : ISoundProvider
+	{
+		public O2Hawk Core { get; set; }
+
+		private BlipBuffer _blip_L = new BlipBuffer(15000);
+		private BlipBuffer _blip_R = new BlipBuffer(15000);
+
+		public const int NR10 = 0;
+		public const int NR11 = 1;
+		public const int NR12 = 2;
+		public const int NR13 = 3;
+		public const int NR14 = 4;
+		public const int NR21 = 5;
+		public const int NR22 = 6;
+		public const int NR23 = 7;
+		public const int NR24 = 8;
+		public const int NR30 = 9;
+		public const int NR31 = 10;
+		public const int NR32 = 11;
+		public const int NR33 = 12;
+		public const int NR34 = 13;
+		public const int NR41 = 14;
+		public const int NR42 = 15;
+		public const int NR43 = 16;
+		public const int NR44 = 17;
+		public const int NR50 = 18;
+		public const int NR51 = 19;
+		public const int NR52 = 20;
+
+
+		public byte[] Audio_Regs = new byte[21];
+
+		// Contol Variables
+		public bool AUD_CTRL_vin_L_en;
+		public bool AUD_CTRL_vin_R_en;
+		public bool AUD_CTRL_sq1_L_en;
+		public bool AUD_CTRL_sq2_L_en;
+		public bool AUD_CTRL_wave_L_en;
+		public bool AUD_CTRL_noise_L_en;
+		public bool AUD_CTRL_sq1_R_en;
+		public bool AUD_CTRL_sq2_R_en;
+		public bool AUD_CTRL_wave_R_en;
+		public bool AUD_CTRL_noise_R_en;
+		public bool AUD_CTRL_power;
+		public byte AUD_CTRL_vol_L;
+		public byte AUD_CTRL_vol_R;
+
+		public byte sample;
+
+		public uint master_audio_clock;
+
+		public int latched_sample_L, latched_sample_R;
+
+		public byte ReadReg(int addr)
+		{
+			byte ret = 0;
+
+			switch (addr)
+			{
+				case 0xFF10: ret = (byte)(Audio_Regs[NR10]); break; // NR10 (sweep)
+				case 0xFF11: ret = (byte)(Audio_Regs[NR11]); break; // NR11 (sound length / wave pattern duty %)
+				case 0xFF12: ret = (byte)(Audio_Regs[NR12]); break; // NR12 (envelope)
+				case 0xFF13: ret = (byte)(Audio_Regs[NR13]); break; // NR13 (freq low)
+			}
+
+			return ret;
+		}
+
+		public void WriteReg(int addr, byte value)
+		{
+
+		}
+
+		public void tick()
+		{
+
+			// add up components to each channel
+			int L_final = 0;
+			int R_final = 0;
+
+			if (AUD_CTRL_sq1_L_en) { L_final += 0; }
+
+
+			if (AUD_CTRL_sq1_R_en) { R_final += 0; }
+
+			L_final *= (AUD_CTRL_vol_L + 1) * 40;
+			R_final *= (AUD_CTRL_vol_R + 1) * 40;
+
+			if (L_final != latched_sample_L)
+			{
+			_blip_L.AddDelta(master_audio_clock, L_final - latched_sample_L);
+			latched_sample_L = L_final;
+			}
+
+			if (R_final != latched_sample_R)
+			{
+			_blip_R.AddDelta(master_audio_clock, R_final - latched_sample_R);
+			latched_sample_R = R_final;
+			}
+
+			master_audio_clock++;
+		}
+
+		public void power_off()
+		{
+			for (int i = 0; i < 0x16; i++)
+			{
+				WriteReg(0xFF10 + i, 0);
+			}
+		}
+
+		public void Reset()
+		{
+			Audio_Regs = new byte[21];
+
+			master_audio_clock = 0;
+
+			sample = 0;
+
+			_blip_L.SetRates(4194304, 44100);
+			_blip_R.SetRates(4194304, 44100);
+		}
+
+		public void SyncState(Serializer ser)
+		{
+			ser.Sync(nameof(Audio_Regs), ref Audio_Regs, false);
+
+			ser.Sync(nameof(master_audio_clock), ref master_audio_clock);
+
+			ser.Sync(nameof(sample), ref sample);
+			ser.Sync(nameof(latched_sample_L), ref latched_sample_L);
+			ser.Sync(nameof(latched_sample_R), ref latched_sample_R);
+
+			ser.Sync(nameof(AUD_CTRL_vin_L_en), ref AUD_CTRL_vin_L_en);
+			ser.Sync(nameof(AUD_CTRL_vin_R_en), ref AUD_CTRL_vin_R_en);
+			ser.Sync(nameof(AUD_CTRL_sq1_L_en), ref AUD_CTRL_sq1_L_en);
+			ser.Sync(nameof(AUD_CTRL_sq2_L_en), ref AUD_CTRL_sq2_L_en);
+			ser.Sync(nameof(AUD_CTRL_wave_L_en), ref AUD_CTRL_wave_L_en);
+			ser.Sync(nameof(AUD_CTRL_noise_L_en), ref AUD_CTRL_noise_L_en);
+			ser.Sync(nameof(AUD_CTRL_sq1_R_en), ref AUD_CTRL_sq1_R_en);
+			ser.Sync(nameof(AUD_CTRL_sq2_R_en), ref AUD_CTRL_sq2_R_en);
+			ser.Sync(nameof(AUD_CTRL_wave_R_en), ref AUD_CTRL_wave_R_en);
+			ser.Sync(nameof(AUD_CTRL_noise_R_en), ref AUD_CTRL_noise_R_en);
+			ser.Sync(nameof(AUD_CTRL_power), ref AUD_CTRL_power);
+			ser.Sync(nameof(AUD_CTRL_vol_L), ref AUD_CTRL_vol_L);
+			ser.Sync(nameof(AUD_CTRL_vol_R), ref AUD_CTRL_vol_R);
+		}
+
+		#region audio
+
+		public bool CanProvideAsync => false;
+
+		public void SetSyncMode(SyncSoundMode mode)
+		{
+			if (mode != SyncSoundMode.Sync)
+			{
+				throw new InvalidOperationException("Only Sync mode is supported_");
+			}
+		}
+
+		public SyncSoundMode SyncMode => SyncSoundMode.Sync;
+
+		public void GetSamplesSync(out short[] samples, out int nsamp)
+		{
+			_blip_L.EndFrame(master_audio_clock);
+			_blip_R.EndFrame(master_audio_clock);
+
+			nsamp = _blip_L.SamplesAvailable();
+
+			samples = new short[nsamp * 2];
+
+			if (nsamp != 0)
+			{
+				_blip_L.ReadSamplesLeft(samples, nsamp);
+				_blip_R.ReadSamplesRight(samples, nsamp);
+			}
+
+			master_audio_clock = 0;
+		}
+
+		public void GetSamplesAsync(short[] samples)
+		{
+			throw new NotSupportedException("Async is not available");
+		}
+
+		public void DiscardSamples()
+		{
+			_blip_L.Clear();
+			_blip_R.Clear();
+			master_audio_clock = 0;
+		}
+
+		private void GetSamples(short[] samples)
+		{
+
+		}
+
+		public void DisposeSound()
+		{
+			_blip_L.Clear();
+			_blip_R.Clear();
+			_blip_L.Dispose();
+			_blip_R.Dispose();
+			_blip_L = null;
+			_blip_R = null;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/HW_Registers.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/HW_Registers.cs
new file mode 100644
index 0000000000..3181a60936
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/HW_Registers.cs
@@ -0,0 +1,291 @@
+using System;
+using BizHawk.Common.NumberExtensions;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk
+	{
+		public byte Read_Registers(int addr)
+		{
+			byte ret = 0;
+
+			switch (addr)
+			{
+				// Read Input
+				case 0xFF00:
+					_islag = false;
+					ret = input_register;
+					break;
+
+				// Serial data port
+				case 0xFF01:
+					ret = serialport.ReadReg(addr);
+					break;
+
+				// Serial port control
+				case 0xFF02:
+					ret = serialport.ReadReg(addr);
+					break;
+
+				// Interrupt flags
+				case 0xFF0F:
+
+					break;
+
+				// audio regs
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+				case 0xFF1A:
+				case 0xFF1B:
+				case 0xFF1C:
+				case 0xFF1D:
+				case 0xFF1E:
+				case 0xFF20:
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+				case 0xFF3B:
+				case 0xFF3C:
+				case 0xFF3D:
+				case 0xFF3E:
+				case 0xFF3F:
+					ret = audio.ReadReg(addr);
+					break;
+
+				// PPU Regs
+				case 0xFF40:
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+				case 0xFF4A:
+				case 0xFF4B:
+					ret = ppu.ReadReg(addr);
+					break;
+
+				// Speed Control for GBC
+				case 0xFF4D:
+
+					break;
+
+				case 0xFF4F: // VBK
+
+					break;
+
+				// Bios control register. Not sure if it is readable
+				case 0xFF50:
+					ret = 0xFF;
+					break;
+
+				// PPU Regs for GBC
+				case 0xFF51:
+				case 0xFF52:
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+
+					break;
+
+				case 0xFF56:
+
+					break;
+
+				case 0xFF68:
+				case 0xFF69:
+				case 0xFF6A:
+				case 0xFF6B:
+
+					break;
+
+				// Speed Control for GBC
+				case 0xFF70:
+
+					break;
+
+				case 0xFF6C:
+				case 0xFF72:
+				case 0xFF73:
+				case 0xFF74:
+				case 0xFF75:
+				case 0xFF76:
+				case 0xFF77:
+
+					break;
+
+				// interrupt control register
+				case 0xFFFF:
+
+					break;
+
+				default:
+					ret = 0xFF;
+					break;
+
+			}
+			return ret;
+		}
+
+		public void Write_Registers(int addr, byte value)
+		{
+			switch (addr)
+			{
+				// select input
+				case 0xFF00:
+
+					break;
+
+				// Serial data port
+				case 0xFF01:
+					serialport.WriteReg(addr, value);
+					break;
+
+				// Serial port control
+				case 0xFF02:
+					serialport.WriteReg(addr, value);
+					break;
+
+				// Interrupt flags
+				case 0xFF0F:
+
+					break;
+
+				// audio regs
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+				case 0xFF1A:
+				case 0xFF1B:
+				case 0xFF1C:
+				case 0xFF1D:
+				case 0xFF1E:
+				case 0xFF20:
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+				case 0xFF3B:
+				case 0xFF3C:
+				case 0xFF3D:
+				case 0xFF3E:
+				case 0xFF3F:
+					audio.WriteReg(addr, value);
+					break;
+
+				// PPU Regs
+				case 0xFF40:
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+				case 0xFF4A:
+				case 0xFF4B:
+					ppu.WriteReg(addr, value);
+					break;
+
+				// GBC compatibility register (I think)
+				case 0xFF4C:
+
+					break;
+
+				// Speed Control for GBC
+				case 0xFF4D:
+
+					break;
+
+				// VBK
+				case 0xFF4F:
+
+					break;
+
+				// Bios control register. Writing 1 permanently disables BIOS until a power cycle occurs
+				case 0xFF50:
+		
+					break;
+
+				// PPU Regs for GBC
+				case 0xFF51:
+				case 0xFF52:
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+
+					break;
+
+				case 0xFF56:
+
+					break;
+
+				case 0xFF68:
+				case 0xFF69:
+				case 0xFF6A:
+				case 0xFF6B:
+					//if (GBC_compat)
+					//{
+						ppu.WriteReg(addr, value);
+					//}
+					break;
+
+				default:
+					Console.Write(addr);
+					Console.Write(" ");
+					Console.WriteLine(value);
+					break;
+			}
+		}
+
+		public void Register_Reset()
+		{
+			input_register = 0xCF; // not reading any input
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs
new file mode 100644
index 0000000000..0094f1d4da
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs
@@ -0,0 +1,64 @@
+using BizHawk.Common;
+using System;
+
+using BizHawk.Emulation.Common.Components.I8048;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public class MapperBase
+	{
+		public O2Hawk Core { get; set; }
+
+		public virtual byte ReadMemory(ushort addr)
+		{
+			return 0;
+		}
+
+		public virtual byte PeekMemory(ushort addr)
+		{
+			return 0;
+		}
+
+		public virtual void WriteMemory(ushort addr, byte value)
+		{
+		}
+
+		public virtual void PokeMemory(ushort addr, byte value)
+		{
+		}
+
+		public virtual void SyncState(Serializer ser)
+		{
+		}
+
+		public virtual void Dispose()
+		{
+		}
+
+		public virtual void Initialize()
+		{
+		}
+
+		public virtual void Mapper_Tick()
+		{
+		}
+
+		public virtual void RTC_Get(int value, int index)
+		{
+		}
+
+		public virtual void MapCDL(ushort addr, I8048.eCDLogMemFlags flags)
+		{
+		}
+
+		protected void SetCDLROM(I8048.eCDLogMemFlags flags, int cdladdr)
+		{
+			Core.SetCDL(flags, "ROM", cdladdr);
+		}
+
+		protected void SetCDLRAM(I8048.eCDLogMemFlags flags, int cdladdr)
+		{
+			Core.SetCDL(flags, "CartRAM", cdladdr);
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs
new file mode 100644
index 0000000000..657c02779f
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs
@@ -0,0 +1,80 @@
+using BizHawk.Common;
+using BizHawk.Common.NumberExtensions;
+using System;
+
+using BizHawk.Emulation.Common.Components.I8048;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	// Default mapper with no bank switching
+	public class MapperDefault : MapperBase
+	{
+		public override void Initialize()
+		{
+			// nothing to initialize
+		}
+
+		public override byte ReadMemory(ushort addr)
+		{
+			if (addr < 0x8000)
+			{
+				return Core._rom[addr];
+			}
+			else
+			{
+				if (Core.cart_RAM != null)
+				{
+					return Core.cart_RAM[addr - 0xA000];
+				}
+				else
+				{
+					return 0;
+				}
+			}
+		}
+
+		public override void MapCDL(ushort addr, I8048.eCDLogMemFlags flags)
+		{
+			if (addr < 0x8000)
+			{
+				SetCDLROM(flags, addr);
+			}
+			else
+			{
+				if (Core.cart_RAM != null)
+				{
+					SetCDLRAM(flags, addr - 0xA000);
+				}
+				else
+				{
+					return;
+				}
+			}
+		}
+
+		public override byte PeekMemory(ushort addr)
+		{
+			return ReadMemory(addr);
+		}
+
+		public override void WriteMemory(ushort addr, byte value)
+		{
+			if (addr < 0x8000)
+			{
+				// no mapping hardware available
+			}
+			else
+			{
+				if (Core.cart_RAM != null)
+				{
+					Core.cart_RAM[addr - 0xA000] = value;
+				}
+			}
+		}
+
+		public override void PokeMemory(ushort addr, byte value)
+		{
+			WriteMemory(addr, value);
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/ReadMe.txt b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/ReadMe.txt
new file mode 100644
index 0000000000..0c94c8272c
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/ReadMe.txt
@@ -0,0 +1,3 @@
+TODO: 
+Official Mappers
+Unofficial Mappers
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs
new file mode 100644
index 0000000000..ac20bf4d07
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs
@@ -0,0 +1,59 @@
+using System;
+
+using BizHawk.Common.BufferExtensions;
+using BizHawk.Emulation.Common;
+
+/*
+	$0400-$0FFF    Cartridge (Only 2K accessible, bit 10 not mapped to cart)
+	$0000-$03FF    BIOS
+*/
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk
+	{
+		public byte ReadMemory(ushort addr)
+		{
+			uint flags = (uint)(MemoryCallbackFlags.AccessRead);
+			MemoryCallbacks.CallMemoryCallbacks(addr, 0, flags, "System Bus");
+			addr_access = addr;
+			
+			if (addr < 0x400)
+			{
+				return _bios[addr];
+			}
+			else
+			{
+				return mapper.ReadMemory(addr);
+			}
+		}
+
+		public void WriteMemory(ushort addr, byte value)
+		{
+			uint flags = (uint)(MemoryCallbackFlags.AccessWrite);
+			MemoryCallbacks.CallMemoryCallbacks(addr, value, flags, "System Bus");
+			addr_access = addr;
+
+			if (addr < 0x400)
+			{
+
+			}
+			else
+			{
+				mapper.WriteMemory(addr, value);
+			}
+		}
+
+		public byte PeekMemory(ushort addr)
+		{
+			if (addr < 0x400)
+			{
+				return _bios[addr];
+			}
+			else
+			{
+				return mapper.PeekMemory(addr);
+			}
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ICodeDataLog.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ICodeDataLog.cs
new file mode 100644
index 0000000000..ac77428216
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ICodeDataLog.cs
@@ -0,0 +1,64 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+
+using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Common.Components.I8048;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk : ICodeDataLogger
+	{
+		private ICodeDataLog _cdl;
+
+		public void SetCDL(ICodeDataLog cdl)
+		{
+			_cdl = cdl;
+			if (cdl == null)
+				this.cpu.CDLCallback = null;
+			else this.cpu.CDLCallback = CDLCpuCallback;
+		}
+
+		public void NewCDL(ICodeDataLog cdl)
+		{
+			cdl["ROM"] = new byte[MemoryDomains["ROM"].Size];
+			cdl["HRAM"] = new byte[MemoryDomains["Zero Page RAM"].Size];
+
+			cdl["WRAM"] = new byte[MemoryDomains["Main RAM"].Size];
+
+			if (MemoryDomains.Has("Cart RAM"))
+			{
+				cdl["CartRAM"] = new byte[MemoryDomains["Cart RAM"].Size];
+			}
+
+			cdl.SubType = "O2";
+			cdl.SubVer = 0;
+		}
+
+		[FeatureNotImplemented]
+		void ICodeDataLogger.DisassembleCDL(Stream s, ICodeDataLog cdl)
+		{
+		}
+
+		public void SetCDL(I8048.eCDLogMemFlags flags, string type, int cdladdr)
+		{
+			if (type == null) return;
+			byte val = (byte)flags;
+			_cdl[type][cdladdr] |= (byte)flags;
+		}
+
+		void CDLCpuCallback(ushort addr, I8048.eCDLogMemFlags flags)
+		{
+
+			if (addr < 0x400)
+			{
+
+			}
+			else
+			{
+				mapper.MapCDL(addr, flags);
+				return;
+			}
+		}	
+	}
+}
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IDebuggable.cs
new file mode 100644
index 0000000000..45f9f3e543
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IDebuggable.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk : IDebuggable
+	{
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
+		{
+			return new Dictionary<string, RegisterValue>
+			{
+				/*
+				["A"] = cpu.A,
+				["X"] = cpu.X,
+				["Y"] = cpu.Y,
+				["S"] = cpu.S,
+				["PC"] = cpu.PC,
+				["Flag C"] = cpu.FlagC,
+				["Flag Z"] = cpu.FlagZ,
+				["Flag I"] = cpu.FlagI,
+				["Flag D"] = cpu.FlagD,
+				["Flag B"] = cpu.FlagB,
+				["Flag V"] = cpu.FlagV,
+				["Flag N"] = cpu.FlagN,
+				["Flag T"] = cpu.FlagT
+				*/
+			};
+		}
+
+		public void SetCpuRegister(string register, int value)
+		{
+			switch (register)
+			{
+				default:
+					throw new InvalidOperationException();
+				case "A":
+					//cpu.A = (byte)value;
+					break;
+				case "X":
+					//cpu.X = (byte)value;
+					break;
+				case "Y":
+					//cpu.Y = (byte)value;
+					break;
+				case "S":
+					//cpu.S = (byte)value;
+					break;
+				case "PC":
+					//cpu.PC = (ushort)value;
+					break;
+				case "Flag I":
+					//cpu.FlagI = value > 0;
+					break;
+			}
+		}
+
+		public IMemoryCallbackSystem MemoryCallbacks { get; } = new MemoryCallbackSystem(new[] { "System Bus" });
+
+		public bool CanStep(StepType type)
+		{
+			return false;
+		}
+
+		[FeatureNotImplemented]
+		public void Step(StepType type)
+		{
+			throw new NotImplementedException();
+		}
+
+		public long TotalExecutedCycles
+		{
+			get { return (long)cpu.TotalExecutedCycles; }
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs
new file mode 100644
index 0000000000..c9452702a4
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs
@@ -0,0 +1,197 @@
+using BizHawk.Common.NumberExtensions;
+using BizHawk.Emulation.Common;
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk : IEmulator, IVideoProvider
+	{
+		public IEmulatorServiceProvider ServiceProvider { get; }
+
+		public ControllerDefinition ControllerDefinition => _controllerDeck.Definition;
+
+		public byte controller_state;
+		public ushort Acc_X_state;
+		public ushort Acc_Y_state;
+		public bool in_vblank_old;
+		public bool in_vblank;
+		public bool vblank_rise;
+
+		public bool FrameAdvance(IController controller, bool render, bool rendersound)
+		{
+			//Console.WriteLine("-----------------------FRAME-----------------------");
+
+			if (_tracer.Enabled)
+			{
+				cpu.TraceCallback = s => _tracer.Put(s);
+			}
+			else
+			{
+				cpu.TraceCallback = null;
+			}
+
+			_frame++;
+
+			if (controller.IsPressed("Power"))
+			{
+				HardReset();
+			}
+
+			_islag = true;
+
+			do_frame(controller);
+
+			if (_islag)
+			{
+				_lagcount++;
+			}
+
+			return true;
+		}
+
+		public void do_frame(IController controller)
+		{
+			for (int i = 0; i < 70224; i++)
+			{
+				audio.tick();
+				ppu.tick();
+				ppu.DMA_tick();
+				serialport.serial_transfer_tick();
+				cpu.ExecuteOne();
+
+				if (in_vblank && !in_vblank_old)
+				{
+					// update the controller state on VBlank
+					GetControllerState(controller);
+
+					// check if controller state caused interrupt
+					do_controller_check();
+
+					// send the image on VBlank
+					SendVideoBuffer();
+				}
+
+				in_vblank_old = in_vblank;
+			}
+
+			// turn off the screen so the image doesnt persist
+			// but dont turn off blank_frame yet, it still needs to be true until the next VBL
+			// this doesn't run for GBC, some games, ex MIB the series 2, rely on the screens persistence while off to make video look smooth.
+			// But some GB gams, ex Battletoads, turn off the screen for a long time from the middle of the frame, so need to be cleared.
+			if (ppu.clear_screen)
+			{
+				for (int j = 0; j < frame_buffer.Length; j++) { frame_buffer[j] = (int)color_palette[0]; }
+				ppu.clear_screen = false;
+			}
+		}
+
+		public void do_single_step()
+		{
+			audio.tick();
+			ppu.tick();
+			ppu.DMA_tick();
+			serialport.serial_transfer_tick();
+			cpu.ExecuteOne();
+		}
+
+		public void do_controller_check()
+		{
+			// check if new input changed the input register and triggered IRQ
+			byte contr_prev = input_register;
+
+			input_register &= 0xF0;
+			if ((input_register & 0x30) == 0x20)
+			{
+				input_register |= (byte)(controller_state & 0xF);
+			}
+			else if ((input_register & 0x30) == 0x10)
+			{
+				input_register |= (byte)((controller_state & 0xF0) >> 4);
+			}
+			else if ((input_register & 0x30) == 0x00)
+			{
+				// if both polls are set, then a bit is zero if either or both pins are zero
+				byte temp = (byte)((controller_state & 0xF) & ((controller_state & 0xF0) >> 4));
+				input_register |= temp;
+			}
+			else
+			{
+				input_register |= 0xF;
+			}
+		}
+
+		public void GetControllerState(IController controller)
+		{
+			InputCallbacks.Call();
+			controller_state = _controllerDeck.ReadPort1(controller);
+
+			Acc_X_state = _controllerDeck.ReadAccX1(controller);
+			Acc_Y_state = _controllerDeck.ReadAccY1(controller);
+		}
+
+		public int Frame => _frame;
+
+		public string SystemId => "O2";
+
+		public bool DeterministicEmulation { get; set; }
+
+		public void ResetCounters()
+		{
+			_frame = 0;
+			_lagcount = 0;
+			_islag = false;
+		}
+
+		public CoreComm CoreComm { get; }
+
+		public void Dispose()
+		{
+			audio.DisposeSound();
+		}
+
+		#region Video provider
+
+		public int _frameHz = 60;
+
+		public int[] _vidbuffer;
+
+		public int[] frame_buffer;
+
+		public int[] GetVideoBuffer()
+		{
+			return frame_buffer;
+		}
+
+		public void SendVideoBuffer()
+		{
+			if (ppu.blank_frame)
+			{
+				for (int i = 0; i < _vidbuffer.Length; i++)
+				{
+					_vidbuffer[i] = (int)color_palette[0];
+				}
+			}
+
+			for (int j = 0; j < frame_buffer.Length; j++) { frame_buffer[j] = _vidbuffer[j]; }
+
+			ppu.blank_frame = false;
+		}
+
+		public int VirtualWidth => 160;
+		public int VirtualHeight => 144;
+		public int BufferWidth => 160;
+		public int BufferHeight => 144;
+		public int BackgroundColor => unchecked((int)0xFF000000);
+		public int VsyncNumerator => _frameHz;
+		public int VsyncDenominator => 1;
+
+		public static readonly uint[] color_palette_BW = { 0xFFFFFFFF , 0xFFAAAAAA, 0xFF555555, 0xFF000000 };
+		public static readonly uint[] color_palette_Gr = { 0xFFA4C505, 0xFF88A905, 0xFF1D551D, 0xFF052505 };
+
+		public uint[] color_palette = new uint[4];
+
+		#endregion
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IInputPollable.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IInputPollable.cs
new file mode 100644
index 0000000000..252cf6418d
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IInputPollable.cs
@@ -0,0 +1,24 @@
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk : IInputPollable
+	{
+		public int LagCount
+		{
+			get { return _lagcount; }
+			set { _lagcount = value; }
+		}
+
+		public bool IsLagFrame
+		{
+			get { return _islag; }
+			set { _islag = value; }
+		}
+
+		public IInputCallbackSystem InputCallbacks { get; } = new InputCallbackSystem();
+
+		public bool _islag = true;
+		private int _lagcount;
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IMemoryDomains.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IMemoryDomains.cs
new file mode 100644
index 0000000000..24f66c0ec1
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IMemoryDomains.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk
+	{
+		private IMemoryDomains MemoryDomains;
+
+		public void SetupMemoryDomains()
+		{
+			var domains = new List<MemoryDomain>
+			{
+				new MemoryDomainDelegate(
+					"Main RAM",
+					RAM.Length,
+					MemoryDomain.Endian.Little,
+					addr => RAM[addr],
+					(addr, value) => RAM[addr] = value,
+					1),
+				new MemoryDomainDelegate(
+					"System Bus",
+					0X1000,
+					MemoryDomain.Endian.Little,
+					addr => PeekSystemBus(addr),
+					(addr, value) => PokeSystemBus(addr, value),
+					1),
+				new MemoryDomainDelegate(
+					"ROM",
+					_rom.Length,
+					MemoryDomain.Endian.Little,
+					addr => _rom[addr],
+					(addr, value) => _rom[addr] = value,
+					1),
+				new MemoryDomainDelegate(
+					"VRAM",
+					VRAM.Length,
+					MemoryDomain.Endian.Little,
+					addr => VRAM[addr],
+					(addr, value) => VRAM[addr] = value,
+					1)
+			};
+
+			if (cart_RAM != null)
+			{
+				var CartRam = new MemoryDomainByteArray("Cart RAM", MemoryDomain.Endian.Little, cart_RAM, true, 1);
+				domains.Add(CartRam);
+			}
+
+			MemoryDomains = new MemoryDomainList(domains);
+			(ServiceProvider as BasicServiceProvider).Register<IMemoryDomains>(MemoryDomains);
+		}
+
+		private byte PeekSystemBus(long addr)
+		{
+			ushort addr2 = (ushort)(addr & 0xFFF);
+			return PeekMemory(addr2);
+		}
+
+		private void PokeSystemBus(long addr, byte value)
+		{
+			ushort addr2 = (ushort)(addr & 0xFFF);
+			WriteMemory(addr2, value);
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISaveRam.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISaveRam.cs
new file mode 100644
index 0000000000..130f51b497
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISaveRam.cs
@@ -0,0 +1,37 @@
+using System;
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk : ISaveRam
+	{
+		public byte[] CloneSaveRam()
+		{
+			if (cart_RAM != null)
+			{
+				return (byte[])cart_RAM.Clone();
+			}
+			else
+			{
+				return null;
+			}
+		}
+
+		public void StoreSaveRam(byte[] data)
+		{
+			if (_syncSettings.Use_SRAM)
+			{
+				Buffer.BlockCopy(data, 0, cart_RAM, 0, data.Length);
+				Console.WriteLine("loading SRAM here");
+			}
+		}
+
+		public bool SaveRamModified
+		{
+			get 
+			{
+				return has_bat & _syncSettings.Use_SRAM;
+			}	
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISettable.cs
new file mode 100644
index 0000000000..11025b254a
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISettable.cs
@@ -0,0 +1,92 @@
+using System;
+using System.ComponentModel;
+
+using Newtonsoft.Json;
+
+using BizHawk.Common;
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk : IEmulator, IStatable, ISettable<O2Hawk.O2Settings, O2Hawk.O2SyncSettings>
+	{
+		public O2Settings GetSettings()
+		{
+			return _settings.Clone();
+		}
+
+		public O2SyncSettings GetSyncSettings()
+		{
+			return _syncSettings.Clone();
+		}
+
+		public bool PutSettings(O2Settings o)
+		{
+			_settings = o;
+			return false;
+		}
+
+		public bool PutSyncSettings(O2SyncSettings o)
+		{
+			bool ret = O2SyncSettings.NeedsReboot(_syncSettings, o);
+			_syncSettings = o;
+			return ret;
+		}
+
+		private O2Settings _settings = new O2Settings();
+		public O2SyncSettings _syncSettings = new O2SyncSettings();
+
+		public class O2Settings
+		{
+			public O2Settings Clone()
+			{
+				return (O2Settings)MemberwiseClone();
+			}
+		}
+
+		public class O2SyncSettings
+		{
+			[JsonIgnore]
+			public string Port1 = O2HawkControllerDeck.DefaultControllerName;
+
+			public enum ControllerType
+			{
+				Default,
+				Tilt
+			}
+
+			[JsonIgnore]
+			private ControllerType _O2Controller;
+
+			[DisplayName("Controller")]
+			[Description("Select Controller Type")]
+			[DefaultValue(ControllerType.Default)]
+			public ControllerType O2Controller
+			{
+				get { return _O2Controller; }
+				set
+				{
+					if (value == ControllerType.Default) { Port1 = O2HawkControllerDeck.DefaultControllerName; }
+					else { Port1 = "Gameboy Controller + Tilt"; }
+
+					_O2Controller = value;
+				}
+			}
+
+			[DisplayName("Use Existing SaveRAM")]
+			[Description("When true, existing SaveRAM will be loaded at boot up")]
+			[DefaultValue(false)]
+			public bool Use_SRAM { get; set; }
+
+			public O2SyncSettings Clone()
+			{
+				return (O2SyncSettings)MemberwiseClone();
+			}
+
+			public static bool NeedsReboot(O2SyncSettings x, O2SyncSettings y)
+			{
+				return !DeepEquality.DeepEquals(x, y);
+			}
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs
new file mode 100644
index 0000000000..5d1f0b840f
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs
@@ -0,0 +1,91 @@
+using System.IO;
+
+using BizHawk.Common;
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public partial class O2Hawk : IStatable
+	{
+		public bool BinarySaveStatesPreferred => true;
+
+		public void SaveStateText(TextWriter writer)
+		{
+			SyncState(new Serializer(writer));
+		}
+
+		public void LoadStateText(TextReader reader)
+		{
+			SyncState(new Serializer(reader));
+		}
+
+		public void SaveStateBinary(BinaryWriter bw)
+		{
+			SyncState(new Serializer(bw));
+		}
+
+		public void LoadStateBinary(BinaryReader br)
+		{
+			SyncState(new Serializer(br));
+		}
+
+		public byte[] SaveStateBinary()
+		{
+			MemoryStream ms = new MemoryStream();
+			BinaryWriter bw = new BinaryWriter(ms);
+			SaveStateBinary(bw);
+			bw.Flush();
+			return ms.ToArray();
+		}
+
+		private void SyncState(Serializer ser)
+		{
+			byte[] core = null;
+			if (ser.IsWriter)
+			{
+				var ms = new MemoryStream();
+				ms.Close();
+				core = ms.ToArray();
+			}
+			cpu.SyncState(ser);
+			mapper.SyncState(ser);
+			ppu.SyncState(ser);
+			serialport.SyncState(ser);
+			audio.SyncState(ser);
+
+			ser.BeginSection("Odyssey2");
+			ser.Sync(nameof(core), ref core, false);
+			ser.Sync("Lag", ref _lagcount);
+			ser.Sync("Frame", ref _frame);
+			ser.Sync("IsLag", ref _islag);
+			_controllerDeck.SyncState(ser);
+
+			ser.Sync(nameof(controller_state), ref controller_state);
+			ser.Sync(nameof(Acc_X_state), ref Acc_X_state);
+			ser.Sync(nameof(Acc_Y_state), ref Acc_Y_state);
+			ser.Sync(nameof(in_vblank), ref in_vblank);
+			ser.Sync(nameof(in_vblank_old), ref in_vblank_old);	
+			ser.Sync(nameof(vblank_rise), ref vblank_rise);
+			ser.Sync(nameof(input_register), ref input_register);
+
+			// memory domains
+			ser.Sync(nameof(RAM), ref RAM, false);
+			ser.Sync(nameof(VRAM), ref VRAM, false);
+			ser.Sync(nameof(OAM), ref OAM, false);
+			ser.Sync(nameof(_bios), ref _bios, false);
+			ser.Sync(nameof(RAM_Bank), ref RAM_Bank);
+			ser.Sync(nameof(addr_access), ref addr_access);
+
+			ser.Sync(nameof(frame_buffer), ref frame_buffer, false);
+			ser.Sync(nameof(_vidbuffer), ref _vidbuffer, false);
+
+			// probably a better way to do this
+			if (cart_RAM != null)
+			{
+				ser.Sync(nameof(cart_RAM), ref cart_RAM, false);
+			}
+
+			ser.EndSection();
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs
new file mode 100644
index 0000000000..39a4593eb3
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs
@@ -0,0 +1,144 @@
+using System;
+
+using BizHawk.Common.BufferExtensions;
+using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Common.Components.I8048;
+
+using System.Runtime.InteropServices;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	[Core(
+		"O2Hawk",
+		"",
+		isPorted: false,
+		isReleased: false)]
+	[ServiceNotApplicable(typeof(IDriveLight))]
+	public partial class O2Hawk : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ISettable<O2Hawk.O2Settings, O2Hawk.O2SyncSettings>
+	{
+		public byte input_register;
+
+		// memory domains
+		public byte[] RAM = new byte[0x80];
+
+		public byte[] VRAM = new byte[0x4000];
+		public byte[] OAM = new byte[0xA0];
+
+		public int RAM_Bank;
+
+		public byte[] _bios;
+		public readonly byte[] _rom;		
+		public readonly byte[] header = new byte[0x50];
+
+		public byte[] cart_RAM;
+		public bool has_bat;
+
+		private int _frame = 0;
+
+		public ushort addr_access;
+
+		public MapperBase mapper;
+
+		private readonly ITraceable _tracer;
+
+		public I8048 cpu;
+		public PPU ppu;
+		public Audio audio;
+		public SerialPort serialport;
+
+		[CoreConstructor("O2")]
+		public O2Hawk(CoreComm comm, GameInfo game, byte[] rom, /*string gameDbFn,*/ object settings, object syncSettings)
+		{
+			var ser = new BasicServiceProvider(this);
+
+			cpu = new I8048
+			{
+				ReadMemory = ReadMemory,
+				WriteMemory = WriteMemory,
+				PeekMemory = PeekMemory,
+				DummyReadMemory = ReadMemory,
+				OnExecFetch = ExecFetch,
+			};
+			
+			audio = new Audio();
+			serialport = new SerialPort();
+
+			CoreComm = comm;
+
+			_settings = (O2Settings)settings ?? new O2Settings();
+			_syncSettings = (O2SyncSettings)syncSettings ?? new O2SyncSettings();
+			_controllerDeck = new O2HawkControllerDeck(_syncSettings.Port1);
+
+			byte[] Bios = null;
+
+			Bios = comm.CoreFileProvider.GetFirmware("O2", "World", true, "BIOS Not Found, Cannot Load");
+			ppu = new PPU();
+
+			if (Bios == null)
+			{
+				throw new MissingFirmwareException("Missing Odyssey2 Bios");
+			}
+
+			_bios = Bios;
+
+			Buffer.BlockCopy(rom, 0x100, header, 0, 0x50);
+
+			Console.WriteLine("MD5: " + rom.HashMD5(0, rom.Length));
+			Console.WriteLine("SHA1: " + rom.HashSHA1(0, rom.Length));
+			_rom = rom;
+			Setup_Mapper();
+
+			_frameHz = 60;
+
+			audio.Core = this;
+			ppu.Core = this;
+			serialport.Core = this;
+
+			ser.Register<IVideoProvider>(this);
+			ser.Register<ISoundProvider>(audio);
+			ServiceProvider = ser;
+
+			_settings = (O2Settings)settings ?? new O2Settings();
+			_syncSettings = (O2SyncSettings)syncSettings ?? new O2SyncSettings();
+
+			_tracer = new TraceBuffer { Header = cpu.TraceHeader };
+			ser.Register<ITraceable>(_tracer);
+
+			SetupMemoryDomains();
+			HardReset();
+		}
+
+		public DisplayType Region => DisplayType.NTSC;
+
+		private readonly O2HawkControllerDeck _controllerDeck;
+
+		public void HardReset()
+		{
+			in_vblank = true; // we start off in vblank since the LCD is off
+			in_vblank_old = true;
+
+			RAM_Bank = 1; // RAM bank always starts as 1 (even writing zero still sets 1)
+
+			Register_Reset();
+			ppu.Reset();
+			audio.Reset();
+			serialport.Reset();
+
+			cpu.SetCallbacks(ReadMemory, PeekMemory, PeekMemory, WriteMemory);
+
+			_vidbuffer = new int[VirtualWidth * VirtualHeight];
+			frame_buffer = new int[VirtualWidth * VirtualHeight];
+		}
+
+		private void ExecFetch(ushort addr)
+		{
+			uint flags = (uint)(MemoryCallbackFlags.AccessRead);
+			MemoryCallbacks.CallMemoryCallbacks(addr, 0, flags, "System Bus");
+		}
+
+		private void Setup_Mapper()
+		{
+
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllerDeck.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllerDeck.cs
new file mode 100644
index 0000000000..83c92a6f2c
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllerDeck.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using BizHawk.Common;
+using BizHawk.Common.ReflectionExtensions;
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public class O2HawkControllerDeck
+	{
+		public O2HawkControllerDeck(string controller1Name)
+		{
+			if (!ValidControllerTypes.ContainsKey(controller1Name))
+			{
+				throw new InvalidOperationException("Invalid controller type: " + controller1Name);
+			}
+
+			Port1 = (IPort)Activator.CreateInstance(ValidControllerTypes[controller1Name], 1);
+
+			Definition = new ControllerDefinition
+			{
+				Name = Port1.Definition.Name,
+				BoolButtons = Port1.Definition.BoolButtons
+					.ToList()
+			};
+
+			Definition.FloatControls.AddRange(Port1.Definition.FloatControls);
+
+			Definition.FloatRanges.AddRange(Port1.Definition.FloatRanges);
+		}
+
+		public byte ReadPort1(IController c)
+		{
+			return Port1.Read(c);
+		}
+
+		public ushort ReadAccX1(IController c)
+		{
+			return Port1.ReadAccX(c);
+		}
+
+		public ushort ReadAccY1(IController c)
+		{
+			return Port1.ReadAccY(c);
+		}
+
+		public ControllerDefinition Definition { get; }
+
+		public void SyncState(Serializer ser)
+		{
+			ser.BeginSection(nameof(Port1));
+			Port1.SyncState(ser);
+			ser.EndSection();
+		}
+
+		private readonly IPort Port1;
+
+		private static Dictionary<string, Type> _controllerTypes;
+
+		public static Dictionary<string, Type> ValidControllerTypes
+		{
+			get
+			{
+				if (_controllerTypes == null)
+				{
+					_controllerTypes = typeof(O2HawkControllerDeck).Assembly
+						.GetTypes()
+						.Where(t => typeof(IPort).IsAssignableFrom(t))
+						.Where(t => !t.IsAbstract && !t.IsInterface)
+						.ToDictionary(tkey => tkey.DisplayName());
+				}
+
+				return _controllerTypes;
+			}
+		}
+
+		public static string DefaultControllerName => typeof(StandardControls).DisplayName();
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllers.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllers.cs
new file mode 100644
index 0000000000..8af8abcdd9
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllers.cs
@@ -0,0 +1,217 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+using BizHawk.Common;
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	/// <summary>
+	/// Represents a O2 add on
+	/// </summary>
+	public interface IPort
+	{
+		byte Read(IController c);
+
+		ushort ReadAccX(IController c);
+
+		ushort ReadAccY(IController c);
+
+		ControllerDefinition Definition { get; }
+
+		void SyncState(Serializer ser);
+
+		int PortNum { get; }
+	}
+
+	[DisplayName("Gameboy Controller")]
+	public class StandardControls : IPort
+	{
+		public StandardControls(int portNum)
+		{
+			PortNum = portNum;
+			Definition = new ControllerDefinition
+			{
+				Name = "Gameboy Controller H",
+				BoolButtons = BaseDefinition
+				.Select(b => "P" + PortNum + " " + b)
+				.ToList()
+			};
+		}
+
+		public int PortNum { get; }
+
+		public ControllerDefinition Definition { get; }
+
+		public byte Read(IController c)
+		{
+			byte result = 0xFF;
+
+			if (c.IsPressed(Definition.BoolButtons[0]))
+			{
+				result -= 4;
+			}
+			if (c.IsPressed(Definition.BoolButtons[1]))
+			{
+				result -= 8;
+			}
+			if (c.IsPressed(Definition.BoolButtons[2]))
+			{
+				result -= 2;
+			}
+			if (c.IsPressed(Definition.BoolButtons[3]))
+			{
+				result -= 1;
+			}
+			if (c.IsPressed(Definition.BoolButtons[4]))
+			{
+				result -= 128;
+			}
+			if (c.IsPressed(Definition.BoolButtons[5]))
+			{
+				result -= 64;
+			}
+			if (c.IsPressed(Definition.BoolButtons[6]))
+			{
+				result -= 32;
+			}
+			if (c.IsPressed(Definition.BoolButtons[7]))
+			{
+				result -= 16;
+			}
+
+			return result;
+		}
+
+		public ushort ReadAccX(IController c)
+		{
+			return 0;
+		}
+
+		public ushort ReadAccY(IController c)
+		{
+			return 0;
+		}
+
+		private static readonly string[] BaseDefinition =
+		{
+			"Up", "Down", "Left", "Right", "Start", "Select", "B", "A", "Power"
+		};
+
+		public void SyncState(Serializer ser)
+		{
+			//nothing
+		}
+	}
+
+	[DisplayName("Gameboy Controller + Tilt")]
+	public class StandardTilt : IPort
+	{
+		public StandardTilt(int portNum)
+		{
+			PortNum = portNum;
+			Definition = new ControllerDefinition
+			{
+				Name = "Gameboy Controller + Tilt",
+				BoolButtons = BaseDefinition
+				.Select(b => "P" + PortNum + " " + b)
+				.ToList(),
+				FloatControls = { "P" + PortNum + " Tilt X", "P" + PortNum + " Tilt Y" },
+				FloatRanges = { new[] { -45.0f, 0, 45.0f }, new[] { -45.0f, 0, 45.0f } }
+			};
+		}
+
+		public int PortNum { get; }
+
+		public float theta, phi, theta_prev, phi_prev; 
+
+		public ControllerDefinition Definition { get; }
+
+		public byte Read(IController c)
+		{
+			byte result = 0xFF;
+
+			if (c.IsPressed(Definition.BoolButtons[0]))
+			{
+				result -= 4;
+			}
+			if (c.IsPressed(Definition.BoolButtons[1]))
+			{
+				result -= 8;
+			}
+			if (c.IsPressed(Definition.BoolButtons[2]))
+			{
+				result -= 2;
+			}
+			if (c.IsPressed(Definition.BoolButtons[3]))
+			{
+				result -= 1;
+			}
+			if (c.IsPressed(Definition.BoolButtons[4]))
+			{
+				result -= 128;
+			}
+			if (c.IsPressed(Definition.BoolButtons[5]))
+			{
+				result -= 64;
+			}
+			if (c.IsPressed(Definition.BoolButtons[6]))
+			{
+				result -= 32;
+			}
+			if (c.IsPressed(Definition.BoolButtons[7]))
+			{
+				result -= 16;
+			}
+
+			return result;
+		}
+
+		// acc x is the result of rotating around body y AFTER rotating around body x
+		// therefore this control scheme gives decreasing sensitivity in X as Y rotation inscreases 
+		public ushort ReadAccX(IController c)
+		{
+			theta_prev = theta;
+			phi_prev = phi;
+
+			theta = (float)(c.GetFloat(Definition.FloatControls[1]) * Math.PI / 180.0);
+			phi = (float)(c.GetFloat(Definition.FloatControls[0]) * Math.PI / 180.0);
+
+			float temp = (float)(Math.Cos(theta) * Math.Sin(phi));
+
+			// here we add in rates of change parameters. 
+			// a typical rate of change for a fast rotation is guessed at 0.5 rad / frame
+			// since rotations about X have less of a moment arm compared to by, we take 1/5 of the effect as a baseline
+			float temp2 = (float)((phi - phi_prev) / 0.5 * 25);
+
+			return (ushort)(0x81D0 - Math.Floor(temp * 125) - temp2);
+		}
+
+		// acc y is just the sine of the angle
+		// we assume that ReadAccX is called first, which updates the the states 
+		public ushort ReadAccY(IController c)
+		{
+			float temp = (float)Math.Sin(theta);
+
+			// here we add in rates of change parameters. 
+			// a typical rate of change for a fast rotation is guessed at 0.5 rad / frame
+			// further it will be assumed that the resulting acceleration is roughly eqvuivalent to gravity
+			float temp2 = (float)((theta - theta_prev)/0.5 * 125);
+
+			return (ushort)(0x81D0 - Math.Floor(temp * 125) + temp2);			
+		}
+
+		private static readonly string[] BaseDefinition =
+		{
+			"Up", "Down", "Left", "Right", "Start", "Select", "B", "A", "Power"
+		};
+
+		public void SyncState(Serializer ser)
+		{
+			// since we need rate of change of angle, need to savestate them
+			ser.Sync(nameof(theta), ref theta);
+		}
+	}
+}
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs
new file mode 100644
index 0000000000..9fd91d3c11
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs
@@ -0,0 +1,338 @@
+using System;
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public class PPU
+	{
+		public O2Hawk Core { get; set; }
+
+		public uint[] BG_palette = new uint[32];
+		public uint[] OBJ_palette = new uint[32];
+
+		public bool HDMA_active;
+		public bool clear_screen;
+
+		// register variables
+		public byte LCDC;
+		public byte STAT;
+		public byte scroll_y;
+		public byte scroll_x;
+		public byte LY;
+		public byte LY_actual;
+		public byte LY_inc;
+		public byte LYC;
+		public byte DMA_addr;
+		public byte BGP;
+		public byte obj_pal_0;
+		public byte obj_pal_1;
+		public byte window_y;
+		public byte window_x;
+		public bool DMA_start;
+		public int DMA_clock;
+		public int DMA_inc;
+		public byte DMA_byte;
+
+		// state variables
+		public int cycle;
+		public bool LYC_INT;
+		public bool HBL_INT;
+		public bool VBL_INT;
+		public bool OAM_INT;
+		public bool LCD_was_off;
+		public bool stat_line;
+		public bool stat_line_old;
+		// OAM scan
+		public bool DMA_OAM_access;
+		public bool OAM_access_read;
+		public bool OAM_access_write;
+		public int OAM_scan_index;
+		public int SL_sprites_index;
+		public int[] SL_sprites = new int[40];
+		public int write_sprite;
+		public bool no_scan;
+		// render
+		public bool VRAM_access_read;
+		public bool VRAM_access_write;
+		public int read_case;
+		public int internal_cycle;
+		public int y_tile;
+		public int y_scroll_offset;
+		public int x_tile;
+		public int x_scroll_offset;
+		public int tile_byte;
+		public int sprite_fetch_cycles;
+		public bool fetch_sprite;
+		public bool going_to_fetch;
+		public bool first_fetch;
+		public int sprite_fetch_counter;
+		public byte[] sprite_attr_list = new byte[160];
+		public byte[] sprite_pixel_list = new byte[160];
+		public byte[] sprite_present_list = new byte[160];
+		public int temp_fetch;
+		public int tile_inc;
+		public bool pre_render;
+		public bool pre_render_2;
+		public byte[] tile_data = new byte[3];
+		public byte[] tile_data_latch = new byte[3];
+		public int latch_counter;
+		public bool latch_new_data;
+		public int render_counter;
+		public int render_offset;
+		public int pixel_counter;
+		public int pixel;
+		public byte[] sprite_data = new byte[2];
+		public byte[] sprite_sel = new byte[2];
+		public int sl_use_index;
+		public bool no_sprites;
+		public int[] SL_sprites_ordered = new int[40]; // (x_end, data_low, data_high, attr)
+		public int evaled_sprites;
+		public int sprite_ordered_index;
+		public bool blank_frame;
+		public bool window_latch;
+		public int consecutive_sprite;
+		public int last_eval;
+
+		public int total_counter;
+		// windowing state
+		public int window_counter;
+		public bool window_pre_render;
+		public bool window_started;
+		public bool window_is_reset;
+		public int window_tile_inc;
+		public int window_y_tile;
+		public int window_x_tile;
+		public int window_y_tile_inc;
+		public int window_x_latch;
+		public int window_y_latch;
+
+		public int hbl_countdown;
+
+		public byte ReadReg(int addr)
+		{
+			byte ret = 0;
+
+			switch (addr)
+			{
+
+			}
+
+			return ret;
+		}
+
+		public void WriteReg(int addr, byte value)
+		{
+
+		}
+
+		public void tick()
+		{
+
+		}
+
+		// might be needed, not sure yet
+		public void latch_delay()
+		{
+
+		}
+
+		public void render(int render_cycle)
+		{
+
+		}
+
+		public void process_sprite()
+		{
+
+		}
+
+		// normal DMA moves twice as fast in double speed mode on GBC
+		// So give it it's own function so we can seperate it from PPU tick
+		public void DMA_tick()
+		{
+
+		}
+
+		public void OAM_scan(int OAM_cycle)
+		{
+
+		}
+
+		public void Reset()
+		{
+
+		}
+
+		// order sprites according to x coordinate
+		// note that for sprites of equal x coordinate, priority goes to first on the list
+		public void reorder_and_assemble_sprites()
+		{
+
+		}
+
+		public static readonly byte[] Internal_Graphics = { 0x3C, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3C, // 0				0x00
+															0x18, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3C, // 1				0x01
+															0x3C, 0x66, 0x0C, 0x18, 0x30, 0x60, 0x7E, // 2				0x02
+															0x3C, 0x66, 0x06, 0x1C, 0x06, 0x66, 0x3C, // 3				0x03
+															0xCC, 0xCC, 0xCC, 0xFE, 0x0C, 0x0C, 0x0C, // 4				0x04
+															0x7E, 0x60, 0x60, 0x3C, 0x60, 0x66, 0x3C, // 5				0x05
+															0x3C, 0x66, 0x60, 0x7C, 0x66, 0x66, 0x3C, // 6				0x06
+															0xFE, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, // 7				0x07
+															0x3C, 0x66, 0x66, 0x3C, 0x66, 0x66, 0x3C, // 8				0x08
+															0x3C, 0x66, 0x66, 0x3E, 0x02, 0x66, 0x3C, // 9				0x09
+															0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, // :				0x0A
+															0x18, 0x7E, 0x58, 0x7E, 0x1A, 0x7E, 0x18, // $				0x0B
+															0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //  				0x0C
+															0x3C, 0x66, 0x0C, 0x18, 0x18, 0x00, 0x18, // ?				0x0D
+															0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7E, // L				0x0E
+															0x7C, 0x66, 0x66, 0x7C, 0x60, 0x60, 0x60, // P				0x0F
+															0x00, 0x18, 0x18, 0x7E, 0x18, 0x18, 0x00, // +				0x10
+															0xC6, 0xC6, 0xC6, 0xD6, 0xFE, 0xEE, 0xC6, // W				0x11
+															0x7E, 0x60, 0x60, 0x7C, 0x60, 0x60, 0x7E, // E				0x12
+															0xFC, 0xC6, 0xC6, 0xFC, 0xD8, 0xCC, 0xC6, // R				0x13
+															0x7E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, // T				0x14
+															0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, // U				0x15
+															0x3C, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3C, // I				0x16
+															0x7C, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, // O				0x17
+															0x7C, 0xC6, 0xC6, 0xC6, 0xD7, 0xCC, 0x76, // Q				0x18
+															0x3C, 0x66, 0x60, 0x3C, 0x06, 0x66, 0x3C, // S				0x19
+															0x7C, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7C, // D				0x1A
+															0xFE, 0xC0, 0xC0, 0xF8, 0xC0, 0xC0, 0xC0, // F				0x1B
+															0x7C, 0xC6, 0xC0, 0xC0, 0xCE, 0xC6, 0x7E, // G				0x1C
+															0xC6, 0xC6, 0xC6, 0xFE, 0xC6, 0xC6, 0xC6, // H				0x1D
+															0x06, 0x06, 0x06, 0x06, 0x06, 0xC6, 0x7C, // J				0x1E
+															0xC6, 0xCC, 0xD8, 0xF0, 0xD8, 0xCC, 0xC6, // K				0x1F
+															0x38, 0x6C, 0xC6, 0xC6, 0xF7, 0xC6, 0xC6, // A				0x20
+															0x7E, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x7E, // Z				0x21
+															0xC6, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0xC6, // X				0x22
+															0x7C, 0xC6, 0xC0, 0xC0, 0xC0, 0xC6, 0x7C, // C				0x23
+															0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0x6C, 0x38, // V				0x24
+															0x7C, 0x66, 0x66, 0x7C, 0x66, 0x66, 0x7C, // B				0x25
+															0xC6, 0xEE, 0xFE, 0xD6, 0xC6, 0xC6, 0xC6, // M				0x26
+															0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, // .				0x27
+															0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, // -				0x28
+															0x00, 0x66, 0x3C, 0x18, 0x3C, 0x66, 0x00, // x				0x29
+															0x00, 0x18, 0x00, 0x7E, 0x00, 0x18, 0x00, // (div)			0x2A
+															0x00, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00, // =				0x2B
+															0x66, 0x66, 0x66, 0x3C, 0x18, 0x18, 0x18, // Y				0x2C
+															0xC6, 0xE6, 0xF6, 0xFE, 0xDE, 0xCE, 0xC6, // N				0x2D
+															0x03, 0x06, 0xC0, 0x18, 0x30, 0x60, 0xC0, // /				0x2E
+															0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, // (box)			0x2F
+															0xCE, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xCE, // 10				0x30
+															0x00, 0x00, 0x3C, 0x7E, 0x7E, 0x7E, 0x3C, // (ball)			0x31
+															0x38, 0x38, 0x30, 0x3C, 0x30, 0x30, 0x38, // (person R)		0x32
+															0x38, 0x38, 0x30, 0x3C, 0x30, 0x68, 0x4C, // (runner R)		0x33
+															0x38, 0x38, 0x18, 0x78, 0x18, 0x2C, 0x64, // (runner L)		0x34
+															0x38, 0x38, 0x18, 0x78, 0x18, 0x18, 0x38, // (person L)		0x35
+															0x00, 0x18, 0xC0, 0xF7, 0xC0, 0x18, 0x00, // (arrow R)		0x36
+															0x18, 0x3C, 0x7E, 0xFF, 0xFF, 0x18, 0x18, // (tree)			0x37
+															0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, // (ramp R)		0x38
+															0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE, // (ramp L)		0x39
+															0x38, 0x38, 0x12, 0xFE, 0xB8, 0x28, 0x6C, // (person F)		0x3A
+															0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, // \				0x3B
+															0x00, 0x00, 0x18, 0x10, 0x10, 0xF7, 0x7C, // (boat 1)		0x3C
+															0x00, 0x03, 0x63, 0xFF, 0xFF, 0x18, 0x08, // (plane)		0x3D
+															0x00, 0x00, 0x00, 0x01, 0x38, 0xFF, 0x7E, // (boat 2)		0x3E
+															0x00, 0x00, 0x00, 0x54, 0x54, 0xFF, 0x7E, // (boat 3 unk)	0x3F
+															};
+
+		public void SyncState(Serializer ser)
+		{
+			ser.Sync(nameof(BG_palette), ref BG_palette, false);
+			ser.Sync(nameof(OBJ_palette), ref OBJ_palette, false);
+			ser.Sync(nameof(HDMA_active), ref HDMA_active);
+			ser.Sync(nameof(clear_screen), ref clear_screen);
+
+			ser.Sync(nameof(LCDC), ref LCDC);
+			ser.Sync(nameof(STAT), ref STAT);
+			ser.Sync(nameof(scroll_y), ref scroll_y);
+			ser.Sync(nameof(scroll_x), ref scroll_x);
+			ser.Sync(nameof(LY), ref LY);
+			ser.Sync(nameof(LY_actual), ref LY_actual);
+			ser.Sync(nameof(LY_inc), ref LY_inc);
+			ser.Sync(nameof(LYC), ref LYC);
+			ser.Sync(nameof(DMA_addr), ref DMA_addr);
+			ser.Sync(nameof(BGP), ref BGP);
+			ser.Sync(nameof(obj_pal_0), ref obj_pal_0);
+			ser.Sync(nameof(obj_pal_1), ref obj_pal_1);
+			ser.Sync(nameof(window_y), ref window_y);
+			ser.Sync(nameof(window_x), ref window_x);
+			ser.Sync(nameof(DMA_start), ref DMA_start);
+			ser.Sync(nameof(DMA_clock), ref DMA_clock);
+			ser.Sync(nameof(DMA_inc), ref DMA_inc);
+			ser.Sync(nameof(DMA_byte), ref DMA_byte);
+
+			ser.Sync(nameof(cycle), ref cycle);
+			ser.Sync(nameof(LYC_INT), ref LYC_INT);
+			ser.Sync(nameof(HBL_INT), ref HBL_INT);
+			ser.Sync(nameof(VBL_INT), ref VBL_INT);
+			ser.Sync(nameof(OAM_INT), ref OAM_INT);
+			ser.Sync(nameof(stat_line), ref stat_line);
+			ser.Sync(nameof(stat_line_old), ref stat_line_old);
+			ser.Sync(nameof(LCD_was_off), ref LCD_was_off);		
+			ser.Sync(nameof(OAM_scan_index), ref OAM_scan_index);
+			ser.Sync(nameof(SL_sprites_index), ref SL_sprites_index);
+			ser.Sync(nameof(SL_sprites), ref SL_sprites, false);
+			ser.Sync(nameof(write_sprite), ref write_sprite);
+			ser.Sync(nameof(no_scan), ref no_scan);
+
+			ser.Sync(nameof(DMA_OAM_access), ref DMA_OAM_access);
+			ser.Sync(nameof(OAM_access_read), ref OAM_access_read);
+			ser.Sync(nameof(OAM_access_write), ref OAM_access_write);
+			ser.Sync(nameof(VRAM_access_read), ref VRAM_access_read);
+			ser.Sync(nameof(VRAM_access_write), ref VRAM_access_write);
+
+			ser.Sync(nameof(read_case), ref read_case);
+			ser.Sync(nameof(internal_cycle), ref internal_cycle);
+			ser.Sync(nameof(y_tile), ref y_tile);
+			ser.Sync(nameof(y_scroll_offset), ref y_scroll_offset);
+			ser.Sync(nameof(x_tile), ref x_tile);
+			ser.Sync(nameof(x_scroll_offset), ref x_scroll_offset);
+			ser.Sync(nameof(tile_byte), ref tile_byte);
+			ser.Sync(nameof(sprite_fetch_cycles), ref sprite_fetch_cycles);
+			ser.Sync(nameof(fetch_sprite), ref fetch_sprite);
+			ser.Sync(nameof(going_to_fetch), ref going_to_fetch);
+			ser.Sync(nameof(first_fetch), ref first_fetch);
+			ser.Sync(nameof(sprite_fetch_counter), ref sprite_fetch_counter);
+			ser.Sync(nameof(sprite_attr_list), ref sprite_attr_list, false);
+			ser.Sync(nameof(sprite_pixel_list), ref sprite_pixel_list, false);
+			ser.Sync(nameof(sprite_present_list), ref sprite_present_list, false);		
+			ser.Sync(nameof(temp_fetch), ref temp_fetch);
+			ser.Sync(nameof(tile_inc), ref tile_inc);
+			ser.Sync(nameof(pre_render), ref pre_render);
+			ser.Sync(nameof(pre_render_2), ref pre_render_2);
+			ser.Sync(nameof(tile_data), ref tile_data, false);
+			ser.Sync(nameof(tile_data_latch), ref tile_data_latch, false);
+			ser.Sync(nameof(latch_counter), ref latch_counter);
+			ser.Sync(nameof(latch_new_data), ref latch_new_data);
+			ser.Sync(nameof(render_counter), ref render_counter);
+			ser.Sync(nameof(render_offset), ref render_offset);
+			ser.Sync(nameof(pixel_counter), ref pixel_counter);
+			ser.Sync(nameof(pixel), ref pixel);
+			ser.Sync(nameof(sprite_data), ref sprite_data, false);
+			ser.Sync(nameof(sl_use_index), ref sl_use_index);
+			ser.Sync(nameof(sprite_sel), ref sprite_sel, false);
+			ser.Sync(nameof(no_sprites), ref no_sprites);
+			ser.Sync(nameof(evaled_sprites), ref evaled_sprites);
+			ser.Sync(nameof(SL_sprites_ordered), ref SL_sprites_ordered, false);
+			ser.Sync(nameof(sprite_ordered_index), ref sprite_ordered_index);
+			ser.Sync(nameof(blank_frame), ref blank_frame);
+			ser.Sync(nameof(window_latch), ref window_latch);
+			ser.Sync(nameof(consecutive_sprite), ref consecutive_sprite);
+			ser.Sync(nameof(last_eval), ref last_eval);
+
+			ser.Sync(nameof(window_counter), ref window_counter);
+			ser.Sync(nameof(window_pre_render), ref window_pre_render);
+			ser.Sync(nameof(window_started), ref window_started);
+			ser.Sync(nameof(window_is_reset), ref window_is_reset);
+			ser.Sync(nameof(window_tile_inc), ref window_tile_inc);
+			ser.Sync(nameof(window_y_tile), ref window_y_tile);
+			ser.Sync(nameof(window_x_tile), ref window_x_tile);
+			ser.Sync(nameof(window_y_tile_inc), ref window_y_tile_inc);
+			ser.Sync(nameof(window_x_latch), ref window_x_latch);
+			ser.Sync(nameof(window_y_latch), ref window_y_latch);
+
+			ser.Sync(nameof(hbl_countdown), ref hbl_countdown);
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/ReadMe.txt b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/ReadMe.txt
new file mode 100644
index 0000000000..bc60bf4b01
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/ReadMe.txt
@@ -0,0 +1 @@
+TODO:
diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/SerialPort.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/SerialPort.cs
new file mode 100644
index 0000000000..e67b722df3
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/SerialPort.cs
@@ -0,0 +1,150 @@
+using System;
+using BizHawk.Emulation.Common;
+using BizHawk.Common.NumberExtensions;
+using BizHawk.Common;
+
+namespace BizHawk.Emulation.Cores.Nintendo.O2Hawk
+{
+	public class SerialPort
+	{
+		public O2Hawk Core { get; set; }
+
+		public byte serial_control;
+		public byte serial_data;
+		public bool serial_start;
+		public bool can_pulse;
+		public int serial_clock;
+		public int serial_bits;
+		public int clk_rate;
+		public byte going_out;
+		public byte coming_in;
+
+		public byte ReadReg(int addr)
+		{
+			switch (addr)
+			{
+				case 0xFF01:
+					return serial_data;
+				case 0xFF02:
+					return serial_control;
+			}
+
+			return 0xFF;
+		}
+
+		public void WriteReg(int addr, byte value)
+		{
+			switch (addr)
+			{
+				case 0xFF01:
+					serial_data = value;
+					break;
+
+				case 0xFF02:
+					if (((value & 0x80) > 0) && !serial_start)
+					{
+						serial_start = true;
+						serial_bits = 8;
+						if ((value & 1) > 0)
+						{
+							if (((value & 2) > 0))
+							{
+								clk_rate = 16;
+							}
+							else
+							{
+								clk_rate = 512;
+							}						
+							serial_clock = clk_rate;
+							can_pulse = true;
+						}
+						else
+						{
+							clk_rate = -1;
+							serial_clock = clk_rate;
+							can_pulse = false;
+						}
+					}
+					else if (serial_start)
+					{
+						if ((value & 1) > 0)
+						{
+							if (((value & 2) > 0))
+							{
+								clk_rate = 16;
+							}
+							else
+							{
+								clk_rate = 512;
+							}
+							serial_clock = clk_rate;
+							can_pulse = true;
+						}
+						else
+						{
+							clk_rate = -1;
+							serial_clock = clk_rate;
+							can_pulse = false;
+						}
+					}
+
+					serial_control = (byte)(0x7E | (value & 0x81)); // middle six bits always 1
+					
+					break;
+			}
+		}
+
+
+		public void serial_transfer_tick()
+		{
+			if (serial_start)
+			{
+				if (serial_clock > 0) { serial_clock--; }
+
+				if (serial_clock == 0)
+				{
+					if (serial_bits > 0)
+					{
+						byte temp = coming_in;
+						serial_data = (byte)((serial_data << 1) | temp);
+
+						serial_bits--;
+
+						if (serial_bits == 0)
+						{
+							serial_control &= 0x7F;
+							serial_start = false;
+						}
+						else
+						{
+							serial_clock = clk_rate;
+							if (clk_rate > 0) { can_pulse = true; }
+						}
+					}
+				}
+			}
+		}
+
+		public void Reset()
+		{
+			serial_control = 0x7E;
+			serial_start = false;
+			serial_data = 0x00;
+			going_out = 0;
+			coming_in = 1;
+		}
+
+		public void SyncState(Serializer ser)
+		{
+			ser.Sync(nameof(serial_control), ref serial_control);
+			ser.Sync(nameof(serial_data), ref serial_data);
+			ser.Sync(nameof(serial_start), ref serial_start);
+			ser.Sync(nameof(serial_clock), ref serial_clock);
+			ser.Sync(nameof(serial_bits), ref serial_bits);
+			ser.Sync(nameof(clk_rate), ref clk_rate);
+			ser.Sync(nameof(going_out), ref going_out);
+			ser.Sync(nameof(coming_in), ref coming_in);
+			ser.Sync(nameof(can_pulse), ref can_pulse);
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs
index 537f03ae7b..b653dac9c2 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs
@@ -91,7 +91,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 		public ushort SQ1_len_cntr,		SQ2_len_cntr,			WAVE_len_cntr,				NOISE_len_cntr;
 		// computed
 		public int SQ1_output, SQ2_output, WAVE_output, NOISE_output;
-		public float WAVE_output_decay, WAVE_output_decay_L, WAVE_output_decay_R;
 
 		// Contol Variables
 		public bool AUD_CTRL_vin_L_en;
@@ -665,7 +664,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 					}
 
 					WAVE_output = sample;
-					WAVE_output_decay = WAVE_output;
 
 					// NOTE: The sample buffer is only reloaded after the current sample is played, even if just triggered
 					WAVE_wave_cntr++;
@@ -673,13 +671,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 					sample = Wave_RAM[WAVE_wave_cntr >> 1];
 				}
 			}
-			else
-			{
-				// there is a considerable decay time involved in turning off a channel
-				WAVE_output_decay = (float)(WAVE_output_decay * 0.999958);
-				WAVE_output = (int)Math.Round(WAVE_output_decay);
-			}
-			
 
 			// calculate noise output
 			if (NOISE_enable)
@@ -710,14 +701,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 			if (AUD_CTRL_sq1_L_en) { L_final += SQ1_output; }
 			if (AUD_CTRL_sq2_L_en) { L_final += SQ2_output; }
-			if (AUD_CTRL_wave_L_en) { L_final += WAVE_output; WAVE_output_decay_L = WAVE_output; }
-			else { L_final += (int)Math.Round(WAVE_output_decay_L); WAVE_output_decay_L = (float)(WAVE_output_decay_L * 0.999985); }
+			if (AUD_CTRL_wave_L_en) { L_final += WAVE_output;}
 			if (AUD_CTRL_noise_L_en) { L_final += NOISE_output; }
 
 			if (AUD_CTRL_sq1_R_en) { R_final += SQ1_output; }
 			if (AUD_CTRL_sq2_R_en) { R_final += SQ2_output; }
-			if (AUD_CTRL_wave_R_en) { R_final += WAVE_output; WAVE_output_decay_R = WAVE_output; }
-			else { R_final += (int)Math.Round(WAVE_output_decay_R); WAVE_output_decay_R = (float)(WAVE_output_decay_R * 0.999985); }
+			if (AUD_CTRL_wave_R_en) { R_final += WAVE_output; }
 			if (AUD_CTRL_noise_R_en) { R_final += NOISE_output; }
 
 			L_final *= (AUD_CTRL_vol_L + 1) * 40;
@@ -957,12 +946,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 		public void SyncState(Serializer ser)
 		{
 			ser.Sync(nameof(Audio_Regs), ref Audio_Regs, false);
-			ser.Sync("Wave_Ram", ref Wave_RAM, false);
+			ser.Sync(nameof(Wave_RAM), ref Wave_RAM, false);
 	
 			ser.Sync(nameof(SQ1_vol_done), ref SQ1_vol_done);
 			ser.Sync(nameof(SQ1_calc_done), ref SQ1_calc_done);
 			ser.Sync(nameof(SQ1_swp_enable), ref SQ1_swp_enable);
-			ser.Sync("SQ1_length_counter", ref SQ1_len_cntr);
+			ser.Sync(nameof(SQ1_len_cntr), ref SQ1_len_cntr);
 			ser.Sync(nameof(SQ1_enable), ref SQ1_enable);
 			ser.Sync(nameof(SQ1_vol_state), ref SQ1_vol_state);
 			ser.Sync(nameof(SQ1_duty_cntr), ref SQ1_duty_cntr);
@@ -985,7 +974,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			ser.Sync(nameof(SQ1_output), ref SQ1_output);
 
 			ser.Sync(nameof(SQ2_vol_done), ref SQ2_vol_done);
-			ser.Sync("SQ2_length_counter", ref SQ2_len_cntr);
+			ser.Sync(nameof(SQ2_len_cntr), ref SQ2_len_cntr);
 			ser.Sync(nameof(SQ2_enable), ref SQ2_enable);
 			ser.Sync(nameof(SQ2_vol_state), ref SQ2_vol_state);
 			ser.Sync(nameof(SQ2_duty_cntr), ref SQ2_duty_cntr);
@@ -1003,7 +992,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			ser.Sync(nameof(SQ2_output), ref SQ2_output);
 
 			ser.Sync(nameof(WAVE_can_get), ref WAVE_can_get);
-			ser.Sync("WAVE_length_counter", ref WAVE_len_cntr);
+			ser.Sync(nameof(WAVE_len_cntr), ref WAVE_len_cntr);
 			ser.Sync(nameof(WAVE_enable), ref WAVE_enable);
 			ser.Sync(nameof(WAVE_wave_cntr), ref WAVE_wave_cntr);
 			ser.Sync(nameof(WAVE_intl_cntr), ref WAVE_intl_cntr);
@@ -1017,7 +1006,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			ser.Sync(nameof(WAVE_output), ref WAVE_output);
 
 			ser.Sync(nameof(NOISE_vol_done), ref NOISE_vol_done);
-			ser.Sync("NOISE_length_counter", ref NOISE_len_cntr);
+			ser.Sync(nameof(NOISE_len_cntr), ref NOISE_len_cntr);
 			ser.Sync(nameof(NOISE_enable), ref NOISE_enable);
 			ser.Sync(nameof(NOISE_vol_state), ref NOISE_vol_state);
 			ser.Sync(nameof(NOISE_intl_cntr), ref NOISE_intl_cntr);
@@ -1059,17 +1048,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			ser.Sync(nameof(AUD_CTRL_power), ref AUD_CTRL_power);
 			ser.Sync(nameof(AUD_CTRL_vol_L), ref AUD_CTRL_vol_L);
 			ser.Sync(nameof(AUD_CTRL_vol_R), ref AUD_CTRL_vol_R);
-
-			ser.Sync(nameof(WAVE_output_decay), ref WAVE_output_decay);
-			ser.Sync(nameof(WAVE_output_decay_L), ref WAVE_output_decay_L);
-			ser.Sync(nameof(WAVE_output_decay_R), ref WAVE_output_decay_R);
 		}
 
 		public byte Read_NR52()
 		{
 			return (byte)(
 				((AUD_CTRL_power ? 1 : 0) << 7) |
-				((SQ1_enable ? 1 : 0)) |
+				(SQ1_enable ? 1 : 0) |
 				((SQ2_enable ? 1 : 0) << 1) |
 				((WAVE_enable ? 1 : 0) << 2) |
 				((NOISE_enable ? 1 : 0) << 3));
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
index b01c838a25..3ffee95b7b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
@@ -151,7 +151,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 					LY = 0; /*reset*/
 					break;
 				case 0xFF45:  // LYC
-
 					// tests indicate that latching writes to LYC should take place 4 cycles after the write
 					// otherwise tests around LY boundaries will fail
 					LYC_t = value;
@@ -275,12 +274,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			// Do HDMA ticks
 			if (HDMA_active)
 			{
-				if (HDMA_countdown == 0)
+				if (HDMA_length > 0)
 				{
-					if (HDMA_length > 0)
+					if (!HDMA_mode)
 					{
-						if (!HDMA_mode)
+						if (HDMA_countdown > 0)
 						{
+							HDMA_countdown--;
+						}
+						else
+						{ 
 							// immediately transfer bytes, 2 bytes per cycles
 							if ((HDMA_tick % 2) == 0)
 							{
@@ -296,25 +299,32 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 							HDMA_tick++;
 						}
-						else
+					}
+					else
+					{
+						// only transfer during mode 0, and only 16 bytes at a time
+						if (((STAT & 3) == 0) && (LY != last_HBL) && HBL_test && (LY_inc == 1) && (cycle > 4))
 						{
-							// only transfer during mode 0, and only 16 bytes at a time
-							if (((STAT & 3) == 0) && (LY != last_HBL) && HBL_test && (LY_inc == 1) && (cycle > 4))
-							{
-								HBL_HDMA_go = true;
-								HBL_test = false;
-							}
-							else if (HDMA_run_once)
-							{
-								HBL_HDMA_go = true;
-								HBL_test = false;
-								HDMA_run_once = false;
-							}
+							HBL_HDMA_go = true;
+							HBL_test = false;
+						}
+						else if (HDMA_run_once)
+						{
+							HBL_HDMA_go = true;
+							HBL_test = false;
+							HDMA_run_once = false;
+						}
 
-							if (HBL_HDMA_go && (HBL_HDMA_count > 0))
-							{
-								Core.HDMA_transfer = true;
+						if (HBL_HDMA_go && (HBL_HDMA_count > 0))
+						{
+							Core.HDMA_transfer = true;
 
+							if (HDMA_countdown > 0)
+							{
+								HDMA_countdown--;
+							}
+							else
+							{
 								if ((HDMA_tick % 2) == 0)
 								{
 									HDMA_byte = Core.ReadMemory(cur_DMA_src);
@@ -335,28 +345,24 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 									last_HBL = LY;
 									HBL_HDMA_count = 0x10;
 									HBL_HDMA_go = false;
+									HDMA_countdown = 4;
 								}
 
 								HDMA_tick++;
-							}
-							else
-							{
-								Core.HDMA_transfer = false;
-							}
-						}					
-					}
-					else
-					{
-						HDMA_active = false;
-						Core.HDMA_transfer = false;
-					}
+							}							
+						}
+						else
+						{
+							Core.HDMA_transfer = false;
+						}
+					}					
 				}
 				else
 				{
-					HDMA_countdown--;
+					HDMA_active = false;
+					Core.HDMA_transfer = false;
 				}
-			}
-			
+			}		
 			
 			// the ppu only does anything if it is turned on via bit 7 of LCDC
 			if (LCDC.Bit(7))
@@ -391,6 +397,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						// meaning it will pick up where it left off if re-enabled later
 						// so we don't reset it in the scanline loop
 						window_y_tile = 0;
+						window_y_latch = window_y;
 						window_y_tile_inc = 0;
 						window_started = false;
 						if (!LCDC.Bit(5)) { window_is_reset = true; }						
@@ -643,15 +650,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			{
 				if (Core.REG_FFFF.Bit(1)) { Core.cpu.FlagI = true; }
 				Core.REG_FF0F |= 0x02;
-
-				/*
-				if (Core.cpu.cur_instr[Core.cpu.instr_pntr] == 46)
-				{
-					Console.Write(VBL_INT + " " + LYC_INT + " " + HBL_INT + " " + OAM_INT + " ");
-					//Core.last_rise = Core.cpu.TotalExecutedCycles;
-					Console.WriteLine(STAT + " " + cycle + " " + Core.cpu.TotalExecutedCycles);
-				}
-				*/
+				
+				//if (LY == 46)
+				//{
+					//Console.Write(VBL_INT + " " + LYC_INT + " " + HBL_INT + " " + OAM_INT + " " + LY + " ");
+					//Console.Write(render_offset + " " + scroll_x +  " " + total_counter + " ");
+					//Console.WriteLine(STAT + " " + cycle + " " + Core.cpu.TotalExecutedCycles);
+				//}				
 			}
 
 			stat_line_old = stat_line;
@@ -713,8 +718,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				window_pre_render = false;
 				window_latch = LCDC.Bit(5);
 
+				total_counter = 0;
+
 				// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
-				if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY >= window_y)))
+				if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY >= window_y_latch)))
 				{
 					window_y_tile_inc++;
 					if (window_y_tile_inc==8)
@@ -732,30 +739,40 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			}
 
 			// before anything else, we have to check if windowing is in effect
-			if (window_latch && !window_started && (LY >= window_y) && (pixel_counter >= (window_x_latch - 7)) && (window_x_latch < 167))
-			{
+			if (window_latch && !window_started && (LY >= window_y_latch) && (pixel_counter >= (window_x_latch - 7)) && (window_x_latch < 167))
+			{			
 				/*
-				Console.Write(LY);
-				Console.Write(" ");
-				Console.Write(cycle);
-				Console.Write(" ");
-				Console.Write(window_y_tile_inc);
-				Console.Write(" ");
-				Console.Write(window_x_latch);
-				Console.Write(" ");
-				Console.WriteLine(pixel_counter);
+					Console.Write(LY);
+					Console.Write(" ");
+					Console.Write(cycle);
+					Console.Write(" ");
+					Console.Write(window_y_tile);
+					Console.Write(" ");
+					Console.Write(render_offset);
+					Console.Write(" ");
+					Console.Write(window_x_latch);
+					Console.Write(" ");
+					Console.WriteLine(pixel_counter);
 				*/
-				if (window_x_latch <= 7)
+			
+				if (window_x_latch == 0)
 				{
 					// if the window starts at zero, we still do the first access to the BG
 					// but then restart all over again at the window
-					read_case = 9;
+					if ((render_offset % 7) <= 6)
+					{
+						read_case = 9;
+					}
+					else
+					{
+						read_case = 10;
+					}
 				}
 				else
 				{
-					// otherwise, just restart the whole process as if starting BG again
 					read_case = 4;
 				}
+
 				window_pre_render = true;
 
 				window_counter = 0;
@@ -1071,13 +1088,30 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								// here we set up rendering
 								// unlike for the normal background case, there is no pre-render period for the window
 								// so start shifting in data to the screen right away
-								render_offset = 0;
-								render_counter = 8;
+								if (window_x_latch <= 7)
+								{
+									if (render_offset == 0)
+									{
+										read_case = 4;
+									}
+									else
+									{
+										read_case = 9 + render_offset - 1;
+									}
+									render_counter = 8 - render_offset;
+
+									render_offset = 0;								
+								}
+								else
+								{
+									render_offset = 0;
+									read_case = 4;
+									render_counter = 8;
+								}
+
 								latch_counter = 0;
 								latch_new_data = true;
-
-								window_pre_render = false;
-								read_case = 4;
+								window_pre_render = false;								
 							}
 							else
 							{
@@ -1103,17 +1137,20 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						if (hbl_countdown > 0)
 						{
 							hbl_countdown--;
+
 							if (hbl_countdown == 0)
+							{
+								OAM_access_read = true;
+								OAM_access_write = true;
+								VRAM_access_read = true;
+								VRAM_access_write = true;						
+							}
+							else
 							{
 								STAT &= 0xFC;
 								STAT |= 0x00;
 
 								if (STAT.Bit(3)) { HBL_INT = true; }
-
-								OAM_access_read = true;
-								OAM_access_write = true;
-								VRAM_access_read = true;
-								VRAM_access_write = true;
 							}
 						}
 						break;
@@ -1125,6 +1162,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						// for it in read case 0
 						read_case = 4;
 						break;
+					case 10:
+					case 11:
+					case 12:
+					case 13:
+					case 14:
+					case 15:
+					case 16:
+					case 17:
+						read_case--;
+						break;
 				}
 				internal_cycle++;
 				
@@ -1482,8 +1529,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 		public override void SyncState(Serializer ser)
 		{
-			ser.Sync("pal_transfer_byte", ref BG_transfer_byte);
-			ser.Sync("spr_transfer_byte", ref OBJ_transfer_byte);
+			ser.Sync(nameof(BG_transfer_byte), ref BG_transfer_byte);
+			ser.Sync(nameof(OBJ_transfer_byte), ref OBJ_transfer_byte);
 			ser.Sync(nameof(HDMA_src_hi), ref HDMA_src_hi);
 			ser.Sync(nameof(HDMA_src_lo), ref HDMA_src_lo);
 			ser.Sync(nameof(HDMA_dest_hi), ref HDMA_dest_hi);
@@ -1534,6 +1581,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			window_y = 0x0;
 			window_x = 0x0;
 			window_x_latch = 0xFF;
+			window_y_latch = 0xFF;
 			LY_inc = 1;
 			no_scan = false;
 			OAM_access_read = true;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs
index 2783900a95..717d5d8238 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs
@@ -3,7 +3,7 @@ using BizHawk.Common.NumberExtensions;
 using BizHawk.Common;
 
 // Gameboy compatibility mode for GBC console
-// only entered from writing to register 0xFF4C
+// seperated out so the GBC ppu can focus on double speed mode
 // has several quirks not present in GB ppu
 namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 {
@@ -48,6 +48,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 		public int VRAM_sel;
 		public bool BG_V_flip;
 		public bool HDMA_mode;
+		public bool HDMA_run_once;
 		public ushort cur_DMA_src;
 		public ushort cur_DMA_dest;
 		public int HDMA_length;
@@ -116,6 +117,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						VRAM_access_write = true;
 						OAM_access_read = true;
 						OAM_access_write = true;
+
+						clear_screen = true;
 					}
 
 					if (!LCDC.Bit(7) && value.Bit(7))
@@ -152,7 +155,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 					LY = 0; /*reset*/
 					break;
 				case 0xFF45:  // LYC
-
 					// tests indicate that latching writes to LYC should take place 4 cycles after the write
 					// otherwise tests around LY boundaries will fail
 					LYC_t = value;
@@ -211,17 +213,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							HBL_HDMA_count = 0x10;
 
 							// TODO: DOES HDMA start if triggered in mode 0 immediately? (for now assume no)
-							if ((STAT & 3) == 0)
-							{
-								last_HBL = LY;
-							}
-							else
-							{
-								last_HBL = LY - 1;
-							}
-							
+							last_HBL = LY - 1;
+
 							HBL_test = true;
 							HBL_HDMA_go = false;
+
+							if (!LCDC.Bit(7))
+							{
+								HDMA_run_once = true;
+							}
 						}
 						else
 						{
@@ -278,11 +278,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			// Do HDMA ticks
 			if (HDMA_active)
 			{
-				if (HDMA_countdown == 0)
+				if (HDMA_length > 0)
 				{
-					if (HDMA_length > 0)
+					if (!HDMA_mode)
 					{
-						if (!HDMA_mode)
+						if (HDMA_countdown > 0)
+						{
+							HDMA_countdown--;
+						}
+						else
 						{
 							// immediately transfer bytes, 2 bytes per cycles
 							if ((HDMA_tick % 2) == 0)
@@ -299,19 +303,32 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 							HDMA_tick++;
 						}
-						else
+					}
+					else
+					{
+						// only transfer during mode 0, and only 16 bytes at a time
+						if (((STAT & 3) == 0) && (LY != last_HBL) && HBL_test && (LY_inc == 1) && (cycle > 4))
 						{
-							// only transfer during mode 0, and only 16 bytes at a time
-							if (((STAT & 3) == 0) && (LY != last_HBL) && HBL_test && (LY_inc == 1))
+							HBL_HDMA_go = true;
+							HBL_test = false;
+						}
+						else if (HDMA_run_once)
+						{
+							HBL_HDMA_go = true;
+							HBL_test = false;
+							HDMA_run_once = false;
+						}
+
+						if (HBL_HDMA_go && (HBL_HDMA_count > 0))
+						{
+							Core.HDMA_transfer = true;
+
+							if (HDMA_countdown > 0)
 							{
-								HBL_HDMA_go = true;
-								HBL_test = false;
+								HDMA_countdown--;
 							}
-
-							if (HBL_HDMA_go && (HBL_HDMA_count > 0))
+							else
 							{
-								Core.HDMA_transfer = true;
-
 								if ((HDMA_tick % 2) == 0)
 								{
 									HDMA_byte = Core.ReadMemory(cur_DMA_src);
@@ -327,33 +344,30 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 								if ((HBL_HDMA_count == 0) && (HDMA_length != 0))
 								{
+
 									HBL_test = true;
 									last_HBL = LY;
 									HBL_HDMA_count = 0x10;
 									HBL_HDMA_go = false;
+									HDMA_countdown = 4;
 								}
 
 								HDMA_tick++;
 							}
-							else
-							{
-								Core.HDMA_transfer = false;
-							}
-						}					
-					}
-					else
-					{
-						HDMA_active = false;
-						Core.HDMA_transfer = false;
+						}
+						else
+						{
+							Core.HDMA_transfer = false;
+						}
 					}
 				}
 				else
 				{
-					HDMA_countdown--;
+					HDMA_active = false;
+					Core.HDMA_transfer = false;
 				}
 			}
-			
-			
+
 			// the ppu only does anything if it is turned on via bit 7 of LCDC
 			if (LCDC.Bit(7))
 			{
@@ -387,6 +401,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						// meaning it will pick up where it left off if re-enabled later
 						// so we don't reset it in the scanline loop
 						window_y_tile = 0;
+						window_y_latch = window_y;
 						window_y_tile_inc = 0;
 						window_started = false;
 						if (!LCDC.Bit(5)) { window_is_reset = true; }						
@@ -700,8 +715,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				window_pre_render = false;
 				window_latch = LCDC.Bit(5);
 
+				total_counter = 0;
+
 				// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
-				if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY >= window_y)))
+				if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY >= window_y_latch)))
 				{
 					window_y_tile_inc++;
 					if (window_y_tile_inc==8)
@@ -719,7 +736,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			}
 
 			// before anything else, we have to check if windowing is in effect
-			if (window_latch && !window_started && (LY >= window_y) && (pixel_counter >= (window_x_latch - 7)) && (window_x_latch < 167))
+			if (window_latch && !window_started && (LY >= window_y_latch) && (pixel_counter >= (window_x_latch - 7)) && (window_x_latch < 167))
 			{
 				/*
 				Console.Write(LY);
@@ -732,17 +749,24 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				Console.Write(" ");
 				Console.WriteLine(pixel_counter);
 				*/
-				if (window_x_latch <= 7)
+				if (window_x_latch == 0)
 				{
 					// if the window starts at zero, we still do the first access to the BG
 					// but then restart all over again at the window
-					read_case = 9;
+					if ((render_offset % 7) <= 6)
+					{
+						read_case = 9;
+					}
+					else
+					{
+						read_case = 10;
+					}
 				}
 				else
 				{
-					// otherwise, just restart the whole process as if starting BG again
 					read_case = 4;
 				}
+
 				window_pre_render = true;
 
 				window_counter = 0;
@@ -1098,13 +1122,30 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								// here we set up rendering
 								// unlike for the normal background case, there is no pre-render period for the window
 								// so start shifting in data to the screen right away
-								render_offset = 0;
-								render_counter = 8;
+								if (window_x_latch <= 7)
+								{
+									if (render_offset == 0)
+									{
+										read_case = 4;
+									}
+									else
+									{
+										read_case = 9 + render_offset - 1;
+									}
+									render_counter = 8 - render_offset;
+
+									render_offset = 0;							
+								}
+								else
+								{
+									render_offset = 0;
+									read_case = 4;
+									render_counter = 8;
+								}
+
 								latch_counter = 0;
 								latch_new_data = true;
-
 								window_pre_render = false;
-								read_case = 4;
 							}
 							else
 							{
@@ -1131,12 +1172,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							hbl_countdown--;
 							if (hbl_countdown == 0)
 							{								
-
-
 								OAM_access_read = true;
 								OAM_access_write = true;
 								VRAM_access_read = true;
-								VRAM_access_write = true;
+								VRAM_access_write = true;								
 							}
 							else
 							{
@@ -1155,6 +1194,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						// for it in read case 0
 						read_case = 4;
 						break;
+					case 10:
+					case 11:
+					case 12:
+					case 13:
+					case 14:
+					case 15:
+					case 16:
+					case 17:
+						read_case--;
+						break;
 				}
 				internal_cycle++;
 				
@@ -1535,8 +1584,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 		public override void SyncState(Serializer ser)
 		{
-			ser.Sync("pal_transfer_byte", ref BG_transfer_byte);
-			ser.Sync("spr_transfer_byte", ref OBJ_transfer_byte);
+			ser.Sync(nameof(BG_transfer_byte), ref BG_transfer_byte);
+			ser.Sync(nameof(OBJ_transfer_byte), ref OBJ_transfer_byte);
 			ser.Sync(nameof(HDMA_src_hi), ref HDMA_src_hi);
 			ser.Sync(nameof(HDMA_src_lo), ref HDMA_src_lo);
 			ser.Sync(nameof(HDMA_dest_hi), ref HDMA_dest_hi);
@@ -1547,6 +1596,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			ser.Sync(nameof(VRAM_sel), ref VRAM_sel);
 			ser.Sync(nameof(BG_V_flip), ref BG_V_flip);
 			ser.Sync(nameof(HDMA_mode), ref HDMA_mode);
+			ser.Sync(nameof(HDMA_run_once), ref HDMA_run_once);
 			ser.Sync(nameof(cur_DMA_src), ref cur_DMA_src);
 			ser.Sync(nameof(cur_DMA_dest), ref cur_DMA_dest);
 			ser.Sync(nameof(HDMA_length), ref HDMA_length);
@@ -1584,6 +1634,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			window_y = 0x0;
 			window_x = 0x0;
 			window_x_latch = 0xFF;
+			window_y_latch = 0xFF;
 			LY_inc = 1;
 			no_scan = false;
 			OAM_access_read = true;
@@ -1701,6 +1752,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			obj_pal_0 = ppu2.obj_pal_0;
 			obj_pal_1 = ppu2.obj_pal_1;
 			window_y = ppu2.window_y;
+			window_y_latch = ppu2.window_y_latch;
 			window_x = ppu2.window_x;
 			DMA_start = ppu2.DMA_start;
 			DMA_clock = ppu2.DMA_clock;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs
index d726744ea0..96859f3d06 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs
@@ -132,6 +132,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 				in_vblank_old = in_vblank;
 			}
+
+			// turn off the screen so the image doesnt persist
+			// but dont turn off blank_frame yet, it still needs to be true until the next VBL
+			// this doesn't run for GBC, some games, ex MIB the series 2, rely on the screens persistence while off to make video look smooth.
+			// But some GB gams, ex Battletoads, turn off the screen for a long time from the middle of the frame, so need to be cleared.
+			if (ppu.clear_screen)
+			{
+				for (int j = 0; j < frame_buffer.Length; j++) { frame_buffer[j] = (int)color_palette[0]; }
+				ppu.clear_screen = false;
+			}
 		}
 
 		public void do_single_step()
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
index bdc6d40ff0..da4d606465 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
@@ -111,6 +111,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				set { _RTCInitialTime = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
 			}
 
+			[DisplayName("RTC Offset")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset
+			{
+				get { return _RTCOffset; }
+				set { _RTCOffset = Math.Max(-127, Math.Min(127, value)); }
+			}
+
 			[DisplayName("Timer Div Initial Time")]
 			[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
 			[DefaultValue(8)]
@@ -129,6 +138,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			[JsonIgnore]
 			private int _RTCInitialTime;
 			[JsonIgnore]
+			private int _RTCOffset;
+			[JsonIgnore]
 			public ushort _DivInitialTime = 8;
 
 
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
index 5a14b9ea93..57dafa2366 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
@@ -342,7 +342,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				case 0x20: mapper = new MapperMBC6();		mppr = "MBC6";							break;
 				case 0x22: mapper = new MapperMBC7();		mppr = "MBC7";		has_bat = true;		break;
 				case 0xFC: mapper = new MapperCamera();		mppr = "CAM";							break;
-				case 0xFD: mapper = new MapperTAMA5();		mppr = "TAMA5";							break;
+				case 0xFD: mapper = new MapperTAMA5();		mppr = "TAMA5";		has_bat = true;		break;
 				case 0xFE: mapper = new MapperHuC3();		mppr = "HuC3";							break;
 				case 0xFF: mapper = new MapperHuC1();		mppr = "HuC1";							break;
 
@@ -453,6 +453,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				has_bat = true;
 			}
 
+			// TAMA5 has 0x1000 bytes of RAM, regardless of any header info
+			if (mppr == "TAMA5")
+			{
+				cart_RAM = new byte[0x20];
+				has_bat = true;
+			}
+
 			mapper.Core = this;
 			mapper.Initialize();
 
@@ -466,32 +473,35 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				}
 			}
 			
-			// Extra RTC initialization for mbc3
+			// Extra RTC initialization for mbc3, HuC3, and TAMA5
 			if (mppr == "MBC3")
 			{
 				Use_MT = true;
+
+				mapper.RTC_Get(_syncSettings.RTCOffset, 5);
+
 				int days = (int)Math.Floor(_syncSettings.RTCInitialTime / 86400.0);
 
 				int days_upper = ((days & 0x100) >> 8) | ((days & 0x200) >> 2);
 
-				mapper.RTC_Get((byte)days_upper, 4);
-				mapper.RTC_Get((byte)(days & 0xFF), 3);
+				mapper.RTC_Get(days_upper, 4);
+				mapper.RTC_Get(days & 0xFF, 3);
 
 				int remaining = _syncSettings.RTCInitialTime - (days * 86400);
 
 				int hours = (int)Math.Floor(remaining / 3600.0);
 
-				mapper.RTC_Get((byte)(hours & 0xFF), 2);
+				mapper.RTC_Get(hours & 0xFF, 2);
 
 				remaining = remaining - (hours * 3600);
 
 				int minutes = (int)Math.Floor(remaining / 60.0);
 
-				mapper.RTC_Get((byte)(minutes & 0xFF), 1);
+				mapper.RTC_Get(minutes & 0xFF, 1);
 
 				remaining = remaining - (minutes * 60);
 
-				mapper.RTC_Get((byte)(remaining & 0xFF), 0);
+				mapper.RTC_Get(remaining & 0xFF, 0);
 			}
 
 			if (mppr == "HuC3")
@@ -500,23 +510,30 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 				int years = (int)Math.Floor(_syncSettings.RTCInitialTime / 31536000.0);
 
-				mapper.RTC_Get((byte)years, 24);
+				mapper.RTC_Get(years, 24);
 
 				int remaining = _syncSettings.RTCInitialTime - (years * 31536000);
 
 				int days = (int)Math.Floor(remaining / 86400.0);
 				int days_upper = (days >> 8) & 0xF;
 
-				mapper.RTC_Get((byte)days_upper, 20);
-				mapper.RTC_Get((byte)(days & 0xFF), 12);
+				mapper.RTC_Get(days_upper, 20);
+				mapper.RTC_Get(days & 0xFF, 12);
 
 				remaining = remaining - (days * 86400);
 
 				int minutes = (int)Math.Floor(remaining / 60.0);
 				int minutes_upper = (minutes >> 8) & 0xF;
 
-				mapper.RTC_Get((byte)(minutes_upper), 8);
-				mapper.RTC_Get((byte)(remaining & 0xFF), 0);
+				mapper.RTC_Get(minutes_upper, 8);
+				mapper.RTC_Get(remaining & 0xFF, 0);
+			}
+
+			if (mppr == "TAMA5")
+			{
+				Use_MT = true;
+
+				// currently no date / time input for TAMA5
 			}
 		}
 	}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs
index a436d4045b..c7c1850d9d 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs
@@ -39,6 +39,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						VRAM_access_write = true;
 						OAM_access_read = true;
 						OAM_access_write = true;
+
+						clear_screen = true;
 					}
 
 					if (!LCDC.Bit(7) && value.Bit(7))
@@ -160,6 +162,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						// meaning it will pick up where it left off if re-enabled later
 						// so we don't reset it in the scanline loop
 						window_y_tile = 0;
+						window_y_latch = window_y;
 						window_y_tile_inc = 0;
 						window_started = false;
 						if (!LCDC.Bit(5)) { window_is_reset = true; }
@@ -464,7 +467,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				total_counter = 0;
 
 				// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
-				if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY >= window_y)))
+				if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY >= window_y_latch)))
 				{
 					window_y_tile_inc++;
 					if (window_y_tile_inc==8)
@@ -482,7 +485,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			}
 
 			// before anything else, we have to check if windowing is in effect
-			if (window_latch && !window_started && (LY >= window_y) && (pixel_counter >= (window_x_latch - 7)) && (window_x_latch < 167))
+			if (window_latch && !window_started && (LY >= window_y_latch) && (pixel_counter >= (window_x_latch - 7)) && (window_x_latch < 167))
 			{
 				/*
 				Console.Write(LY);
@@ -495,17 +498,24 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				Console.Write(" ");
 				Console.WriteLine(pixel_counter);
 				*/
-				if (window_x_latch <= 7)
+				if (window_x_latch == 0)
 				{
 					// if the window starts at zero, we still do the first access to the BG
 					// but then restart all over again at the window
-					read_case = 9;
+					if ((render_offset % 7) <= 6)
+					{
+						read_case = 9;
+					}
+					else
+					{
+						read_case = 10;
+					}
 				}
 				else
 				{
-					// otherwise, just restart the whole process as if starting BG again
 					read_case = 4;
 				}
+
 				window_pre_render = true;
 
 				window_counter = 0;
@@ -788,13 +798,30 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								// here we set up rendering
 								// unlike for the normal background case, there is no pre-render period for the window
 								// so start shifting in data to the screen right away
-								render_offset = 0;
-								render_counter = 8;
+								if (window_x_latch <= 7)
+								{
+									if (render_offset == 0)
+									{
+										read_case = 4;
+									}
+									else
+									{
+										read_case = 9 + render_offset - 1;
+									}
+									render_counter = 8 - render_offset;
+
+									render_offset = 0;
+								}
+								else
+								{
+									render_offset = 0;
+									read_case = 4;
+									render_counter = 8;							
+								}
+
 								latch_counter = 0;
 								latch_new_data = true;
-
 								window_pre_render = false;
-								read_case = 4;
 							}
 							else
 							{
@@ -834,6 +861,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						// for it in read case 0
 						read_case = 4;
 						break;
+					case 10:
+					case 11:
+					case 12:
+					case 13:
+					case 14:
+					case 15:
+					case 16:
+					case 17:
+						read_case--;
+						break;
 				}
 				internal_cycle++;
 
@@ -1153,6 +1190,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			window_y = 0x0;
 			window_x = 0x0;
 			window_x_latch = 0xFF;
+			window_y_latch = 0xFF;
 			LY_inc = 1;
 			no_scan = false;
 			OAM_access_read = true;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/HW_Registers.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/HW_Registers.cs
index 41d6687b4a..84cc406cae 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/HW_Registers.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/HW_Registers.cs
@@ -1,7 +1,5 @@
 using System;
-using BizHawk.Emulation.Common;
 using BizHawk.Common.NumberExtensions;
-using BizHawk.Common;
 
 namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 {
@@ -114,7 +112,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				case 0xFF4F: // VBK
 					if (GBC_compat)
 					{
-						ret = VRAM_Bank;
+						ret = (byte)(0xFE | VRAM_Bank);
 					}
 					else
 					{
@@ -144,7 +142,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 					break;
 
 				case 0xFF56:
-					if (is_GBC)
+					if (GBC_compat)
 					{
 						// can receive data
 						if ((IR_reg & 0xC0) == 0xC0)
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs
index 73e70d1bb6..be4d482e12 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs
@@ -43,7 +43,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 		{
 		}
 
-		public virtual void RTC_Get(byte value, int index)
+		public virtual void RTC_Get(int value, int index)
 		{
 		}
 
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
index 5347487ed4..6bcc6e6cd3 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
@@ -243,7 +243,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			}
 		}
 
-		public override void RTC_Get(byte value, int index)
+		public override void RTC_Get(int value, int index)
 		{
 			time |= (uint)((value & 0xFF) << index);
 		}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
index 378d156429..8204677836 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
@@ -20,6 +20,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 		public int RTC_timer;
 		public int RTC_low_clock;
 		public bool halt;
+		public int RTC_offset;
 
 		public override void Initialize()
 		{
@@ -61,7 +62,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			{
 				if (RAM_enable)
 				{
-					if ((Core.cart_RAM != null) && (RAM_bank < 3))
+					if ((Core.cart_RAM != null) && (RAM_bank <= RAM_mask))
 					{
 						if (((addr - 0xA000) + RAM_bank * 0x2000) < Core.cart_RAM.Length)
 						{
@@ -73,18 +74,19 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						}
 					}
 
-					if ((RAM_bank >= 8) && (RAM_bank < 0xC))
+					if ((RAM_bank >= 8) && (RAM_bank <= 0xC))
 					{
+						//Console.WriteLine("reg: " + (RAM_bank - 8) + " value: " + RTC_regs_latch[RAM_bank - 8] + " cpu: " + Core.cpu.TotalExecutedCycles);
 						return RTC_regs_latch[RAM_bank - 8];
 					}
 					else
 					{
-						return 0xFF;
+						return 0x0;
 					}
 				}
 				else
 				{
-					return 0xFF;
+					return 0x0;
 				}
 			}
 		}
@@ -103,7 +105,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			{
 				if (RAM_enable)
 				{
-					if ((Core.cart_RAM != null) && (RAM_bank < 3))
+					if ((Core.cart_RAM != null) && (RAM_bank <= RAM_mask))
 					{
 						if (((addr - 0xA000) + RAM_bank * 0x2000) < Core.cart_RAM.Length)
 						{
@@ -115,7 +117,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 						}
 					}
 
-					if ((RAM_bank >= 8) && (RAM_bank < 0xC))
+					if ((RAM_bank >= 8) && (RAM_bank <= 0xC))
 					{
 						return;
 					}
@@ -141,7 +143,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			if (addr < 0x8000)
 			{
 				if (addr < 0x2000)
-				{
+				{					
 					RAM_enable = ((value & 0xA) == 0xA);
 				}
 				else if (addr < 0x4000)
@@ -156,7 +158,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				}
 				else if (addr < 0x6000)
 				{
-					RAM_bank = value & 3;
+					RAM_bank = value;
 				}
 				else
 				{
@@ -175,17 +177,19 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			{
 				if (RAM_enable)
 				{
-					if ((Core.cart_RAM != null) && (RAM_bank <= 3))
+					if ((Core.cart_RAM != null) && (RAM_bank <= RAM_mask))
 					{
 						if (((addr - 0xA000) + RAM_bank * 0x2000) < Core.cart_RAM.Length)
 						{
 							Core.cart_RAM[(addr - 0xA000) + RAM_bank * 0x2000] = value;
 						}
 					}
-					else if ((RAM_bank >= 8) && (RAM_bank < 0xC))
+					else if ((RAM_bank >= 8) && (RAM_bank <= 0xC))
 					{
 						RTC_regs[RAM_bank - 8] = value;
 
+						if ((RAM_bank - 8) == 0) { RTC_low_clock = RTC_timer = 0; }
+
 						halt = (RTC_regs[4] & 0x40) > 0;
 					}
 				}
@@ -197,9 +201,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			WriteMemory(addr, value);
 		}
 
-		public override void RTC_Get(byte value, int index)
+		public override void RTC_Get(int value, int index)
 		{
-			RTC_regs[index] = value;
+			if (index < 5)
+			{
+				RTC_regs[index] = (byte)value;
+			}		
+			else
+			{
+				RTC_offset = value;
+			}
 		}
 
 		public override void Mapper_Tick()
@@ -217,14 +228,17 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 					if (RTC_low_clock == 32768)
 					{
 						RTC_low_clock = 0;
+						RTC_timer = RTC_offset;
 
 						RTC_regs[0]++;
+
 						if (RTC_regs[0] > 59)
 						{
 							RTC_regs[0] = 0;
 							RTC_regs[1]++;
 							if (RTC_regs[1] > 59)
 							{
+								RTC_regs[1] = 0;
 								RTC_regs[2]++;
 								if (RTC_regs[2] > 23)
 								{
@@ -255,7 +269,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			}
 		}
 
-
 		public override void SyncState(Serializer ser)
 		{
 			ser.Sync(nameof(ROM_bank), ref ROM_bank);
@@ -269,6 +282,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			ser.Sync(nameof(RTC_regs_latch_wr), ref RTC_regs_latch_wr);
 			ser.Sync(nameof(RTC_timer), ref RTC_timer);
 			ser.Sync(nameof(RTC_low_clock), ref RTC_low_clock);
+			ser.Sync(nameof(RTC_offset), ref RTC_offset);
 		}
 	}
 }
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs
index 64239c64da..206ecdba9b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs
@@ -6,49 +6,95 @@ using BizHawk.Emulation.Common.Components.LR35902;
 
 namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 {
-	// Default mapper with no bank switching
+	// Tama 5 mapper used in tamagatchi 3
 	public class MapperTAMA5 : MapperBase
 	{
+		public int ROM_bank;
+		public int RAM_bank;
+		public int ROM_mask;
+		public int RAM_mask;
+		public byte[] RTC_regs = new byte[10];
+		public int RTC_timer;
+		public int RTC_low_clock;
+		public bool halt;
+		public int RTC_offset;
+		public int ctrl;
+		public int RAM_addr_low;
+		public int RAM_addr_high;
+		public int RAM_val_low;
+		public int RAM_val_high;
+		public byte Chip_return_low;
+		public byte Chip_return_high;
+
 		public override void Initialize()
 		{
-			// nothing to initialize
+			ROM_bank = 0;
+			RAM_bank = 0;
+			ROM_mask = Core._rom.Length / 0x4000 - 1;
+
+			// some games have sizes that result in a degenerate ROM, account for it here
+			if (ROM_mask > 4) { ROM_mask |= 3; }
+
+			RAM_mask = 0;
+			if (Core.cart_RAM != null)
+			{
+				RAM_mask = Core.cart_RAM.Length / 0x2000 - 1;
+				if (Core.cart_RAM.Length == 0x800) { RAM_mask = 0; }
+			}
+
+			RTC_regs[0] = 0;
+			RTC_regs[1] = 0;
+			RTC_regs[2] = 0;
+			RTC_regs[3] = 0;
+			RTC_regs[4] = 0;
+
+			ctrl = 0;
 		}
 
 		public override byte ReadMemory(ushort addr)
 		{
-			if (addr < 0x8000)
+			if (addr < 0x4000)
 			{
 				return Core._rom[addr];
 			}
+			else if (addr < 0x8000)
+			{
+				return Core._rom[(addr - 0x4000) + ROM_bank * 0x4000];
+			}
 			else
 			{
-				if (Core.cart_RAM != null)
+
+				switch (ctrl)
 				{
-					return Core.cart_RAM[addr - 0xA000];
-				}
-				else
-				{
-					return 0;
+					case 0xA:
+						// The game won't proceed unless this value (anded with 3) is 1
+						// see bank 0: 0x1A7D to 0x1A89
+						return 1;
+					case 0xC:
+						//Console.WriteLine("read low: " + Chip_return_low);
+						return Chip_return_low;
+					case 0xD:
+						//Console.WriteLine("read high: " + Chip_return_high);
+						return Chip_return_high;
 				}
+
+				return 0x0;
 			}
 		}
 
 		public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
 		{
-			if (addr < 0x8000)
+			if (addr < 0x4000)
 			{
 				SetCDLROM(flags, addr);
 			}
+			else if (addr < 0x8000)
+			{
+				SetCDLROM(flags, (addr - 0x4000) + ROM_bank * 0x4000);
+			}
 			else
 			{
-				if (Core.cart_RAM != null)
-				{
-					SetCDLRAM(flags, addr - 0xA000);
-				}
-				else
-				{
-					return;
-				}
+
 			}
 		}
 
@@ -59,22 +105,183 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 		public override void WriteMemory(ushort addr, byte value)
 		{
-			if (addr < 0x8000)
+			if (addr == 0xA000)
 			{
-				// no mapping hardware available
-			}
-			else
-			{
-				if (Core.cart_RAM != null)
+				switch (ctrl)
 				{
-					Core.cart_RAM[addr - 0xA000] = value;
+					case 0:
+						ROM_bank &= 0xF0;
+						ROM_bank |= (value & 0xF);
+						break;
+					case 1:
+						ROM_bank &= 0x0F;
+						ROM_bank |= ((value & 0x1) << 4);
+						break;
+					case 4:
+						RAM_val_low = (value & 0xF);
+						break;
+					case 5:
+						RAM_val_high = (value & 0xF);
+						//Core.cart_RAM[(RAM_addr_high << 4) | RAM_addr_low] = (byte)((RAM_val_high << 4) | RAM_val_low);
+						break;
+					case 6:
+						RAM_addr_high = (value & 1);
+
+						switch ((value & 0xE) >> 1)
+						{
+							case 0:
+								// write to RAM
+								Core.cart_RAM[(RAM_addr_high << 4) | RAM_addr_low] = (byte)((RAM_val_high << 4) | RAM_val_low);
+								break;
+							case 1:
+								// read from RAM
+								Chip_return_high = (byte)(Core.cart_RAM[(RAM_addr_high << 4) | RAM_addr_low] >> 4);
+								Chip_return_low = (byte)(Core.cart_RAM[(RAM_addr_high << 4) | RAM_addr_low] & 0xF);
+								break;
+							case 2:
+								// read from RTC registers
+								if (RAM_addr_low == 3)
+								{
+									Chip_return_high = RTC_regs[2];  
+									Chip_return_low = RTC_regs[1];
+								}
+								else if (RAM_addr_low == 6)
+								{
+									Chip_return_high = RTC_regs[4];
+									Chip_return_low = RTC_regs[3];
+								}
+								else
+								{
+									Chip_return_high = 1;
+									Chip_return_low = 1;
+								}
+								break;
+							case 3:
+								// write to RTC registers (probably wrong, not well tested)
+								if (RAM_addr_low == 3)
+								{
+									RTC_regs[2] = (byte)(RAM_val_high & 0xF);
+									RTC_regs[1] = (byte)(RAM_val_low & 0xF);
+								}
+								else if (RAM_addr_low == 6)
+								{
+									RTC_regs[4] = (byte)(RAM_val_high & 0xF);
+									RTC_regs[3] = (byte)(RAM_val_low & 0xF);
+								}
+								else
+								{
+									
+								}
+								break;
+							case 4:
+								// read from seconds register (time changes are checked when it rolls over)
+								Chip_return_low = (byte)(RTC_regs[0] & 0xF);
+								break;
+						}
+
+						//Console.WriteLine("CTRL: " + (value >> 1) + " RAM_high:" + RAM_addr_high + " RAM_low: " + RAM_addr_low + " val: " + (byte)((RAM_val_high << 4) | RAM_val_low) + " Cpu: " + Core.cpu.TotalExecutedCycles);
+						break;
+					case 7:
+						RAM_addr_low = (value & 0xF);
+
+						//Console.WriteLine(" RAM_low:" + RAM_addr_low + " Cpu: " + Core.cpu.TotalExecutedCycles);
+						break;
 				}
 			}
+			else if (addr == 0xA001)
+			{
+				ctrl = value;
+			}
 		}
 
 		public override void PokeMemory(ushort addr, byte value)
 		{
 			WriteMemory(addr, value);
 		}
+
+		public override void RTC_Get(int value, int index)
+		{
+			if (index < 10)
+			{
+				RTC_regs[index] = (byte)value;
+			}
+			else
+			{
+				RTC_offset = value;
+			}
+		}
+
+		public override void Mapper_Tick()
+		{
+			if (!halt)
+			{
+				RTC_timer++;
+
+				if (RTC_timer == 128)
+				{
+					RTC_timer = 0;
+
+					RTC_low_clock++;
+
+					if (RTC_low_clock == 32768)
+					{
+						RTC_low_clock = 0;
+						RTC_timer = RTC_offset;
+
+						RTC_regs[0]++;
+
+						if (RTC_regs[0] > 59)
+						{
+							RTC_regs[0] = 0;
+							RTC_regs[1]++;
+							// 1's digit of minutes
+							if (RTC_regs[1] > 9)
+							{
+								RTC_regs[1] = 0;
+								RTC_regs[2]++;
+								// 10's digit of minutes
+								if (RTC_regs[2] > 5)
+								{
+									RTC_regs[2] = 0;
+									RTC_regs[3]++;
+									// 1's digit of hours
+									if (RTC_regs[3] > 9)
+									{
+										RTC_regs[3] = 0;
+										RTC_regs[4]++;
+										// 10's digit of hours
+										if (RTC_regs[4] > 2)
+										{
+											RTC_regs[4] = 0;
+											RTC_regs[5]++;
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		public override void SyncState(Serializer ser)
+		{
+			ser.Sync(nameof(ROM_bank), ref ROM_bank);
+			ser.Sync(nameof(ROM_mask), ref ROM_mask);
+			ser.Sync(nameof(RAM_bank), ref RAM_bank);
+			ser.Sync(nameof(RAM_mask), ref RAM_mask);
+			ser.Sync(nameof(halt), ref halt);
+			ser.Sync(nameof(RTC_regs), ref RTC_regs, false);
+			ser.Sync(nameof(RTC_timer), ref RTC_timer);
+			ser.Sync(nameof(RTC_low_clock), ref RTC_low_clock);
+			ser.Sync(nameof(RTC_offset), ref RTC_offset);
+			ser.Sync(nameof(ctrl), ref ctrl);
+			ser.Sync(nameof(RAM_addr_low), ref RAM_addr_low);
+			ser.Sync(nameof(RAM_addr_high), ref RAM_addr_high);
+			ser.Sync(nameof(RAM_val_low), ref RAM_val_low);
+			ser.Sync(nameof(RAM_val_high), ref RAM_val_high);
+			ser.Sync(nameof(Chip_return_low), ref Chip_return_low);
+			ser.Sync(nameof(Chip_return_high), ref Chip_return_high);
+		}
 	}
 }
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/PPU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/PPU.cs
index fecce56c1a..6afdad2f57 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/PPU.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/PPU.cs
@@ -11,6 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 		public uint[] OBJ_palette = new uint[32];
 
 		public bool HDMA_active;
+		public bool clear_screen;
 
 		// register variables
 		public byte LCDC;
@@ -103,6 +104,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 		public int window_x_tile;
 		public int window_y_tile_inc;
 		public int window_x_latch;
+		public int window_y_latch;
 
 		public int hbl_countdown;
 
@@ -171,6 +173,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			ser.Sync(nameof(BG_palette), ref BG_palette, false);
 			ser.Sync(nameof(OBJ_palette), ref OBJ_palette, false);
 			ser.Sync(nameof(HDMA_active), ref HDMA_active);
+			ser.Sync(nameof(clear_screen), ref clear_screen);
 
 			ser.Sync(nameof(LCDC), ref LCDC);
 			ser.Sync(nameof(STAT), ref STAT);
@@ -259,6 +262,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			ser.Sync(nameof(window_x_tile), ref window_x_tile);
 			ser.Sync(nameof(window_y_tile_inc), ref window_y_tile_inc);
 			ser.Sync(nameof(window_x_latch), ref window_x_latch);
+			ser.Sync(nameof(window_y_latch), ref window_y_latch);
 
 			ser.Sync(nameof(hbl_countdown), ref hbl_countdown);
 		}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISettable.cs
index 79ab75ecc1..73046bdbac 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISettable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISettable.cs
@@ -102,6 +102,24 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
 				set { _RTCInitialTime_R = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
 			}
 
+			[DisplayName("RTC Offset L")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset_L
+			{
+				get { return _RTCOffset_L; }
+				set { _RTCOffset_L = Math.Max(-127, Math.Min(127, value)); }
+			}
+
+			[DisplayName("RTC Offset R")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset_R
+			{
+				get { return _RTCOffset_R; }
+				set { _RTCOffset_R = Math.Max(-127, Math.Min(127, value)); }
+			}
+
 			[DisplayName("Timer Div Initial Time L")]
 			[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
 			[DefaultValue(8)]
@@ -127,9 +145,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
 
 			[JsonIgnore]
 			private int _RTCInitialTime_L;
+			[JsonIgnore]
 			private int _RTCInitialTime_R;
 			[JsonIgnore]
+			private int _RTCOffset_L;
+			[JsonIgnore]
+			private int _RTCOffset_R;
+			[JsonIgnore]
 			public ushort _DivInitialTime_L = 8;
+			[JsonIgnore]
 			public ushort _DivInitialTime_R = 8;
 
 			public GBLinkSyncSettings Clone()
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs
index cfce79de94..a38a4d091e 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs
@@ -56,6 +56,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
 			temp_sync_R.DivInitialTime = linkSyncSettings.DivInitialTime_R;
 			temp_sync_L.RTCInitialTime = linkSyncSettings.RTCInitialTime_L;
 			temp_sync_R.RTCInitialTime = linkSyncSettings.RTCInitialTime_R;
+			temp_sync_L.RTCOffset = linkSyncSettings.RTCOffset_L;
+			temp_sync_R.RTCOffset = linkSyncSettings.RTCOffset_R;
 
 			L = new GBHawk.GBHawk(new CoreComm(comm.ShowMessage, comm.Notify) { CoreFileProvider = comm.CoreFileProvider },
 				game_L, rom_L, temp_set_L, temp_sync_L);
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISettable.cs
index 8e74c66c2b..0e959567d2 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISettable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISettable.cs
@@ -122,6 +122,33 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
 				set { _RTCInitialTime_R = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
 			}
 
+			[DisplayName("RTC Offset L")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset_L
+			{
+				get { return _RTCOffset_L; }
+				set { _RTCOffset_L = Math.Max(-127, Math.Min(127, value)); }
+			}
+
+			[DisplayName("RTC Offset C")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset_C
+			{
+				get { return _RTCOffset_C; }
+				set { _RTCOffset_C = Math.Max(-127, Math.Min(127, value)); }
+			}
+
+			[DisplayName("RTC Offset R")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset_R
+			{
+				get { return _RTCOffset_R; }
+				set { _RTCOffset_R = Math.Max(-127, Math.Min(127, value)); }
+			}
+
 			[DisplayName("Timer Div Initial Time L")]
 			[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
 			[DefaultValue(8)]
@@ -156,11 +183,21 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
 
 			[JsonIgnore]
 			private int _RTCInitialTime_L;
+			[JsonIgnore]
 			private int _RTCInitialTime_C;
+			[JsonIgnore]
 			private int _RTCInitialTime_R;
 			[JsonIgnore]
+			private int _RTCOffset_L;
+			[JsonIgnore]
+			private int _RTCOffset_C;
+			[JsonIgnore]
+			private int _RTCOffset_R;
+			[JsonIgnore]
 			public ushort _DivInitialTime_L = 8;
+			[JsonIgnore]
 			public ushort _DivInitialTime_C = 8;
+			[JsonIgnore]
 			public ushort _DivInitialTime_R = 8;
 
 			public GBLink3xSyncSettings Clone()
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs
index f5ef14ac41..e939891b20 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs
@@ -61,6 +61,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
 			temp_sync_L.RTCInitialTime = Link3xSyncSettings.RTCInitialTime_L;
 			temp_sync_C.RTCInitialTime = Link3xSyncSettings.RTCInitialTime_C;
 			temp_sync_R.RTCInitialTime = Link3xSyncSettings.RTCInitialTime_R;
+			temp_sync_L.RTCOffset = Link3xSyncSettings.RTCOffset_L;
+			temp_sync_C.RTCOffset = Link3xSyncSettings.RTCOffset_C;
+			temp_sync_R.RTCOffset = Link3xSyncSettings.RTCOffset_R;
 
 			L = new GBHawk.GBHawk(new CoreComm(comm.ShowMessage, comm.Notify) { CoreFileProvider = comm.CoreFileProvider },
 				game_L, rom_L, temp_set_L, temp_sync_L);
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISettable.cs
index 65239aec31..0ada335d84 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISettable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISettable.cs
@@ -142,6 +142,42 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
 				set { _RTCInitialTime_D = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
 			}
 
+			[DisplayName("RTC Offset A")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset_A
+			{
+				get { return _RTCOffset_A; }
+				set { _RTCOffset_A = Math.Max(-127, Math.Min(127, value)); }
+			}
+
+			[DisplayName("RTC Offset B")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset_B
+			{
+				get { return _RTCOffset_B; }
+				set { _RTCOffset_B = Math.Max(-127, Math.Min(127, value)); }
+			}
+
+			[DisplayName("RTC Offset C")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset_C
+			{
+				get { return _RTCOffset_C; }
+				set { _RTCOffset_C = Math.Max(-127, Math.Min(127, value)); }
+			}
+
+			[DisplayName("RTC Offset D")]
+			[Description("Set error in RTC clocking (-127 to 127)")]
+			[DefaultValue(0)]
+			public int RTCOffset_D
+			{
+				get { return _RTCOffset_D; }
+				set { _RTCOffset_D = Math.Max(-127, Math.Min(127, value)); }
+			}
+
 			[DisplayName("Timer Div Initial Time A")]
 			[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
 			[DefaultValue(8)]
@@ -185,13 +221,27 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
 
 			[JsonIgnore]
 			private int _RTCInitialTime_A;
+			[JsonIgnore]
 			private int _RTCInitialTime_B;
+			[JsonIgnore]
 			private int _RTCInitialTime_C;
+			[JsonIgnore]
 			private int _RTCInitialTime_D;
 			[JsonIgnore]
+			private int _RTCOffset_A;
+			[JsonIgnore]
+			private int _RTCOffset_B;
+			[JsonIgnore]
+			private int _RTCOffset_C;
+			[JsonIgnore]
+			private int _RTCOffset_D;
+			[JsonIgnore]
 			public ushort _DivInitialTime_A = 8;
+			[JsonIgnore]
 			public ushort _DivInitialTime_B = 8;
+			[JsonIgnore]
 			public ushort _DivInitialTime_C = 8;
+			[JsonIgnore]
 			public ushort _DivInitialTime_D = 8;
 
 			public GBLink4xSyncSettings Clone()
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs
index cf104fee68..6249d5f305 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs
@@ -68,6 +68,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
 			temp_sync_B.RTCInitialTime = Link4xSyncSettings.RTCInitialTime_B;
 			temp_sync_C.RTCInitialTime = Link4xSyncSettings.RTCInitialTime_C;
 			temp_sync_D.RTCInitialTime = Link4xSyncSettings.RTCInitialTime_D;
+			temp_sync_A.RTCOffset = Link4xSyncSettings.RTCOffset_A;
+			temp_sync_B.RTCOffset = Link4xSyncSettings.RTCOffset_B;
+			temp_sync_C.RTCOffset = Link4xSyncSettings.RTCOffset_C;
+			temp_sync_D.RTCOffset = Link4xSyncSettings.RTCOffset_D;
 
 			A = new GBHawk.GBHawk(new CoreComm(comm.ShowMessage, comm.Notify) { CoreFileProvider = comm.CoreFileProvider },
 				game_A, rom_A, temp_set_A, temp_sync_A);
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs
index 363895ef05..92759e216d 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs
@@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 			var right = R.GetCpuFlagsAndRegisters()
 				.Select(reg => new KeyValuePair<string, RegisterValue>("Right " + reg.Key, reg.Value));
 
-			return left.Union(right).ToList().ToDictionary(pair => pair.Key, pair => pair.Value);
+			return left.Union(right).ToDictionary(pair => pair.Key, pair => pair.Value);
 		}
 
 		public void SetCpuRegister(string register, int value)
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs
index 3cc7b24ec8..3601c271f3 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs
@@ -484,9 +484,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
 			}
 			this.bizhawkCore = bizhawkCore;
 
-			CoreDll = libLoader.LoadPlatformSpecific("mupen64plus");
-			if (CoreDll == IntPtr.Zero)
-				throw new InvalidOperationException("Failed to load mupen64plus.dll");
+			CoreDll = libLoader.LoadOrThrow("mupen64plus");
 
 			connectFunctionPointers();
 
@@ -914,7 +912,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
 
 				m64pCoreDoCommandPtr(m64p_command.M64CMD_ROM_CLOSE, 0, IntPtr.Zero);
 				m64pCoreShutdown();
-				libLoader.FreePlatformSpecific(CoreDll);
+				libLoader.FreeByPtr(CoreDll);
 
 				disposed = true;
 			}
@@ -934,8 +932,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
 				DetachPlugin(type);
 
 			AttachedPlugin plugin;
-			plugin.dllHandle = libLoader.LoadPlatformSpecific(PluginName);
-
+			plugin.dllHandle = libLoader.LoadOrThrow(PluginName);
 			plugin.dllStartup = (PluginStartup)Marshal.GetDelegateForFunctionPointer(libLoader.GetProcAddr(plugin.dllHandle, "PluginStartup"), typeof(PluginStartup));
 			plugin.dllShutdown = (PluginShutdown)Marshal.GetDelegateForFunctionPointer(libLoader.GetProcAddr(plugin.dllHandle, "PluginShutdown"), typeof(PluginShutdown));
 			plugin.dllStartup(CoreDll, null, null);
@@ -943,7 +940,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
 			m64p_error result = m64pCoreAttachPlugin(type, plugin.dllHandle);
 			if (result != m64p_error.M64ERR_SUCCESS)
 			{
-				libLoader.FreePlatformSpecific(plugin.dllHandle);
+				libLoader.FreeByPtr(plugin.dllHandle);
 				throw new InvalidOperationException($"Error during attaching plugin {PluginName}");
 			}
 
@@ -959,7 +956,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
 				plugins.Remove(type);
 				m64pCoreDetachPlugin(type);
 				plugin.dllShutdown();
-				libLoader.FreePlatformSpecific(plugin.dllHandle);
+				libLoader.FreeByPtr(plugin.dllHandle);
 			}
 		}
 
diff --git a/BizHawk.Emulation.Cores/CoreInventory.cs b/BizHawk.Emulation.Cores/CoreInventory.cs
index b093b81bb8..2c08e760e1 100644
--- a/BizHawk.Emulation.Cores/CoreInventory.cs
+++ b/BizHawk.Emulation.Cores/CoreInventory.cs
@@ -165,7 +165,7 @@ namespace BizHawk.Emulation.Cores
 						if (coreattr.Length != 1)
 							throw new InvalidOperationException($"{nameof(IEmulator)} {typ} without {nameof(CoreAttribute)}s!");
 						var cons = typ.GetConstructors(BindingFlags.Public | BindingFlags.Instance)
-							.Where(c => c.GetCustomAttributes(typeof(CoreConstructorAttribute), false).Length > 0).ToList();
+							.Where(c => c.GetCustomAttributes(typeof(CoreConstructorAttribute), false).Length > 0);
 						foreach(var con in cons)
 						{
 							foreach (string system in ((CoreConstructorAttribute)con.GetCustomAttributes(typeof(CoreConstructorAttribute), false)[0]).Systems)
diff --git a/BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs b/BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs
index b6b50b9298..96d5ac0756 100644
--- a/BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs
+++ b/BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs
@@ -253,17 +253,15 @@ namespace BizHawk.Emulation.Cores.Waterbox
 
 		private void RegisterSymbols()
 		{
-			var symbols = ((ISymbolTable)_elf.GetSection(".symtab"))
-			.Entries
-			.Cast<SymbolEntry<long>>();
+			_symlist = ((ISymbolTable) _elf.GetSection(".symtab")).Entries
+				.Cast<SymbolEntry<long>>()
+				.ToList();
 
 			// when there are duplicate names, don't register either in the dictionary
-			_symdict = symbols
-			.GroupBy(e => e.Name)
-			.Where(g => g.Count() == 1)
-			.ToDictionary(g => g.Key, g => g.First());
-
-			_symlist = symbols.ToList();
+			_symdict = _symlist
+				.GroupBy(e => e.Name)
+				.Where(g => g.Count() == 1)
+				.ToDictionary(g => g.Key, g => g.First());
 		}
 
 		public void Seal()
diff --git a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
index deb41e4f0d..db5e2a265a 100644
--- a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
+++ b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
@@ -38,6 +38,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -134,4 +135,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj.DotSettings b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj.DotSettings
+++ b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs b/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs
index f07ab2394a..14cb54fe02 100644
--- a/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs
+++ b/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs
@@ -182,9 +182,7 @@ namespace BizHawk.Emulation.DiscSystem
                 return fileNodes;
 
             // get all folders
-            List<KeyValuePair<string, ISONode>> dirs = (from a in Root.Children
-                                                       where a.Value.GetType() == typeof(ISODirectoryNode)
-                                                        select a).ToList();
+            var dirs = (from a in Root.Children where a.Value.GetType() == typeof(ISODirectoryNode) select a);
             // iterate through each folder
             foreach (var d in dirs)
             {
diff --git a/BizHawk.sln b/BizHawk.sln
index 53559fc6dc..adc162544e 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -1,7 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2047
-MinimumVisualStudioVersion = 12.0.31101.0
+# Visual Studio 16
+VisualStudioVersion = 16.0.28729.10
+MinimumVisualStudioVersion = 16.0.28729.10
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version", "Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}"
@@ -55,8 +55,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.BizwareGL.G
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Bizware.BizwareGL.SlimDX", "Bizware\BizHawk.Bizware.BizwareGL.SlimDX\BizHawk.Bizware.BizwareGL.SlimDX.csproj", "{E6B436B1-A3CD-4C9A-8F76-5D7154726884}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.MultiHawk", "BizHawk.Client.MultiHawk\BizHawk.Client.MultiHawk.csproj", "{B95649F5-A0AE-41EB-B62B-578A2AFF5E18}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.ApiHawk", "BizHawk.Client.ApiHawk\BizHawk.Client.ApiHawk.csproj", "{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}"
 EndProject
 Global
@@ -117,10 +115,6 @@ Global
 		{E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -141,7 +135,6 @@ Global
 		{2D2890A8-C338-4439-AD8B-CB9EE85A94F9} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{337CA23E-65E7-44E1-9411-97EE08BB8116} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
 		{E6B436B1-A3CD-4C9A-8F76-5D7154726884} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
-		{B95649F5-A0AE-41EB-B62B-578A2AFF5E18} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings
index 7ac019c4ad..759dbd9b23 100644
--- a/BizHawk.sln.DotSettings
+++ b/BizHawk.sln.DotSettings
@@ -178,29 +178,111 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=addr/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=amstrad/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Autofire/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=autoflushing/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=autohold/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=autoload/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=automagically/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=autorestore/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Autosave/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=backcolor/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bezier/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=botting/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bsnes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bundler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=chromeless/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Coalescer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Coleco/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=colesced/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Cpus/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=curr/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=dearchive/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dega/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dendy/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Disasm/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Disassemblable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=disassembly/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dontfire/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ejin/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Endian/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Fairchild/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Famtasia/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=FCEU/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=frameadvance/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=FCEUX/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=feos/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Framebuffer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Frameskip/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Frameskipping/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gameboy/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=gamedb/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Grafx/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=greenzone/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=greenzoned/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Homebrew/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hotkey/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hotkeys/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Intelli/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=INTV/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Libretro/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Lmsv/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Loadstate/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Loadstates/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=lsmv/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=LSNES/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=luases/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mainform/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mednafen/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Multidisk/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mupen/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Nametable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Nametables/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Nintendulator/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=nsamp/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Numerics/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=nvidia/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=opengl/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Overdump/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Overscan/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PCFX/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PCSX/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Phaser/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pollable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Regionable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resizer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=samp/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=saveram/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=savestate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=savestates/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Scanline/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Screenshot/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Screensize/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=speccy/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sram/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=sSeeki/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Statable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stateable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=subframe/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Syncless/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=taseditor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=tasproj/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Tastudio/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Turboing/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=unmerge/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unpause/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=unpaused/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=unpaused/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unpausing/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unthrottle/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unthrottled/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Vectrex/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Virtua/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Virtualpad/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Vsync/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Winform/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=winforms/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=WSWAN/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Xjin/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Yabause/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ZSNES/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
 	
\ No newline at end of file
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj
index e8c8f7bf56..7d1937a84c 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj
@@ -13,6 +13,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj.DotSettings b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj.DotSettings
+++ b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj
index 6fc816f4c6..b26d3fba84 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj
@@ -13,6 +13,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -45,7 +46,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\References\OpenTK.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+    <Reference Include="OpenTK.GLControl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\References\OpenTK.GLControl.dll</HintPath>
     </Reference>
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj.DotSettings b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj.DotSettings
+++ b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
index 0e850c9838..0da773623b 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
@@ -13,6 +13,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -37,7 +38,7 @@
     <CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\References\OpenTK.dll</HintPath>
     </Reference>
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj.DotSettings b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj.DotSettings
+++ b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
index f39ab75b16..fec5f64335 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
@@ -13,6 +13,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj.DotSettings b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj.DotSettings
+++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Dist/BuildAndPackage.bat b/Dist/BuildAndPackage.bat
index 616b39d95a..8884698994 100644
--- a/Dist/BuildAndPackage.bat
+++ b/Dist/BuildAndPackage.bat
@@ -9,15 +9,11 @@ if "%1"=="" (
 git --version > NUL
 @if errorlevel 1 goto MISSINGGIT
 
-reg query "HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath > nul 2>&1
-if ERRORLEVEL 1 goto MISSINGMSBUILD
+for /f "usebackq tokens=*" %%A in (`vswhere -version "[16.0,17.0)" -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe`) do SET MSBUILDPATH=%%A
 
-for /f "skip=2 tokens=2,*" %%A in ('reg.exe query "HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath') do SET MSBUILDDIR=%%B
+IF "%MSBUILDPATH%"=="" GOTO MISSINGMSBUILD
 
-IF NOT EXIST %MSBUILDDIR%nul goto MISSINGMSBUILD
-IF NOT EXIST %MSBUILDDIR%msbuild.exe goto MISSINGMSBUILD
-
-call "%MSBUILDDIR%msbuild.exe" ..\BizHawk.sln /p:Configuration=Release /p:Platform="Any Cpu" /t:rebuild
+call "%MSBUILDPATH%" ..\BizHawk.sln /p:Configuration=Release /p:Platform="Any Cpu" /t:rebuild
 
 @if errorlevel 1 goto MSBUILDFAILED
 
diff --git a/Dist/vswhere.exe b/Dist/vswhere.exe
new file mode 100644
index 0000000000..582e82868d
Binary files /dev/null and b/Dist/vswhere.exe differ
diff --git a/Version/Version.csproj b/Version/Version.csproj
index 85cf67cfdb..a09fa674e8 100644
--- a/Version/Version.csproj
+++ b/Version/Version.csproj
@@ -15,6 +15,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Version/Version.csproj.DotSettings b/Version/Version.csproj.DotSettings
index 73e96563f9..b9fd6ee4f5 100644
--- a/Version/Version.csproj.DotSettings
+++ b/Version/Version.csproj.DotSettings
@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp80</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Version/VersionInfo.cs b/Version/VersionInfo.cs
index 4517d707f7..b2114a1dde 100644
--- a/Version/VersionInfo.cs
+++ b/Version/VersionInfo.cs
@@ -5,7 +5,7 @@ internal static class VersionInfo
 	// keep this updated at every major release
 	public const string Mainversion = "2.3.2"; // Use numbers only or the new version notification won't work
 	public static readonly string RELEASEDATE = "June 18, 2019";
-	public static readonly bool DeveloperBuild = false;
+	public static readonly bool DeveloperBuild = true;
 	public static readonly string HomePage = "http://tasvideos.org/BizHawk.html";
 
 	public static readonly string CustomBuildString;
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..9be130f34b
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,37 @@
+version: 0.0.0.{build}
+branches:
+  only:
+  - master
+  - waterbox2
+image: Visual Studio 2019
+assembly_info:
+  patch: true
+  file: '**\AssemblyInfo.*'
+  assembly_version: '{version}'
+  assembly_file_version: '{version}'
+  assembly_informational_version: '{version}'
+build_script:
+- cmd: >-
+    SET TS=%APPVEYOR_REPO_COMMIT_TIMESTAMP%
+
+    SET BUILDCODE=%TS:~0,10%-%TS:~11,2%%TS:~14,2%%TS:~17,2%-#%APPVEYOR_REPO_COMMIT%
+
+    SET BUILDFILE=BizHawk_Developer-%BUILDCODE%.zip
+
+    echo %BUILDFILE%
+
+
+    cd dist
+
+    call BuildAndPackage_Developer.bat
+
+
+    move BizHawk-Developer.zip ..\%BUILDFILE%
+
+
+    cd ..
+
+    appveyor PushArtifact %BUILDFILE%
+
+
+    rem appveyor UpdateBuild -Version %BUILDFILE%
\ No newline at end of file