diff --git a/frontend/check_setup.bat b/frontend/check_setup.bat
index 05ab21ef..f3f8e6f0 100644
--- a/frontend/check_setup.bat
+++ b/frontend/check_setup.bat
@@ -1,8 +1,10 @@
 @echo off
 
+echo check_setup starting...
 if exist "setup" (
     echo setup.bat has already been called, skipping...
 ) else (
     echo setup.bat has not been called yet, installing!
 	call .\setup.bat
-)
\ No newline at end of file
+)
+echo check_setup completed!
\ No newline at end of file
diff --git a/frontend/server/.vscode/tasks.json b/frontend/server/.vscode/tasks.json
index aa920e40..6b76fb4f 100644
--- a/frontend/server/.vscode/tasks.json
+++ b/frontend/server/.vscode/tasks.json
@@ -3,12 +3,28 @@
     // for the documentation about the tasks.json format
     "version": "2.0.0",
     "tasks": [
+        {
+            "label": "check-setup", 
+            "type": "shell",
+            "command": "cd .. ; ./check_setup.bat",
+            "isBackground": false
+        },
         {
             "label": "demo-server", 
             "type": "shell",
             "command": "./scripts/demo-server.bat",
             "args": ["${input:enterDir}/Config/olympus.json"],
-            "isBackground": true
+            "isBackground": true,
+            "dependsOn": ["check-setup"],
+            "problemMatcher":{
+                "owner": "custom",
+                "base": "$tsc-watch",
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": "Please wait",
+                    "endsPattern": "Waiting for connections..."
+                }
+            }
         }
     ], 
     "inputs": [
diff --git a/frontend/server/scripts/demo-server.bat b/frontend/server/scripts/demo-server.bat
index 88807d6b..27a06af6 100644
--- a/frontend/server/scripts/demo-server.bat
+++ b/frontend/server/scripts/demo-server.bat
@@ -1,7 +1,3 @@
-cd ..
-call .\check_setup.bat 
-cd server
-
 call .\scripts\copy.bat
 call .\scripts\create-mock-dcs.bat
 node .\bin\demo --config %1
\ No newline at end of file
diff --git a/frontend/website/.vscode/tasks.json b/frontend/website/.vscode/tasks.json
index 6991ede1..88db0e1e 100644
--- a/frontend/website/.vscode/tasks.json
+++ b/frontend/website/.vscode/tasks.json
@@ -3,11 +3,27 @@
     // for the documentation about the tasks.json format
     "version": "2.0.0",
     "tasks": [
+        {
+            "label": "check-setup", 
+            "type": "shell",
+            "command": "cd .. ; ./check_setup.bat",
+            "isBackground": false
+        },
         {
             "label": "watch",
             "type": "shell",
             "command": "./scripts/watch.bat",
-            "isBackground": true
+            "isBackground": true,
+            "problemMatcher":{
+                "owner": "custom",
+                "base": "$tsc-watch",
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": "watchify",
+                    "endsPattern": "bytes written"
+                }
+            },
+            "dependsOn": ["check-setup"]
         }
     ]
 }
\ No newline at end of file
diff --git a/frontend/website/scripts/watch.bat b/frontend/website/scripts/watch.bat
index 43a50e1d..d62a3599 100644
--- a/frontend/website/scripts/watch.bat
+++ b/frontend/website/scripts/watch.bat
@@ -1,5 +1 @@
-cd ..
-call .\check_setup.bat 
-cd website
-
-watchify .\src\index.ts --debug -o ..\server\public\javascripts\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ]
\ No newline at end of file
+watchify .\src\index.ts --debug -o ..\server\public\javascripts\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] -v
\ No newline at end of file