diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo
index 6fdc2e199..137ffc25e 100644
Binary files a/.vs/AAWebPlatform/v15/.suo and b/.vs/AAWebPlatform/v15/.suo differ
diff --git a/File.js b/File.js
index 290a28a1b..73068a2f3 100644
--- a/File.js
+++ b/File.js
@@ -26,7 +26,7 @@ function newFile() {
 
         /* Now we will get the file */
 
-        fileCloud.getFile(pSet, exchange, pMarket, undefined, undefined, onFileReceived);
+        fileCloud.getFile(pDevTeam, pBot, pSet, exchange, pMarket, undefined, undefined, onFileReceived);
 
         function onFileReceived(pFile) {
 
diff --git a/FileCache.js b/FileCache.js
index 164523cf1..34de3368f 100644
--- a/FileCache.js
+++ b/FileCache.js
@@ -40,7 +40,7 @@ function newFileCache() {
 
             if (pSet.validPeriods.includes(periodName) === true) {
 
-                fileCloud.getFile(pSet, exchange, pMarket, periodName, undefined, onFileReceived);
+                fileCloud.getFile(pDevTeam, pBot, pSet, exchange, pMarket, periodName, undefined, onFileReceived);
 
                 function onFileReceived(file) {
 
diff --git a/FileCloud.js b/FileCloud.js
index f4933a4e3..9462d17a6 100644
--- a/FileCloud.js
+++ b/FileCloud.js
@@ -18,7 +18,7 @@ function newFileCloud() {
 
     }
 
-    function getFile(pSet, pExchange, pMarket, pPeriodName, pDatetime, callBackFunction) {
+    function getFile(pSet, pDevTeam, pBot, pExchange, pMarket, pPeriodName, pDatetime, callBackFunction) {
 
         let fileName = pSet.fileName;
         let filePath = pSet.filePath;
@@ -37,6 +37,8 @@ function newFileCloud() {
         fileName = fileName.replace("@AssetA", pMarket.assetA);
         fileName = fileName.replace("@AssetB", pMarket.assetB);
 
+        filePath = filePath.replace("@DevTeam", pDevTeam.codeName);
+        filePath = filePath.replace("@Bot", pBot.codeName);
         filePath = filePath.replace("@Exchange", pExchange.name);
         filePath = filePath.replace("@Period", pPeriodName);
 
diff --git a/FileCursor.js b/FileCursor.js
index 44c557d16..2aa2e591a 100644
--- a/FileCursor.js
+++ b/FileCursor.js
@@ -20,17 +20,21 @@ function newFileCursor() {
     let market;
     let exchange;
     let fileCloud;
+    let devTeam;
+    let bot;
     let thisSet;
     let periodName;
     let timePeriod;
 
     return fileCursor;
 
-    function initialize(pFileCloud, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, callBackFunction) {
+    function initialize(pFileCloud, pDevTeam, pBot, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, callBackFunction) {
 
         market = pMarket;
         exchange = pExchange;
         fileCloud = pFileCloud;
+        devTeam = pDevTeam;
+        bot = pBot;
         thisSet = pSet;
         periodName = pPeriodName;
         cursorDate = pCursorDate;
@@ -291,7 +295,7 @@ function newFileCursor() {
 
                 if (fileCursor.files.get(dateString) === undefined) { // We dont reload files we already have. 
 
-                    fileCloud.getFile(thisSet, exchange, market, periodName, targetDate, onFileReceived);
+                    fileCloud.getFile(devTeam, bot, thisSet, exchange, market, periodName, targetDate, onFileReceived);
 
                 } else {
 
diff --git a/FileCursorCache.js b/FileCursorCache.js
index 3ffd833bb..8015cd864 100644
--- a/FileCursorCache.js
+++ b/FileCursorCache.js
@@ -49,7 +49,7 @@ function newFileCursorCache() {
             if (pSet.validPeriods.includes(periodName) === true) {
 
                 let fileCursor = newFileCursor();
-                fileCursor.initialize(fileCloud, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, onFileReceived);
+                fileCursor.initialize(fileCloud, pDevTeam, pBot, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, onFileReceived);
 
                 fileCursors.set(periodTime, fileCursor);
 
diff --git a/TimelineChart.js b/TimelineChart.js
index a202fec1a..acf8e51bd 100644
--- a/TimelineChart.js
+++ b/TimelineChart.js
@@ -100,6 +100,11 @@ function newTimelineChart() {
             initializePlotter(loadingProductCards[i]);
 
         }
+
+        /* Finally we initialize the Competition Plotter. */
+
+
+
     } 
 
     function initializePlotter(pProductCard) {
@@ -111,7 +116,7 @@ function newTimelineChart() {
 
         /*
 
-        Before Initializing the Storage, we will put put the Product Card to listen to the events the storage will raise every time a file is loaded,
+        Before Initializing the Storage, we will put the Product Card to listen to the events the storage will raise every time a file is loaded,
         so that the UI can somehow show this. There are different types of events. 
 
         */