diff --git a/diagrams.drawio b/diagrams.drawio
index 6ebdbda..739c89d 100644
--- a/diagrams.drawio
+++ b/diagrams.drawio
@@ -1,4 +1,108 @@
-<mxfile host="app.diagrams.net" modified="2021-08-12T11:45:15.165Z" agent="5.0 (X11)" etag="7y_K-rMy1il7kjI1ygB7" version="14.9.6" type="github" pages="4">
+<mxfile host="app.diagrams.net" modified="2021-08-12T12:34:14.470Z" agent="5.0 (X11)" etag="sp_FUIUUeA5EUevelmlB" version="14.9.6" type="github" pages="6">
+  <diagram id="EDr00zZlM0DfOTWeBqFN" name="Overview Simple">
+    <mxGraphModel dx="825" dy="460" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+      <root>
+        <mxCell id="zO28rdMQwipJkLhRrh40-0" />
+        <mxCell id="zO28rdMQwipJkLhRrh40-1" parent="zO28rdMQwipJkLhRrh40-0" />
+        <mxCell id="zO28rdMQwipJkLhRrh40-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontColor=#000000;endArrow=classic;endFill=1;" edge="1" parent="zO28rdMQwipJkLhRrh40-1" source="zO28rdMQwipJkLhRrh40-2" target="zO28rdMQwipJkLhRrh40-6">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="zO28rdMQwipJkLhRrh40-2" value="&lt;div align=&quot;center&quot;&gt;&lt;font color=&quot;#000000&quot;&gt;Consumption Predictor&lt;/font&gt;&lt;br&gt;&lt;font color=&quot;#000000&quot;&gt;&lt;font color=&quot;#000000&quot;&gt;(CoPr)&lt;/font&gt;&lt;/font&gt;&lt;/div&gt;" style="ellipse;shape=cloud;whiteSpace=wrap;html=1;shadow=0;fontColor=#FF0000;strokeWidth=1;fillColor=none;gradientColor=none;align=center;" vertex="1" parent="zO28rdMQwipJkLhRrh40-1">
+          <mxGeometry x="320" y="40" width="210" height="110" as="geometry" />
+        </mxCell>
+        <mxCell id="zO28rdMQwipJkLhRrh40-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontColor=#000000;endArrow=classic;endFill=1;" edge="1" parent="zO28rdMQwipJkLhRrh40-1" source="zO28rdMQwipJkLhRrh40-3" target="zO28rdMQwipJkLhRrh40-2">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="zO28rdMQwipJkLhRrh40-3" value="Batch processed consumption data" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;shadow=0;" vertex="1" parent="zO28rdMQwipJkLhRrh40-1">
+          <mxGeometry x="120" y="85" width="140" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="zO28rdMQwipJkLhRrh40-6" value="&lt;div&gt;Predictions of&lt;/div&gt;&lt;div&gt;upcoming consumption&lt;/div&gt;" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;shadow=0;" vertex="1" parent="zO28rdMQwipJkLhRrh40-1">
+          <mxGeometry x="590" y="85" width="140" height="20" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+  <diagram id="sA-PbQ-SN98bpofgPUSu" name="Overview Detailed">
+    <mxGraphModel dx="1178" dy="658" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+      <root>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-0" />
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-1" parent="TGCP7gacSPHCR1oHC4LJ-0" />
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-2" value="" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="320" y="10" width="340" height="130" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.875;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="TGCP7gacSPHCR1oHC4LJ-1" source="TGCP7gacSPHCR1oHC4LJ-13" target="TGCP7gacSPHCR1oHC4LJ-5">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" edge="1" parent="TGCP7gacSPHCR1oHC4LJ-1" source="TGCP7gacSPHCR1oHC4LJ-5" target="TGCP7gacSPHCR1oHC4LJ-8">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontColor=#000000;endArrow=classic;endFill=1;entryX=0.145;entryY=1;entryDx=0;entryDy=-4.35;entryPerimeter=0;exitX=0.75;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="TGCP7gacSPHCR1oHC4LJ-1" source="TGCP7gacSPHCR1oHC4LJ-5" target="TGCP7gacSPHCR1oHC4LJ-9">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="500" y="310" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="425" y="160" />
+              <mxPoint x="509" y="160" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-5" value="Data-load server" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="350" y="180" width="100" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-6" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.25;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" edge="1" parent="TGCP7gacSPHCR1oHC4LJ-1" source="TGCP7gacSPHCR1oHC4LJ-7" target="TGCP7gacSPHCR1oHC4LJ-5">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-7" value="&lt;div&gt;mobile&lt;/div&gt;&lt;div&gt;data&lt;br&gt;&lt;/div&gt;" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="340" y="50" width="60" height="70" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-8" value="&lt;div&gt;Staging&lt;/div&gt;&lt;div&gt;tables&lt;br&gt;&lt;/div&gt;" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="420" y="50" width="60" height="70" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-9" value="&lt;div&gt;Training&lt;/div&gt;&lt;div&gt;data&lt;br&gt;&lt;/div&gt;" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="500" y="50" width="60" height="70" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-10" value="&lt;div&gt;Database Server&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="330" y="20" width="320" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.855;exitY=1;exitDx=0;exitDy=-4.35;exitPerimeter=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="TGCP7gacSPHCR1oHC4LJ-1" source="TGCP7gacSPHCR1oHC4LJ-12" target="TGCP7gacSPHCR1oHC4LJ-19">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-12" value="predictions" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="580" y="50" width="60" height="70" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-13" value="&lt;div&gt;TAP3 Files&lt;/div&gt;&lt;div&gt;(consumption)&lt;br&gt;&lt;/div&gt;" style="ellipse;shape=cloud;whiteSpace=wrap;html=1;fillColor=none;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="190" y="130" width="120" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.69;exitY=-0.02;exitDx=0;exitDy=0;entryX=0.145;entryY=1;entryDx=0;entryDy=-4.35;entryPerimeter=0;exitPerimeter=0;" edge="1" parent="TGCP7gacSPHCR1oHC4LJ-1" source="TGCP7gacSPHCR1oHC4LJ-17" target="TGCP7gacSPHCR1oHC4LJ-12">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="539" y="160" />
+              <mxPoint x="589" y="160" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.855;entryY=1;entryDx=0;entryDy=-4.35;entryPerimeter=0;" edge="1" parent="TGCP7gacSPHCR1oHC4LJ-1" source="TGCP7gacSPHCR1oHC4LJ-17" target="TGCP7gacSPHCR1oHC4LJ-9">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-17" value="Training Server" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="470" y="180" width="100" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-19" value="API Server" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="590" y="180" width="70" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-23" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontColor=#000000;startArrow=classic;startFill=1;endArrow=classic;endFill=1;exitX=0.16;exitY=0.55;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="TGCP7gacSPHCR1oHC4LJ-1" source="TGCP7gacSPHCR1oHC4LJ-20" target="TGCP7gacSPHCR1oHC4LJ-19">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="680" y="174" />
+              <mxPoint x="680" y="205" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="TGCP7gacSPHCR1oHC4LJ-20" value="Predictions" style="ellipse;shape=cloud;whiteSpace=wrap;html=1;fillColor=none;" vertex="1" parent="TGCP7gacSPHCR1oHC4LJ-1">
+          <mxGeometry x="690" y="130" width="120" height="80" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
   <diagram id="prtHgNgQTEPvFCAcTncT" name="Swimlane">
     <mxGraphModel dx="1422" dy="794" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
@@ -165,7 +269,7 @@
     </mxGraphModel>
   </diagram>
   <diagram id="i7yhLScOtpyZzhRqdapV" name="Deploy">
-    <mxGraphModel dx="1178" dy="633" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+    <mxGraphModel dx="1178" dy="658" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
       <root>
         <mxCell id="Tc11T3u2_8zztxfcWjqa-0" />
         <mxCell id="Tc11T3u2_8zztxfcWjqa-1" parent="Tc11T3u2_8zztxfcWjqa-0" />