diff --git a/.vs/AAOlivia-Plotter/v15/.suo b/.vs/AAOlivia-Plotter/v15/.suo
index c4c027080..ccd85b9ab 100644
Binary files a/.vs/AAOlivia-Plotter/v15/.suo and b/.vs/AAOlivia-Plotter/v15/.suo differ
diff --git a/Candles.js b/Candles.js
index 0ba9f2539..f6b22f7f2 100644
--- a/Candles.js
+++ b/Candles.js
@@ -354,7 +354,15 @@
 
                 for (let i = 0; i < dailyFile.length; i++) {
 
-                    let candle = newCandle();
+                    let candle = {
+                        open: undefined,
+                        close: undefined,
+                        min: 10000000000000,
+                        max: 0,
+                        begin: undefined,
+                        end: undefined,
+                        direction: undefined
+                    };
 
                     candle.min = dailyFile[i][0];
                     candle.max = dailyFile[i][1];
@@ -362,8 +370,8 @@
                     candle.open = dailyFile[i][2];
                     candle.close = dailyFile[i][3];
 
-                    candle.begin = (new Date(dailyFile[i][4])).valueOf();
-                    candle.end = (new Date(dailyFile[i][5])).valueOf();
+                    candle.begin = marketFile[i][4];
+                    candle.end = marketFile[i][5];
 
                     if (candle.open > candle.close) { candle.direction = 'down'; }
                     if (candle.open < candle.close) { candle.direction = 'up'; }
diff --git a/Volumes.js b/Volumes.js
index 7e682c7ee..6dd5e1f31 100644
--- a/Volumes.js
+++ b/Volumes.js
@@ -266,10 +266,15 @@
 
                 for (let i = 0; i < dailyFile.length; i++) {
 
-                    var volume = newVolumeBar();
+                    var volume = {
+                        amountBuy: 0,
+                        amountSell: 0,
+                        begin: undefined,
+                        end: undefined
+                    };
 
-                    volume.begin = (new Date(dailyFile[i][2])).valueOf(); // TODO ELIMINATE THIS
-                    volume.end = (new Date(dailyFile[i][3])).valueOf();
+                    volume.begin = marketFile[i][2];
+                    volume.end = marketFile[i][3];
 
                     volume.amountBuy = dailyFile[i][0];
                     volume.amountSell = dailyFile[i][1];
@@ -328,10 +333,15 @@
 
         for (let i = 0; i < marketFile.length; i++) {
 
-            var volume = newVolumeBar();  // TODO ELIMINATE THIS OBJECT DEPENDENCYY
+            var volume = = {
+                amountBuy: 0,
+                amountSell: 0,
+                begin: undefined,
+                end: undefined
+            };
 
-            volume.begin = (new Date(marketFile[i][2])).valueOf(); // TODO ELIMINATE THIS
-            volume.end = (new Date(marketFile[i][3])).valueOf();
+            volume.begin = marketFile[i][2];
+            volume.end = marketFile[i][3];
 
             volume.amountBuy = marketFile[i][0];
             volume.amountSell = marketFile[i][1];