diff --git a/package-lock.json b/package-lock.json
index 8dd941ab943fd2727d03938f79af7d152d4c532c..cc7850e04ac8a1e255726dc3322017c6e38b0671 100644
Binary files a/package-lock.json and b/package-lock.json differ
diff --git a/package.json b/package.json
index 613df0b682dd2ee7346eb67466e334a8db1bf254..b8b457ae1a83f1f9dc670dabb29632d651da5a02 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,13 @@
   "scripts": {
     "lint": "tslint src/**/*.ts",
     "build": "cpx \"src/**/*.{vert,frag,glsl,scss,woff,woff2,ttf,otf,eot,svg,html,gql}\" build/node_modules/ && tsc",
-    "watch": "tsc -watch",
+    "watch": "concurrently --kill-others \"npm:watch-ts\" \"npm:watch-extra\" \"npm:watch-webpack\"",
+    "watch-ts": "tsc -watch",
     "watch-extra": "cpx \"src/**/*.{vert,frag,glsl,scss,woff,woff2,ttf,otf,eot,svg,html,gql}\" build/node_modules/ --watch",
-    "watch-all-win": "start cmd /K npm run watch & start cmd /K npm run watch-extra & start cmd /K npm run watch-viewer & start http-server -p 1338",
+    "watch-all-win": "start cmd /K npm run watch-ts & start cmd /K npm run watch-extra & start cmd /K npm run watch-viewer & start http-server -p 1338",
     "test": "jest",
+    "build-webpack": "webpack --mode development",
+    "watch-webpack": "webpack -w --mode development",
     "build-viewer": "webpack build/node_modules/apps/viewer/index.js --mode development -o build/viewer/index.js",
     "watch-viewer": "webpack build/node_modules/apps/viewer/index.js -w --mode development -o build/viewer/index.js",
     "build-ms-query": "webpack build/node_modules/apps/model-server-query/index.js --mode development -o build/model-server-query/index.js",
@@ -87,6 +90,7 @@
     "@types/webgl2": "0.0.4",
     "benchmark": "^2.1.4",
     "circular-dependency-plugin": "^5.0.2",
+    "concurrently": "^4.1.0",
     "cpx": "^1.5.0",
     "css-loader": "^1.0.1",
     "extra-watch-webpack-plugin": "^1.0.3",