diff --git a/.gitignore b/.gitignore
index c48125d9c..526a19d01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ TestResults/
 *.ipch
 .hg
 .vs
+.vscode
 Python/Product/PythonTools/Templates/Files/*/*RoleConfiguration.mht
 Python/Product/PythonTools/Templates/Projects/*/*RoleConfiguration.mht
 Python/Product/PythonTools/Templates/Files/*/ConfigureCloudService.ps1
diff --git a/.vscode/launch.json b/.vscode/launch.json
index a3bea67ea..80e84bad8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,16 +1,35 @@
 {
-    // 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": "Python: Current File",
-            "type": "python",
-            "request": "launch",
-            "program": "${file}",
-            "console": "integratedTerminal",
-            "cwd": "${fileDirname}"
-        }
-    ]
-}
\ No newline at end of file
+  // 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": "Python: Remote Attach",
+      "type": "python",
+      "request": "attach",
+      "connect": { "host": "localhost", "port": 5678 },
+      "pathMappings": [
+        { "localRoot": "${workspaceFolder}", "remoteRoot": "." }
+      ],
+      "justMyCode": false
+    },
+    {
+      "name": "Python: Current File",
+      "type": "python",
+      "request": "launch",
+      "program": "${file}",
+      "console": "integratedTerminal",
+      "cwd": "${fileDirname}"
+    },
+    {
+      "name": "Python: Current File with args",
+      "type": "python",
+      "request": "launch",
+      "program": "${file}",
+      "console": "integratedTerminal",
+      "cwd": "${fileDirname}",
+      "args": ["--port=61510", "--execution-mode=ptvsd.repl.ipython.IPythonBackend"]
+    }
+  ]
+}