diff --git a/lib/before-prepareJS.js b/lib/before-prepareJS.js
index d7b69a61..c490955a 100644
--- a/lib/before-prepareJS.js
+++ b/lib/before-prepareJS.js
@@ -7,8 +7,7 @@ module.exports = function ($mobileHelper, $projectData, hookArgs) {
 	const config = {
 		env,
 		platform,
-		bundle: appFilesUpdaterOptions.bundle,
-		watch: false // TODO: Read from CLI options...
+		bundle: appFilesUpdaterOptions.bundle
 	};
 	const result = config.bundle && runWebpackCompiler.bind(runWebpackCompiler, config, $mobileHelper, $projectData, hookArgs);
 	return result;
diff --git a/lib/before-watch.js b/lib/before-watch.js
new file mode 100644
index 00000000..e554ac28
--- /dev/null
+++ b/lib/before-watch.js
@@ -0,0 +1,21 @@
+const { runWebpackCompiler } = require("./compiler");
+
+module.exports = function ($mobileHelper, $projectData, hookArgs) {
+	if (hookArgs.config) {
+		const appFilesUpdaterOptions = hookArgs.config.appFilesUpdaterOptions;
+		if (appFilesUpdaterOptions.bundle) {
+			const platforms = hookArgs.config.platforms;
+			return Promise.all(platforms.map(platform => {
+				const env = hookArgs.config.env || {};
+				const config = {
+					env,
+					platform,
+					bundle: appFilesUpdaterOptions.bundle,
+					watch: true
+				};
+
+				return runWebpackCompiler(config, $mobileHelper, $projectData, hookArgs);
+			}));
+		}
+	}
+}
diff --git a/lib/before-watchPatterns.js b/lib/before-watchPatterns.js
new file mode 100644
index 00000000..0f3d89cf
--- /dev/null
+++ b/lib/before-watchPatterns.js
@@ -0,0 +1,16 @@
+const { AppDirectoryLocation } = require("./constants");
+
+module.exports = function (hookArgs) {
+	if (hookArgs.liveSyncData && hookArgs.liveSyncData.bundle) {
+		return (args, originalMethod) => {
+			return originalMethod().then(originalPatterns => {
+				const appDirectoryLocationIndex = originalPatterns.indexOf(AppDirectoryLocation);
+				if (appDirectoryLocationIndex !== -1) {
+					originalPatterns.splice(appDirectoryLocationIndex, 1);
+				}
+
+				return originalPatterns;
+			});
+		};
+	}
+}
diff --git a/lib/compiler.js b/lib/compiler.js
index f30173d8..04b14c8c 100644
--- a/lib/compiler.js
+++ b/lib/compiler.js
@@ -4,6 +4,7 @@ const { join, resolve: pathResolve } = require("path");
 const { existsSync } = require("fs");
 const readline = require("readline");
 const { messages } = require("../plugins/WatchStateLoggerPlugin");
+const { AppDirectoryLocation } = require("./constants");
 
 let hasBeenInvoked = false;
 
@@ -16,25 +17,19 @@ exports.getWebpackProcess = function getWebpackProcess() {
 exports.runWebpackCompiler = function runWebpackCompiler(config, $mobileHelper, $projectData, hookArgs, originalArgs, originalMethod) {
     if (config.bundle) {
         return new Promise(function (resolveBase, rejectBase) {
-            if (hookArgs && hookArgs.config && hookArgs.config.changesInfo) {
-                hookArgs.config.changesInfo.nativeChanged = true;
+            if (webpackProcess) {
+                return resolveBase();
             }
 
             let isResolved = false;
             function resolve() {
                 if (isResolved) return;
                 isResolved = true;
-                if (childProcess) {
-                    childProcess.removeListener("message", resolveOnWebpackCompilationComplete);
-                }
                 resolveBase();
             }
             function reject(error) {
                 if (isResolved) return;
                 isResolved = true;
-                if (childProcess) {
-                    childProcess.removeListener("message", resolveOnWebpackCompilationComplete);
-                }
                 rejectBase(error);
             }
 
@@ -75,11 +70,24 @@ exports.runWebpackCompiler = function runWebpackCompiler(config, $mobileHelper,
                 cwd: $projectData.projectDir
             });
 
+            let isFirstWebpackWatchCompilation = true;
             function resolveOnWebpackCompilationComplete(message) {
                 if (message === messages.compilationComplete) {
-                    console.log("Initial webpack build done!");
+                    console.log("Webpack build done!");
                     resolve();
                 }
+
+                if (message.emittedFiles) {
+                    if (isFirstWebpackWatchCompilation) {
+                        isFirstWebpackWatchCompilation = false;
+                        return;
+                    }
+
+                    if (hookArgs.filesToSync && hookArgs.startSyncFilesTimeout) {
+                        hookArgs.filesToSync.push(...message.emittedFiles.map(emittedFile => join($projectData.projectDir, AppDirectoryLocation, emittedFile)));
+                        hookArgs.startSyncFilesTimeout();
+                    }
+                }
             }
 
             if (config.watch) {
diff --git a/lib/constants.js b/lib/constants.js
new file mode 100644
index 00000000..3efcf965
--- /dev/null
+++ b/lib/constants.js
@@ -0,0 +1,3 @@
+module.exports = {
+	AppDirectoryLocation: "app"
+};
\ No newline at end of file
diff --git a/package.json b/package.json
index e4a07c5d..69b41d5b 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,16 @@
         "script": "lib/before-cleanApp.js",
         "inject": true
       },
+      {
+        "type": "before-watch",
+        "script": "lib/before-watch.js",
+        "inject": true
+      },
+      {
+        "type": "before-watchPatterns",
+        "script": "lib/before-watchPatterns.js",
+        "inject": true
+      },
       {
         "type": "after-prepare",
         "script": "lib/after-prepare.js",
diff --git a/plugins/WatchStateLoggerPlugin.ts b/plugins/WatchStateLoggerPlugin.ts
index 9bda54a0..e7264f45 100644
--- a/plugins/WatchStateLoggerPlugin.ts
+++ b/plugins/WatchStateLoggerPlugin.ts
@@ -13,7 +13,7 @@ export class WatchStateLoggerPlugin {
     isRunningWatching: boolean;
     apply(compiler) {
         const plugin = this;
-        compiler.plugin("watch-run", function(compiler, callback) {
+        compiler.plugin("watch-run", function (compiler, callback) {
             plugin.isRunningWatching = true;
             if (plugin.isRunningWatching) {
                 console.log(messages.changeDetected);
@@ -21,14 +21,21 @@ export class WatchStateLoggerPlugin {
             process.send && process.send(messages.changeDetected, error => null);
             callback();
         });
-        compiler.plugin("after-emit", function(compilation, callback) {
+        compiler.plugin("after-emit", function (compilation, callback) {
             callback();
             if (plugin.isRunningWatching) {
                 console.log(messages.startWatching);
             } else {
                 console.log(messages.compilationComplete);
             }
+
+            const emittedFiles = Object
+                .keys(compilation.assets)
+                .filter(assetKey => compilation.assets[assetKey].emitted);
+
             process.send && process.send(messages.compilationComplete, error => null);
+            // Send emitted files so they can be LiveSynced if need be
+            process.send && process.send({ emittedFiles }, error => null);
         });
     }
 }
diff --git a/templates/webpack.angular.js b/templates/webpack.angular.js
index 56434bcb..d280a5c0 100644
--- a/templates/webpack.angular.js
+++ b/templates/webpack.angular.js
@@ -20,6 +20,9 @@ module.exports = env => {
 
     const config = {
         context: resolve("./app"),
+        watchOptions: {
+            ignored: resolve("./app/App_Resources")
+        },
         target: nativescriptTarget,
         entry: {
             bundle: aot ? "./main.aot.ts" : "./main.ts",
diff --git a/templates/webpack.javascript.js b/templates/webpack.javascript.js
index 73127aa4..aa290210 100644
--- a/templates/webpack.javascript.js
+++ b/templates/webpack.javascript.js
@@ -18,6 +18,9 @@ module.exports = env => {
 
     const config = {
         context: resolve("./app"),
+        watchOptions: {
+            ignored: resolve("./app/App_Resources")
+        },
         target: nativescriptTarget,
         entry: {
             bundle: `./${nsWebpack.getEntryModule()}`,
diff --git a/templates/webpack.typescript.js b/templates/webpack.typescript.js
index c0129d7b..ec62f1a5 100644
--- a/templates/webpack.typescript.js
+++ b/templates/webpack.typescript.js
@@ -18,6 +18,9 @@ module.exports = env => {
 
     const config = {
         context: resolve("./app"),
+        watchOptions: {
+            ignored: resolve("./app/App_Resources")
+        },
         target: nativescriptTarget,
         entry: {
             bundle: `./${nsWebpack.getEntryModule()}`,