diff --git a/UML/DrawIO/CompositeStructureDiagram.drawio b/UML/DrawIO/CompositeStructureDiagram.drawio
index db0505b..13cef76 100644
--- a/UML/DrawIO/CompositeStructureDiagram.drawio
+++ b/UML/DrawIO/CompositeStructureDiagram.drawio
@@ -1,91 +1,229 @@
-<mxfile host="app.diagrams.net" modified="2023-11-26T01:16:17.155Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36" etag="6-iMTYseQ7g0CgL47rAN" version="22.1.3" type="device">
+<mxfile host="app.diagrams.net" modified="2023-12-01T16:38:56.553Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36" etag="hDopD86C0_fLyn6WD_CM" version="22.1.5" type="device">
   <diagram name="Page-1" id="3pkYmdsxsWpQNdc9NgNo">
-    <mxGraphModel dx="1050" dy="574" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" math="0" shadow="0">
+    <mxGraphModel dx="2150" dy="574" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-12" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;DataFilter&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;b&gt;&lt;i&gt;&amp;nbsp;Are we still having DataFilter hold all of the active conditions?&lt;/i&gt;&lt;/b&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="10" y="10" width="1440" height="520" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-12" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;DataFilter&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;b&gt;&lt;i&gt;&amp;nbsp;Are we still having DataFilter hold all of the active conditions?&lt;/i&gt;&lt;/b&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="10" y="10" width="2150" height="810" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-10" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;LightPollution&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="30" y="80" width="490" height="220" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-10" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;StartingLocation&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="30" y="60" width="490" height="220" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-14" value="-minimumSQM : Integer" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="205" y="220" width="140" height="60" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-14" value="-startingLocation : Double[2]" style="html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="205" y="200" width="140" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="8C2b09eH_FzoGvY_wZyD-15" target="8C2b09eH_FzoGvY_wZyD-14">
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" parent="1" source="8C2b09eH_FzoGvY_wZyD-15" target="8C2b09eH_FzoGvY_wZyD-14" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-15" value="-locations : ArrayType&amp;lt;Location&amp;gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="60" y="120" width="140" height="60" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-15" value="-locations : ArrayType&amp;lt;Location&amp;gt;" style="html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="60" y="100" width="140" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="8C2b09eH_FzoGvY_wZyD-17" target="8C2b09eH_FzoGvY_wZyD-14">
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" parent="1" source="8C2b09eH_FzoGvY_wZyD-17" target="8C2b09eH_FzoGvY_wZyD-14" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-20" value="Process" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="8C2b09eH_FzoGvY_wZyD-18">
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-20" value="Process" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="8C2b09eH_FzoGvY_wZyD-18" vertex="1" connectable="0">
           <mxGeometry x="0.3452" y="-1" relative="1" as="geometry">
             <mxPoint x="-26" y="27" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-17" value="&lt;div&gt;data : ArrayType&amp;lt;Location, SQM&amp;gt;&lt;/div&gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="350" y="120" width="140" height="60" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-17" value="&lt;div&gt;-validLocations : ??&lt;/div&gt;" style="html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="350" y="100" width="140" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-21" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;AstralEvent&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="550" y="80" width="730" height="420" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-21" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;AstralEvent&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="550" y="60" width="1040" height="360" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-25" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;-eclipses : ArrayType&amp;lt;Location, Eclipse&amp;gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="1030" y="110" width="240" height="120" as="geometry" />
+        <mxCell id="GiFZNy4-RhPPMDx65xte-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="8C2b09eH_FzoGvY_wZyD-25" target="8C2b09eH_FzoGvY_wZyD-29">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1300" y="160" />
+              <mxPoint x="1300" y="130" />
+              <mxPoint x="925" y="130" />
+            </Array>
+          </mxGeometry>
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-23" value="&lt;div&gt;-positions : ArrayType&amp;lt;EclipsePosition&amp;gt;&lt;/div&gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="1065" y="150" width="170" height="60" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-25" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;-eclipses : ArrayType&amp;lt;Location, Eclipse&amp;gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="1320" y="100" width="240" height="120" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-26" value="&lt;div&gt;-matchingSunPositions : ArrayType&amp;lt;Location, SunPosition&amp;gt;&lt;/div&gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="1060" y="250" width="180" height="60" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-23" value="&lt;div&gt;-positions : ArrayType&amp;lt;EclipsePosition&amp;gt;&lt;/div&gt;" style="html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="1355" y="140" width="170" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-27" value="&lt;div&gt;-matchingMoonPositions : ArrayType&amp;lt;Location, MoonPosition&amp;gt;&lt;/div&gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="1060" y="320" width="180" height="60" as="geometry" />
+        <mxCell id="GiFZNy4-RhPPMDx65xte-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="8C2b09eH_FzoGvY_wZyD-26" target="8C2b09eH_FzoGvY_wZyD-29">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1300" y="270" />
+              <mxPoint x="1300" y="130" />
+              <mxPoint x="925" y="130" />
+            </Array>
+          </mxGeometry>
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-28" value="-locations : ArrayType&amp;lt;Location&amp;gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="630" y="140" width="140" height="60" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-26" value="&lt;div&gt;-matchingSunPositions : ArrayType&amp;lt;Location, SunPosition&amp;gt;&lt;/div&gt;" style="html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="1350" y="240" width="180" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-29" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;Parameters&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;i&gt;Do we want a Parameters object to contain all the parameters here?&lt;/i&gt;&lt;/b&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="570" y="240" width="460" height="250" as="geometry" />
+        <mxCell id="GiFZNy4-RhPPMDx65xte-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="8C2b09eH_FzoGvY_wZyD-27" target="8C2b09eH_FzoGvY_wZyD-29">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1300" y="340" />
+              <mxPoint x="1300" y="130" />
+              <mxPoint x="925" y="130" />
+            </Array>
+          </mxGeometry>
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-30" value="-sunAltitude : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="580" y="290" width="140" height="40" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-27" value="&lt;div&gt;-matchingMoonPositions : ArrayType&amp;lt;Location, MoonPosition&amp;gt;&lt;/div&gt;" style="html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="1350" y="310" width="180" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-31" value="-sunAzumith : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="730" y="290" width="140" height="40" as="geometry" />
+        <mxCell id="GiFZNy4-RhPPMDx65xte-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="8C2b09eH_FzoGvY_wZyD-28" target="8C2b09eH_FzoGvY_wZyD-29">
+          <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-32" value="-moonAltitude : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="580" y="340" width="140" height="40" as="geometry" />
+        <mxCell id="GiFZNy4-RhPPMDx65xte-2" value="Process" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="GiFZNy4-RhPPMDx65xte-1">
+          <mxGeometry x="0.6837" y="-1" relative="1" as="geometry">
+            <mxPoint x="-24" y="14" as="offset" />
+          </mxGeometry>
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-33" value="-moonAzumith : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="730" y="340" width="140" height="40" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-28" value="-locations : ArrayType&amp;lt;Location&amp;gt;" style="html=1;whiteSpace=wrap;" parent="1" vertex="1">
+          <mxGeometry x="580" y="100" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-3" value="" style="group" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="580" y="200" width="690" height="200" as="geometry" />
+        </mxCell>
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-29" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;Parameters&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&amp;nbsp;&lt;b&gt;&lt;i&gt;Do we want a Parameters object to contain all the parameters here?&lt;/i&gt;&lt;/b&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry width="690" height="200" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="GiFZNy4-RhPPMDx65xte-3" source="8C2b09eH_FzoGvY_wZyD-30" target="8C2b09eH_FzoGvY_wZyD-31">
+          <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-34" value="-degOfVarience : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="880" y="290" width="140" height="40" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-30" value="-sunAltitude : Double" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="10" y="50" width="140" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="GiFZNy4-RhPPMDx65xte-3" source="8C2b09eH_FzoGvY_wZyD-31" target="8C2b09eH_FzoGvY_wZyD-34">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-31" value="-sunAzumith : Double" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="275" y="50" width="140" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="GiFZNy4-RhPPMDx65xte-3" source="8C2b09eH_FzoGvY_wZyD-32" target="8C2b09eH_FzoGvY_wZyD-33">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-32" value="-moonAltitude : Double" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="10" y="100" width="140" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="GiFZNy4-RhPPMDx65xte-3" source="8C2b09eH_FzoGvY_wZyD-33" target="8C2b09eH_FzoGvY_wZyD-42">
+          <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-36" value="-moonPhase : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="880" y="340" width="140" height="40" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-33" value="-moonAzumith : Double" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="190" y="100" width="140" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-37" value="-selectedEclipse : Eclipse" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="880" y="390" width="140" height="40" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-34" value="-degOfVarience : Double" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="540" y="50" width="140" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-38" value="-eclipseAltitude : Eclipse" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="580" y="390" width="140" height="40" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-36" value="-moonPhase : Double" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="540" y="100" width="140" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-39" value="-eclipseAzumith : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="730" y="390" width="140" height="40" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-37" value="-selectedEclipse : Eclipse" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="540" y="150" width="140" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-41" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0;exitDx=170;exitDy=40;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;dashed=1;endArrow=none;endFill=0;" edge="1" parent="1" source="8C2b09eH_FzoGvY_wZyD-40" target="8C2b09eH_FzoGvY_wZyD-29">
+        <mxCell id="GiFZNy4-RhPPMDx65xte-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="GiFZNy4-RhPPMDx65xte-3" source="8C2b09eH_FzoGvY_wZyD-38" target="8C2b09eH_FzoGvY_wZyD-39">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-40" value="Perhaps we group these by the type of event they relate to?" style="shape=note2;boundedLbl=1;whiteSpace=wrap;html=1;size=15;verticalAlign=top;align=center;" vertex="1" parent="1">
-          <mxGeometry x="345" y="365" width="170" height="65" as="geometry" />
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-38" value="-eclipseAltitude : Eclipse" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="10" y="150" width="140" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="GiFZNy4-RhPPMDx65xte-3" source="8C2b09eH_FzoGvY_wZyD-39" target="8C2b09eH_FzoGvY_wZyD-37">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-39" value="-eclipseAzumith : Double" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="275" y="150" width="140" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="GiFZNy4-RhPPMDx65xte-3" source="8C2b09eH_FzoGvY_wZyD-42" target="8C2b09eH_FzoGvY_wZyD-36">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="8C2b09eH_FzoGvY_wZyD-42" value="-maxLimitingMagnitude : Double" style="html=1;whiteSpace=wrap;" parent="GiFZNy4-RhPPMDx65xte-3" vertex="1">
+          <mxGeometry x="360" y="100" width="140" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-14" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;LightPollution&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1620" y="60" width="520" height="220" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-15" value="-minimumSQM : Integer" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1810" y="200" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-17" target="GiFZNy4-RhPPMDx65xte-15">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-17" value="-locations : ArrayType&amp;lt;Location&amp;gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1650" y="100" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-20" target="GiFZNy4-RhPPMDx65xte-15">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-19" value="Process" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="GiFZNy4-RhPPMDx65xte-18">
+          <mxGeometry x="0.3452" y="-1" relative="1" as="geometry">
+            <mxPoint x="-26" y="27" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-20" value="&lt;div&gt;-data : ArrayType&amp;lt;Location, SQM&amp;gt;&lt;/div&gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1970" y="100" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-21" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;BoundingBox&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1620" y="310" width="520" height="330" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-24" target="GiFZNy4-RhPPMDx65xte-47">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-24" value="-locations : ArrayType&amp;lt;Location&amp;gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1650" y="350" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-27" target="GiFZNy4-RhPPMDx65xte-47">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-26" value="Process" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="GiFZNy4-RhPPMDx65xte-25">
+          <mxGeometry x="0.3452" y="-1" relative="1" as="geometry">
+            <mxPoint x="-26" y="27" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-27" value="&lt;div&gt;-validLocations: ArrayType&amp;lt;Double&amp;gt;&lt;/div&gt;" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1970" y="350" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-47" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;&lt;b&gt;Parameters&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height:2px;&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1630" y="440" width="500" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-55" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-22" target="GiFZNy4-RhPPMDx65xte-52">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-22" value="-nwCorner : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1640" y="470" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-54" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-50" target="GiFZNy4-RhPPMDx65xte-22">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-50" value="-neCorner : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1810" y="470" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-53" 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;endArrow=none;endFill=0;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-51" target="GiFZNy4-RhPPMDx65xte-50">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-56" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-51" target="GiFZNy4-RhPPMDx65xte-52">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-51" value="-seCorner : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1810" y="550" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-52" value="-swCorner : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1640" y="550" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-59" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endArrow=none;endFill=0;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-57" target="GiFZNy4-RhPPMDx65xte-58">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-57" value="-startingLocation : Double[2]" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1980" y="470" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-58" value="-radius: Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
+          <mxGeometry x="1980" y="550" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="GiFZNy4-RhPPMDx65xte-61" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0;exitDx=160;exitDy=46;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;dashed=1;" edge="1" parent="1" source="GiFZNy4-RhPPMDx65xte-60" target="8C2b09eH_FzoGvY_wZyD-10">
+          <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="8C2b09eH_FzoGvY_wZyD-42" value="-maxLimitingMagnitude : Double" style="html=1;whiteSpace=wrap;" vertex="1" parent="1">
-          <mxGeometry x="730" y="440" width="140" height="40" as="geometry" />
+        <mxCell id="GiFZNy4-RhPPMDx65xte-60" value="Logically, StartingLocation would be a condition, but how would it work in this structure?" style="shape=note2;boundedLbl=1;whiteSpace=wrap;html=1;size=12;verticalAlign=top;align=center;" vertex="1" parent="1">
+          <mxGeometry x="-200" y="140" width="160" height="80" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>