diff --git a/.gitignore b/.gitignore
index 0caa3e0..dab08d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,7 @@
 
 # Text editor remnants
 *.swp
-.vscode/*
+# vscode/*
 .idea/*
 
 # General project-specific ignores
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000..6b146dc
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,29 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "${workspaceFolder}/include",
+                "${workspaceFolder}/include/**",
+                "${workspaceFolder}/include/dxsdk",
+                "${workspaceFolder}/include/GL",
+                "${workspaceFolder}/include/libc",
+                "${workspaceFolder}/include/PR",
+                "${workspaceFolder}/include/stb"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE",
+                "_UNICODE"
+            ],
+            "windowsSdkVersion": "10.0.22621.0",
+            "compilerPath": "cl.exe",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "windows-msvc-x64",
+            "configurationProvider": "ms-vscode.makefile-tools"
+        }
+    ],
+    "version": 4
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..a18b0c8
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,42 @@
+{
+    "files.associations": {
+      "sm64.h": "c",
+      "gfx_dimensions.h": "c",
+      "gbi.h": "c",
+      "options_menu.h": "c",
+      "*.in": "cpp",
+      "chrono": "cpp",
+      "functional": "cpp"
+    },
+    // https://stackoverflow.com/questions/45836650/how-do-i-integrate-msys2-shell-into-visual-studio-code-on-window
+    "terminal.integrated.profiles.windows": {
+    "PowerShell": {
+      "source": "PowerShell",
+      "icon": "terminal-powershell"
+    },
+    "Command Prompt": {
+      "path": [
+        "${env:windir}\\Sysnative\\cmd.exe",
+        "${env:windir}\\System32\\cmd.exe"
+      ],
+      "args": [],
+      "icon": "terminal-cmd"
+    },
+    "Git Bash": {
+      "source": "Git Bash"
+    },
+    "MSYS2": {
+      "path": "C:\\msys64\\usr\\bin\\bash.exe",
+      "args": [
+        "--login",
+        "-i"
+      ],
+      "env": {
+        "MSYSTEM": "MINGW64",
+        "CHERE_INVOKING": "1"
+      }
+    }
+  },
+
+
+}
\ No newline at end of file