diff --git a/Images/AAMasters/AAChris-Indicator-Bot/Chris.png b/Images/AAMasters/AAChris-Indicator-Bot/Chris.png
new file mode 100644
index 000000000..22d3bb25d
Binary files /dev/null and b/Images/AAMasters/AAChris-Indicator-Bot/Chris.png differ
diff --git a/Images/AAMasters/PlottersBollingerBands/BollingerBands.png b/Images/AAMasters/PlottersBollingerBands/BollingerBands.png
new file mode 100644
index 000000000..8ad0ea31f
Binary files /dev/null and b/Images/AAMasters/PlottersBollingerBands/BollingerBands.png differ
diff --git a/Images/AAMasters/PlottersBollingerBands/PercentageBandwidth.png b/Images/AAMasters/PlottersBollingerBands/PercentageBandwidth.png
new file mode 100644
index 000000000..433558841
Binary files /dev/null and b/Images/AAMasters/PlottersBollingerBands/PercentageBandwidth.png differ
diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js
index 68f1fd9dd..daa68a10a 100644
--- a/Scripts/AppLoader.js
+++ b/Scripts/AppLoader.js
@@ -27,7 +27,9 @@
 
                 /* PlotterPanels */
 
+
                 "Globals.js",
+                "Ecosystem.js",
 
                 "BottomSpace/DeleteTradingHistory.js",
                 "BottomSpace/ChartAspectRatio.js",
@@ -65,10 +67,11 @@
                 "FloatingSpace/FloatingLayer.js",
 
                 "Exchange/ExchangeAPI.js",
-                "CloudVM/CloudSupport.js",
-                "CloudVM/CloudRequire.js",
-                "CloudVM/WebFS.js",
-                "CloudVM/CloudVM.js",
+
+                "CloudAppWrapper/CloudSupport.js",
+                "CloudAppWrapper/CloudRequire.js",
+                "CloudAppWrapper/WebFS.js",
+                "CloudAppWrapper/BrowserRun.js",
 
                 "Scales/ChartGrid.js",
                 "Scales/RightScale.js",
@@ -81,7 +84,6 @@
                 "ProductStorage.js",
                 "CompetitionStorage.js",
                 "ProductCard.js",
-                "Ecosystem.js",
 
                 "SplashScreen.js",
                 "Canvas.js",
@@ -107,10 +109,15 @@
             ];
 
             let downloadedCounter = 0;
+            let versionParam = window.canvasApp.version;
+            if (versionParam === undefined) { versionParam = ''; }
+            else {
+                versionParam = '?' + versionParam;
+            }
 
             for (let i = 0; i < modulesArray.length; i++) {
 
-                let path = window.canvasApp.urlPrefix + modulesArray[i];
+                let path = window.canvasApp.urlPrefix + modulesArray[i] + versionParam;
 
                 REQUIREJS([path], onRequired);
 
diff --git a/index.html b/index.html
index 97dd99762..577e9b781 100644
--- a/index.html
+++ b/index.html
@@ -15,11 +15,15 @@
 <body id="body" style="margin: 0px; padding: 0px; border: 0px; overflow:hidden;" onresize="window.canvasApp.eventHandler.raiseEvent('Browser Resized');" onload="
 
     window.canvasApp = {
+        version: '1.0.0',  // This is used to avoid catching problems at the browser level.
         sessionToken: '',
         executingAt: 'Master App',
         visible: true,
         topMargin: 85,
         urlPrefix: 'http://localhost:1337/',
+        graphQL: {
+            masterAppApiUrl: 'http://localhost:4100/graphql',
+        },
         context: {}
     };
 
diff --git a/server.js b/server.js
index 457969ea8..31aa8e0ec 100644
--- a/server.js
+++ b/server.js
@@ -183,7 +183,6 @@ function onBrowserRequest(request, response) {
     let htmlResponse;
     let requestParameters = request.url.split("/");
 
-
     if (requestParameters[1].indexOf("index.html") >= 0) {
 
         /*
@@ -201,7 +200,8 @@ function onBrowserRequest(request, response) {
         return;
     }
 
-
+    requestParameters = request.url.split("?"); // Remove version information
+    requestParameters = requestParameters[0].split("/"); 
 
     switch (requestParameters[1]) {
 
@@ -435,7 +435,7 @@ function onBrowserRequest(request, response) {
             }
             break;
 
-        case "CloudVM": // This means the CloudVM folder.
+        case "CloudAppWrapper": // This means the BrowserRun folder.
             {
                 let filePath = requestParameters[2];
 
@@ -447,7 +447,7 @@ function onBrowserRequest(request, response) {
                     filePath = filePath + "/" + requestParameters[4];
                 }
 
-                respondWithFile(serverConfig.pathToCanvasApp +'/CloudVM/' + filePath, response);
+                respondWithFile(serverConfig.pathToCloudAppWrapperComponent + '/' + filePath, response);
 
             }
             break;
@@ -1071,7 +1071,7 @@ function onBrowserRequest(request, response) {
 
         case "Files":
             {
-                respondWithFile(serverConfig.pathToCanvasApp + '/' + requestParameters[1] + '/' + requestParameters[2], response);
+                respondWithFile(serverConfig.pathToFilesComponent + '/' + requestParameters[2], response);
             }
             break;