diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
index e67abf06ef..330d669ef8 100644
--- a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
+++ b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
@@ -115,8 +115,8 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
 		}
 
 		private static readonly List<string> RealButtons = new List<string>(Keyboard.GetKeyNames()
-			.Where(k => k != "White Apple") // Hack because these buttons aren't wired up yet
-			.Where(k => k != "Black Apple")
+			//.Where(k => k != "White Apple") // Hack because these buttons aren't wired up yet
+			//.Where(k => k != "Black Apple")
 			.Where(k => k != "Reset"));
 
 		private static readonly List<string> ExtraButtons = new List<string>
diff --git a/BizHawk.sln b/BizHawk.sln
index 7f33fcf4e2..8e9fe65e66 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.136
 MinimumVisualStudioVersion = 12.0.31101.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version", "Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}"
 EndProject
@@ -59,6 +59,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.MultiHawk",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.ApiHawk", "BizHawk.Client.ApiHawk\BizHawk.Client.ApiHawk.csproj", "{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtu", "ExternalCoreProjects\Virtu\Virtu.csproj", "{8E522778-7A2C-4364-BDCE-0BA5623828E1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -245,6 +247,18 @@ Global
 		{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|x64.Build.0 = Release|Any CPU
 		{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|x86.ActiveCfg = Release|Any CPU
 		{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|x86.Build.0 = Release|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|x86.Build.0 = Debug|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|x64.Build.0 = Release|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -264,6 +278,9 @@ Global
 		{B95649F5-A0AE-41EB-B62B-578A2AFF5E18} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9B9E4316-9185-412E-B951-A63355ACA956}
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj
 	EndGlobalSection
diff --git a/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/db.lock b/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/db.lock
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide b/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide
new file mode 100644
index 0000000000..9f73c3360a
Binary files /dev/null and b/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide differ
diff --git a/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide-shm b/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide-shm
new file mode 100644
index 0000000000..fe9ac2845e
Binary files /dev/null and b/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide-wal b/ExternalCoreProjects/Virtu/.vs/Virtu/v15/Server/sqlite3/storage.ide-wal
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ExternalCoreProjects/Virtu/GamePort.cs b/ExternalCoreProjects/Virtu/GamePort.cs
index a562f35da7..0f78c4d50d 100644
--- a/ExternalCoreProjects/Virtu/GamePort.cs
+++ b/ExternalCoreProjects/Virtu/GamePort.cs
@@ -9,8 +9,8 @@ namespace Jellyfish.Virtu
     public sealed class GamePort : MachineComponent
     {
 		// TODO: ressurect this
-		public bool ReadButton0() { return false; }
-		public bool ReadButton1() { return false; }
+		public bool ReadButton0() { return Keyboard.WhiteAppleDown; }
+		public bool ReadButton1() { return Keyboard.BlackAppleDown; }
 		public bool ReadButton2() { return false; }
 
 		public bool Paddle0Strobe { get { return false; } }
diff --git a/ExternalCoreProjects/Virtu/Keyboard.cs b/ExternalCoreProjects/Virtu/Keyboard.cs
index 650eb14aff..e598b881a7 100644
--- a/ExternalCoreProjects/Virtu/Keyboard.cs
+++ b/ExternalCoreProjects/Virtu/Keyboard.cs
@@ -264,6 +264,9 @@ namespace Jellyfish.Virtu
         {
         }
 
+		public static bool WhiteAppleDown;
+		public static bool BlackAppleDown;
+
 		/// <summary>
 		/// Call this at 60hz with all of the currently pressed keys
 		/// </summary>
@@ -272,8 +275,15 @@ namespace Jellyfish.Virtu
 		{
 			Keys keys = FromStrings(keynames);
 
-			if (keys.HasFlag(Keys.WhiteApple)) { } // TODO: set GAME1
-			if (keys.HasFlag(Keys.BlackApple)) { } // TODO: set GAME2
+			if (keys.HasFlag(Keys.WhiteApple))
+				WhiteAppleDown = true;
+			else
+				WhiteAppleDown = false;
+
+			if (keys.HasFlag(Keys.BlackApple))
+				BlackAppleDown = true;
+			else
+				BlackAppleDown = false;
 
 			if (keys.HasFlag(Keys.Reset) && keys.HasFlag(Keys.Control)) { } // TODO: reset console
 
diff --git a/ExternalCoreProjects/Virtu/Virtu.csproj b/ExternalCoreProjects/Virtu/Virtu.csproj
index ad68f03108..e3e9fc67b1 100644
--- a/ExternalCoreProjects/Virtu/Virtu.csproj
+++ b/ExternalCoreProjects/Virtu/Virtu.csproj
@@ -74,7 +74,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy /y $(TargetDir)$(TargetFileName) $(ProjectDir)..\..\references\$(TargetFileName)</PostBuildEvent>
+    <PostBuildEvent>copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\references\$(TargetFileName)"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/References/Virtu.dll b/References/Virtu.dll
index 2e66b2f851..8d73f2512d 100644
Binary files a/References/Virtu.dll and b/References/Virtu.dll differ