diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 000000000..d6577200b
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,9 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\src",
+    "\\src\\MacSrc"
+  ],
+  "SelectedNode": "\\src\\MacSrc\\Shock.c",
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/launch.vs.json b/.vs/launch.vs.json
new file mode 100644
index 000000000..628b1c321
--- /dev/null
+++ b/.vs/launch.vs.json
@@ -0,0 +1,16 @@
+{
+  "version": "0.2.1",
+  "configurations": 
+  [
+    {
+      "type": "cppdbg",
+      "name": "System Shock",
+      "project": "",
+      "cwd": "${workspaceRoot}\\build\\debug",
+      "program": "${debugInfo.target}\\build\\debug\\systemshock.exe",
+      "MIMode": "gdb",
+      "miDebuggerPath": "C:\\MinGW\\bin\\gdb.exe",
+      "externalConsole": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..c66869f8c
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,28 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${command:cmake.launchTargetPath}",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/build/debug",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "miDebuggerPath": "C:/MinGW/bin/gdb.exe",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..7b4940d41
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,43 @@
+{
+    "cmake.configureOnOpen": true,
+    "C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools",
+    "cmake-tools-helper.cmake_download_path": "C:\\Users\\Admin\\.vscode\\extensions\\maddouri.cmake-tools-helper-0.2.1\\cmake_download",
+    "terminal.integrated.shell.windows": "C:\\WINDOWS\\System32\\cmd.exe",    
+    "cmake.preferredGenerators": [ "Ninja", "Unix Makefiles" ],
+    "cmake.cmakePath": "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe",
+    "cmake.generator": "Ninja",
+    "cmake.configureSettings": 
+    {
+        "CMAKE_MAKE_PROGRAM": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\IDE\\CommonExtensions\\Microsoft\\CMake\\Ninja\\ninja.exe"
+    },
+    "cmake.useCMakeServer": true,
+    "cmake.buildDirectory": "${workspaceRoot}/build/${buildType}",
+    "cmake.defaultVariants": {
+        "buildType": {
+            "default": "debug",
+            "description": "The build type",
+            "choices": {
+                "debug": {
+                    "short": "x86-Debug",
+                    "long": "x86-Debug:Emit debug information without performing optimizations",
+                    "buildType": "Debug"
+                },
+                "release": {
+                    "short": "x86-Release",
+                    "long": "x86-Release: Enable optimizations, omit debug info",
+                    "buildType": "Release"
+                },
+                "minsize": {
+                    "short": "x86-ReleaseMinSize",
+                    "long": "x86-ReleaseMinSize: Optimize for smallest binary size",
+                    "buildType": "MinSizeRel"
+                },
+                "reldeb": {
+                    "short": "x86-ReleaseWithDbgInfo",
+                    "long": "x86-ReleaseWithDbgInfo: Perform optimizations AND include debugging information",
+                    "buildType": "RelWithDebInfo"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/CMakeSettings.json b/CMakeSettings.json
new file mode 100644
index 000000000..90809472f
--- /dev/null
+++ b/CMakeSettings.json
@@ -0,0 +1,89 @@
+{
+  // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file.
+  "configurations": [
+    {
+      "name": "debug",     
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x86" ],
+      "buildRoot": "${workspaceRoot}\\build\\${name}",
+      "installRoot": "${workspaceRoot}\\build\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v -d stats",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CMAKE_C_COMPILER",
+          "value": "C:/MinGW/bin/gcc.exe"
+        },
+        {
+          "name": "CMAKE_CXX_COMPILER",
+          "value": "C:/MinGW/bin/g++.exe"
+        }
+      ]
+    },
+    {
+      "name": "release",      
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "inheritEnvironments": [ "msvc_x86" ],
+      "buildRoot": "${workspaceRoot}\\build\\${name}",
+      "installRoot": "${workspaceRoot}\\build\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CMAKE_C_COMPILER",
+          "value": "C:/MinGW/bin/gcc.exe"
+        },
+        {
+          "name": "CMAKE_CXX_COMPILER",
+          "value": "C:/MinGW/bin/g++.exe"
+        }
+      ]
+    },
+    {
+      "name": "minsizerel",      
+      "generator": "Ninja",
+      "configurationType": "MinSizeRel",
+      "inheritEnvironments": [ "msvc_x86" ],
+      "buildRoot": "${workspaceRoot}\\build\\${name}",
+      "installRoot": "${workspaceRoot}\\build\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CMAKE_C_COMPILER",
+          "value": "C:/MinGW/bin/gcc.exe"
+        },
+        {
+          "name": "CMAKE_CXX_COMPILER",
+          "value": "C:/MinGW/bin/g++.exe"
+        }
+      ]
+    },
+    {
+      "name": "relwithdebinfo",      
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "inheritEnvironments": [ "msvc_x86" ],
+      "buildRoot": "${workspaceRoot}\\build\\${name}",
+      "installRoot": "${workspaceRoot}\\build\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "CMAKE_C_COMPILER",
+          "value": "C:/MinGW/bin/gcc.exe"
+        },
+        {
+          "name": "CMAKE_CXX_COMPILER",
+          "value": "C:/MinGW/bin/g++.exe"
+        }
+      ]
+    }        
+  ]
+}
\ No newline at end of file