diff --git a/.vscode/launch.json b/.vscode/launch.json
index 42a3945c..d45dccbf 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -59,6 +59,20 @@
       "svdFile": "${workspaceRoot}/Motate/MotateProject/motate/cmsis/TARGET_Atmel/sam3x/ATSAM3X8E.svd",
       "armToolchainPath": "${workspaceRoot}/Motate/Tools/osx/gcc-arm-none-eabi-7u2/bin/",
       "preLaunchTask": "Build CONFIG=MiniMill Debug"
+    },
+    {
+      "name": "Debug CONFIG=MiniMill Unity (J-Link)",
+      "type": "cortex-debug",
+      "request": "launch",
+      "servertype": "jlink",
+      "cwd": "${workspaceRoot}/g2core/",
+      "executable": "./bin/MiniMill-g2v9k/g2core.elf",
+      "device": "ATSAM3X8E",
+      "interface": "swd",
+      "showDevDebugOutput": false,
+      "svdFile": "${workspaceRoot}/Motate/MotateProject/motate/cmsis/TARGET_Atmel/sam3x/ATSAM3X8E.svd",
+      "armToolchainPath": "${workspaceRoot}/Motate/Tools/osx/gcc-arm-none-eabi-7u2/bin/",
+      "preLaunchTask": "Build CONFIG=MiniMill Debug Unity"
     }
   ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 413b0510..23415ffe 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -30,18 +30,6 @@
         "fileLocation": ["relative", "${workspaceRoot}/g2core"]
       }
     },
-    {
-      "label": "Build CONFIG=MiniMill Debug Unity",
-      "type": "process",
-      "command": "make",
-      "args": ["CONFIG=MiniMill", "VERBOSE=2", "COLOR=0", "DEBUG=2",
-         "RECORD=1"],
-      "group": "build",
-      "problemMatcher": {
-        "base": "$gcc",
-        "fileLocation": ["relative", "${workspaceRoot}/g2core"]
-      }
-    },
     {
       "label": "Build CONFIG=MiniMill Debug",
       "type": "process",