diff --git a/.gitignore b/.gitignore
index c6127b3..b3c4f02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,8 @@ modules.order
 Module.symvers
 Mkfile.old
 dkms.conf
+
+# Visual Studio 2019
+/.vs/
+/Debug
+/Release
diff --git a/emu6502.sln b/emu6502.sln
new file mode 100644
index 0000000..9ea003c
--- /dev/null
+++ b/emu6502.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.156
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emu6502", "emu6502.vcxproj", "{DA763E7C-CD88-4DE0-824E-39C7290F69E3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DA763E7C-CD88-4DE0-824E-39C7290F69E3}.Debug|x64.ActiveCfg = Debug|x64
+		{DA763E7C-CD88-4DE0-824E-39C7290F69E3}.Debug|x64.Build.0 = Debug|x64
+		{DA763E7C-CD88-4DE0-824E-39C7290F69E3}.Debug|x86.ActiveCfg = Debug|Win32
+		{DA763E7C-CD88-4DE0-824E-39C7290F69E3}.Debug|x86.Build.0 = Debug|Win32
+		{DA763E7C-CD88-4DE0-824E-39C7290F69E3}.Release|x64.ActiveCfg = Release|x64
+		{DA763E7C-CD88-4DE0-824E-39C7290F69E3}.Release|x64.Build.0 = Release|x64
+		{DA763E7C-CD88-4DE0-824E-39C7290F69E3}.Release|x86.ActiveCfg = Release|Win32
+		{DA763E7C-CD88-4DE0-824E-39C7290F69E3}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {89958CA4-6874-4254-A138-B733DA389D80}
+	EndGlobalSection
+EndGlobal
diff --git a/emu6502.vcxproj b/emu6502.vcxproj
index 181315e..b7b79d1 100644
--- a/emu6502.vcxproj
+++ b/emu6502.vcxproj
@@ -89,7 +89,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
@@ -121,7 +121,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
@@ -152,11 +152,17 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="cpu.c" />
+    <ClCompile Include="disassembler.c" />
     <ClCompile Include="emu6502.c" />
+    <ClCompile Include="test6502.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="cpu.h" />
+    <ClInclude Include="disassembler.h" />
     <ClInclude Include="flags.h" />
+    <ClInclude Include="opcodes.h" />
     <ClInclude Include="state.h" />
+    <ClInclude Include="test6502.h" />
     <ClInclude Include="types.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />