diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo
index eb2f4a698..d939bc47f 100644
Binary files a/.vs/AAWebPlatform/v15/.suo and b/.vs/AAWebPlatform/v15/.suo differ
diff --git a/Ecosystem.js b/Ecosystem.js
index faae1e831..e2bb15b79 100644
--- a/Ecosystem.js
+++ b/Ecosystem.js
@@ -212,7 +212,7 @@ function newEcosystem() {
                                     displayName: "Market Candle-Stairs per Period",
                                     description: "A set of files per period that contains all candle-stairs of one whole market.",
                                     storageAccount: "aatom",
-                                    filePath: "@Exchange/Tom/dataSet.V1/Output/CandleStairs/Multi-Period-Market/@Period",
+                                    filePath: "@Exchange/Tom/dataSet.V1/Output/Candle-Stairs/Multi-Period-Market/@Period",
                                     fileName: "@AssetA_@AssetB.json",
                                     exchangeList: {
                                         exchange: [{
@@ -272,7 +272,7 @@ function newEcosystem() {
                                         displayName: "Daily Candle-Stairs per Period",
                                         description: "A set of files per period that contains all candle-stairs of one whole market.",
                                         storageAccount: "aatom",
-                                        filePath: "@Exchange/Tom/dataSet.V1/Output/CandleStairs/Multi-Period-Daily/@Period/@Year/@Month/@Day",
+                                        filePath: "@Exchange/Tom/dataSet.V1/Output/Candle-Stairs/Multi-Period-Daily/@Period/@Year/@Month/@Day",
                                         fileName: "@AssetA_@AssetB.json",
                                         exchangeList: {
                                             exchange: [{
diff --git a/server.js b/server.js
index ea39703c4..069cfb7ef 100644
--- a/server.js
+++ b/server.js
@@ -30,7 +30,8 @@ function onContent (error, result) {
 return;
 */
 
-
+let debugMode = false;
+let githubPages = new Map;
 
 //'use strict';
 var http = require('http');
@@ -48,32 +49,47 @@ function onRequestReceivedFromBrowser(request, response) {
 
         case "AAMasters":
             {
-                /*
-                const octokit = require('@octokit/rest')()
-                global.atob = require("atob");
 
-                let owner = requestParameters[1];
-                let repo = requestParameters[2] + "-Plotter";
-                let branch = "master";
-                let page = 1;
-                let per_page = 100;
-                let ref = "master";
-                let path = requestParameters[3];
+                if (debugMode === true) {
 
-                octokit.repos.getContent({ owner, repo, path, ref }, onContent);
+                    respondWithFile('../' + requestParameters[2] + "-Plotter" + '/' + requestParameters[3], response);
 
-                function onContent(error, result) {
+                } else {
 
-                    let decoded = atob(result.data.content);
+                    let cacheVersion = githubPages.get(requestParameters[1] + requestParameters[2] + requestParameters[3])
 
-                    respondWithContent(decoded.substring(3), response);  // Eliminate first 2 bytes of noise.
+                    if (cacheVersion !== undefined) {
 
+                        respondWithContent(cacheVersion, response);
+
+                    } else {
+
+                        const octokit = require('@octokit/rest')()
+                        global.atob = require("atob");
+
+                        let owner = requestParameters[1];
+                        let repo = requestParameters[2] + "-Plotter";
+                        let branch = "master";
+                        let page = 1;
+                        let per_page = 100;
+                        let ref = "master";
+                        let path = requestParameters[3];
+
+                        octokit.repos.getContent({ owner, repo, path, ref }, onContent);
+
+                        function onContent(error, result) {
+
+                            let decoded = atob(result.data.content);
+
+                            let cleanString = decoded.substring(3); // Eliminate first 2 bytes of noise.
+
+                            respondWithContent(cleanString, response);
+
+                            githubPages.set(requestParameters[1] + requestParameters[2] + requestParameters[3], cleanString);
+
+                        }
+                    }
                 }
-                */
-
-
-                respondWithFile('../' + requestParameters[2] + "-Plotter" + '/' + requestParameters[3], response);
-
             }
             break;