diff --git a/.vs/opdracht2/DesignTimeBuild/.dtbcache.v2 b/.vs/opdracht2/DesignTimeBuild/.dtbcache.v2
index d9bb835..a7b6fb3 100644
Binary files a/.vs/opdracht2/DesignTimeBuild/.dtbcache.v2 and b/.vs/opdracht2/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/.vs/opdracht2/v16/.suo b/.vs/opdracht2/v16/.suo
index 7207dd9..77d43ad 100644
Binary files a/.vs/opdracht2/v16/.suo and b/.vs/opdracht2/v16/.suo differ
diff --git a/Datalaag/JsonReader.cs b/Datalaag/JsonReader.cs
index 1cecf6b..b5a2e95 100644
--- a/Datalaag/JsonReader.cs
+++ b/Datalaag/JsonReader.cs
@@ -21,11 +21,11 @@ namespace Datalaag
             {
                 switch (feature["geometry"]["type"].ToString())
                 {
-                    case "MultiPolygon":
+                    case "Polygon":
                         _polygons.Add(new PolygonPunten(JsonConvert.DeserializeObject<Polygon>(feature["geometry"]
                             .ToString()), feature["properties"]["name"].ToString()));
                         break;
-                    case "Polygon":
+                    case "MultiPolygon":
                         _multiPolygons.Add(new MultiPolygonPunten(JsonConvert.DeserializeObject<MultiPolygon>
                             (feature["geometry"].ToString()), feature["properties"]["name"].ToString()));
                         break;
diff --git a/Datalaag/bin/Debug/Datalaag.dll b/Datalaag/bin/Debug/Datalaag.dll
index 114da74..661c35b 100644
Binary files a/Datalaag/bin/Debug/Datalaag.dll and b/Datalaag/bin/Debug/Datalaag.dll differ
diff --git a/Datalaag/bin/Debug/Datalaag.pdb b/Datalaag/bin/Debug/Datalaag.pdb
index 12df5e6..ff3e469 100644
Binary files a/Datalaag/bin/Debug/Datalaag.pdb and b/Datalaag/bin/Debug/Datalaag.pdb differ
diff --git a/Datalaag/bin/Debug/Globals.dll b/Datalaag/bin/Debug/Globals.dll
index f23089b..5fe1b25 100644
Binary files a/Datalaag/bin/Debug/Globals.dll and b/Datalaag/bin/Debug/Globals.dll differ
diff --git a/Datalaag/bin/Debug/Globals.pdb b/Datalaag/bin/Debug/Globals.pdb
index 2d79c7f..7965f15 100644
Binary files a/Datalaag/bin/Debug/Globals.pdb and b/Datalaag/bin/Debug/Globals.pdb differ
diff --git a/Datalaag/obj/Debug/Datalaag.csprojAssemblyReference.cache b/Datalaag/obj/Debug/Datalaag.csprojAssemblyReference.cache
index 38e8623..bf892e1 100644
Binary files a/Datalaag/obj/Debug/Datalaag.csprojAssemblyReference.cache and b/Datalaag/obj/Debug/Datalaag.csprojAssemblyReference.cache differ
diff --git a/Datalaag/obj/Debug/Datalaag.dll b/Datalaag/obj/Debug/Datalaag.dll
index 114da74..661c35b 100644
Binary files a/Datalaag/obj/Debug/Datalaag.dll and b/Datalaag/obj/Debug/Datalaag.dll differ
diff --git a/Datalaag/obj/Debug/Datalaag.pdb b/Datalaag/obj/Debug/Datalaag.pdb
index 12df5e6..ff3e469 100644
Binary files a/Datalaag/obj/Debug/Datalaag.pdb and b/Datalaag/obj/Debug/Datalaag.pdb differ
diff --git a/Globals/MultiPolygonPunten.cs b/Globals/MultiPolygonPunten.cs
index 794d178..1981d3b 100644
--- a/Globals/MultiPolygonPunten.cs
+++ b/Globals/MultiPolygonPunten.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using GeoJSON.Net.Geometry;
 
@@ -35,5 +36,12 @@ namespace Globals
             MinimumX = polygonPunten.Max(p => p.MinimumX);
             MinimumY = polygonPunten.Max(p => p.MinimumY);
         }
+
+
+        public override string ToString()
+        {
+            if (string.Equals(Naam, "", StringComparison.Ordinal)) return "UNKNOWN";
+            else return Naam;
+        }
     }
 }
\ No newline at end of file
diff --git a/Globals/PolygonPunten.cs b/Globals/PolygonPunten.cs
index 6e8f95e..20ab643 100644
--- a/Globals/PolygonPunten.cs
+++ b/Globals/PolygonPunten.cs
@@ -44,6 +44,11 @@ namespace Globals
             }
         }
 
+        public override string ToString()
+        {
+            if (string.Equals(Naam, "", StringComparison.Ordinal)) return "UNKNOWN";
+            else return Naam;
+        }
     }
 }
 
diff --git a/Globals/bin/Debug/Globals.dll b/Globals/bin/Debug/Globals.dll
index f23089b..5fe1b25 100644
Binary files a/Globals/bin/Debug/Globals.dll and b/Globals/bin/Debug/Globals.dll differ
diff --git a/Globals/bin/Debug/Globals.pdb b/Globals/bin/Debug/Globals.pdb
index 2d79c7f..7965f15 100644
Binary files a/Globals/bin/Debug/Globals.pdb and b/Globals/bin/Debug/Globals.pdb differ
diff --git a/Globals/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Globals/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index a7bdf91..a8085e8 100644
Binary files a/Globals/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Globals/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Globals/obj/Debug/Globals.csprojAssemblyReference.cache b/Globals/obj/Debug/Globals.csprojAssemblyReference.cache
index 10cf3cd..51ce47b 100644
Binary files a/Globals/obj/Debug/Globals.csprojAssemblyReference.cache and b/Globals/obj/Debug/Globals.csprojAssemblyReference.cache differ
diff --git a/Globals/obj/Debug/Globals.dll b/Globals/obj/Debug/Globals.dll
index f23089b..5fe1b25 100644
Binary files a/Globals/obj/Debug/Globals.dll and b/Globals/obj/Debug/Globals.dll differ
diff --git a/Globals/obj/Debug/Globals.pdb b/Globals/obj/Debug/Globals.pdb
index 2d79c7f..7965f15 100644
Binary files a/Globals/obj/Debug/Globals.pdb and b/Globals/obj/Debug/Globals.pdb differ
diff --git a/Logica/Logica.csproj b/Logica/Logica.csproj
index 47d5b4a..cbe8e70 100644
--- a/Logica/Logica.csproj
+++ b/Logica/Logica.csproj
@@ -31,6 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="GeoJSON.Net, Version=1.2.16.0, Culture=neutral, PublicKeyToken=42c00ea87f5f14d4">
+      <HintPath>..\packages\GeoJSON.Net.1.2.20-rc\lib\net45\GeoJSON.Net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
diff --git a/Logica/PolygonManipulatie.cs b/Logica/PolygonManipulatie.cs
index 5b29148..7f70a98 100644
--- a/Logica/PolygonManipulatie.cs
+++ b/Logica/PolygonManipulatie.cs
@@ -42,7 +42,7 @@ namespace Logica
             return TriangulatePolygon(polygon);
         }
 
-        private PolygonPunten ScalePolygon(PolygonPunten polygon, double scaleX, double scaleY)
+        public PolygonPunten ScalePolygon(PolygonPunten polygon, double scaleX, double scaleY)
         {
             double maxX = polygon.MaximumX;
             double maxY = polygon.MaximumY;
@@ -65,6 +65,35 @@ namespace Logica
             return new PolygonPunten(returnWaarde, polygon.Naam);
         }
 
+        public MultiPolygonPunten ScaleMultiPolygon(MultiPolygonPunten multiPolygon, double scaleX, double scaleY)
+        {
+            double maxX = multiPolygon.MaximumX;
+            double maxY = multiPolygon.MaximumY;
+            double minX = multiPolygon.MinimumX;
+            double minY = multiPolygon.MinimumY;
+            maxX -= minX;
+            maxY -= minY;
+            List<PolygonPunten> pp = new List<PolygonPunten>();
+            foreach (PolygonPunten polygon in multiPolygon.PolygonPunten)
+            {
+                List<Punt> returnWaarde = new List<Punt>();
+                foreach (Punt punt in polygon.Punten)
+                {
+                    double x = punt.X - minX;
+                    x /= maxX;
+                    x *= scaleX;
+                    double y = punt.Y - minY;
+                    y /= maxY;
+                    y *= scaleY;
+                    returnWaarde.Add(new Punt(x, y, punt.Naam));
+
+                }
+                pp.Add(new PolygonPunten(returnWaarde, polygon.Naam));
+            }
+
+            return new MultiPolygonPunten(pp, multiPolygon.Naam); 
+        }
+
         public List<PolygonPunten> GetAllPolygons()
         {
             List<PolygonPunten> lijst = new List<PolygonPunten>();
diff --git a/Logica/bin/Debug/Datalaag.dll b/Logica/bin/Debug/Datalaag.dll
index 114da74..661c35b 100644
Binary files a/Logica/bin/Debug/Datalaag.dll and b/Logica/bin/Debug/Datalaag.dll differ
diff --git a/Logica/bin/Debug/Datalaag.pdb b/Logica/bin/Debug/Datalaag.pdb
index 12df5e6..ff3e469 100644
Binary files a/Logica/bin/Debug/Datalaag.pdb and b/Logica/bin/Debug/Datalaag.pdb differ
diff --git a/Logica/bin/Debug/Globals.dll b/Logica/bin/Debug/Globals.dll
index f23089b..5fe1b25 100644
Binary files a/Logica/bin/Debug/Globals.dll and b/Logica/bin/Debug/Globals.dll differ
diff --git a/Logica/bin/Debug/Globals.pdb b/Logica/bin/Debug/Globals.pdb
index 2d79c7f..7965f15 100644
Binary files a/Logica/bin/Debug/Globals.pdb and b/Logica/bin/Debug/Globals.pdb differ
diff --git a/Logica/bin/Debug/Logica.dll b/Logica/bin/Debug/Logica.dll
index 5cfd484..904f54f 100644
Binary files a/Logica/bin/Debug/Logica.dll and b/Logica/bin/Debug/Logica.dll differ
diff --git a/Logica/bin/Debug/Logica.pdb b/Logica/bin/Debug/Logica.pdb
index 9379db0..1a8c06d 100644
Binary files a/Logica/bin/Debug/Logica.pdb and b/Logica/bin/Debug/Logica.pdb differ
diff --git a/Logica/obj/Debug/Logica.csproj.CoreCompileInputs.cache b/Logica/obj/Debug/Logica.csproj.CoreCompileInputs.cache
index 6c1b9ce..ec4191e 100644
--- a/Logica/obj/Debug/Logica.csproj.CoreCompileInputs.cache
+++ b/Logica/obj/Debug/Logica.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cccc5c33f424954ac02c95e1ddf7440a0c61da70
+19911095ba0015434cd13d58c152e22fd47e8005
diff --git a/Logica/obj/Debug/Logica.csproj.FileListAbsolute.txt b/Logica/obj/Debug/Logica.csproj.FileListAbsolute.txt
index 1ae692c..01e0492 100644
--- a/Logica/obj/Debug/Logica.csproj.FileListAbsolute.txt
+++ b/Logica/obj/Debug/Logica.csproj.FileListAbsolute.txt
@@ -1,2 +1,14 @@
 C:\Users\Beppe\source\repos\opdracht2\Logica\obj\Debug\Logica.csprojAssemblyReference.cache
 C:\Users\Beppe\source\repos\opdracht2\Logica\obj\Debug\Logica.csproj.CoreCompileInputs.cache
+C:\Users\Beppe\source\repos\opdracht2\Logica\bin\Debug\Logica.dll
+C:\Users\Beppe\source\repos\opdracht2\Logica\bin\Debug\Logica.pdb
+C:\Users\Beppe\source\repos\opdracht2\Logica\bin\Debug\Datalaag.dll
+C:\Users\Beppe\source\repos\opdracht2\Logica\bin\Debug\GeoJSON.Net.dll
+C:\Users\Beppe\source\repos\opdracht2\Logica\bin\Debug\Globals.dll
+C:\Users\Beppe\source\repos\opdracht2\Logica\bin\Debug\Newtonsoft.Json.dll
+C:\Users\Beppe\source\repos\opdracht2\Logica\bin\Debug\Datalaag.pdb
+C:\Users\Beppe\source\repos\opdracht2\Logica\bin\Debug\Globals.pdb
+C:\Users\Beppe\source\repos\opdracht2\Logica\bin\Debug\Newtonsoft.Json.xml
+C:\Users\Beppe\source\repos\opdracht2\Logica\obj\Debug\Logica.csproj.CopyComplete
+C:\Users\Beppe\source\repos\opdracht2\Logica\obj\Debug\Logica.dll
+C:\Users\Beppe\source\repos\opdracht2\Logica\obj\Debug\Logica.pdb
diff --git a/Logica/obj/Debug/Logica.csprojAssemblyReference.cache b/Logica/obj/Debug/Logica.csprojAssemblyReference.cache
index 8b2ee19..cea5f66 100644
Binary files a/Logica/obj/Debug/Logica.csprojAssemblyReference.cache and b/Logica/obj/Debug/Logica.csprojAssemblyReference.cache differ
diff --git a/Logica/obj/Debug/Logica.dll b/Logica/obj/Debug/Logica.dll
index 5cfd484..904f54f 100644
Binary files a/Logica/obj/Debug/Logica.dll and b/Logica/obj/Debug/Logica.dll differ
diff --git a/Logica/obj/Debug/Logica.pdb b/Logica/obj/Debug/Logica.pdb
index 9379db0..1a8c06d 100644
Binary files a/Logica/obj/Debug/Logica.pdb and b/Logica/obj/Debug/Logica.pdb differ
diff --git a/opdracht2/MainWindow.xaml b/opdracht2/MainWindow.xaml
index e238ee0..56ce69b 100644
--- a/opdracht2/MainWindow.xaml
+++ b/opdracht2/MainWindow.xaml
@@ -10,15 +10,15 @@
         <Canvas x:Name="someCanvas" RenderTransformOrigin="0.5,0.5" Margin="436,114,128,113">
             <Canvas.RenderTransform>
                 <TransformGroup>
-                    <ScaleTransform ScaleY="2" ScaleX="2"/>
+                    <ScaleTransform ScaleY="-1" ScaleX="-1"/>
                     <SkewTransform/>
                     <RotateTransform/>
                     <TranslateTransform/>
                 </TransformGroup>
             </Canvas.RenderTransform>
         </Canvas>
-        <ListBox Margin="10,94,568,93"/>
-        <Button x:Name="LoadFile" Content="LoadFile" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Height="27" Width="65"/>
+        <ListBox x:Name="lb" Margin="10,94,568,93" SelectionChanged="lb_SelectionChanged"/>
+        <Button x:Name="LoadFile" Content="LoadFile" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Height="27" Width="65" Click="LoadFile_Click"/>
         <Slider HorizontalAlignment="Left" Margin="10,406,0,0" VerticalAlignment="Top" Width="120" Maximum="100" SmallChange="1"/>
         <Label Content="Epsilon (0.001 - 0.1%)" HorizontalAlignment="Left" Margin="8,375,0,0" VerticalAlignment="Top"/>
 
diff --git a/opdracht2/MainWindow.xaml.cs b/opdracht2/MainWindow.xaml.cs
index 3e0deaf..a808cae 100644
--- a/opdracht2/MainWindow.xaml.cs
+++ b/opdracht2/MainWindow.xaml.cs
@@ -23,6 +23,8 @@ using Globals;
 using Brush = System.Windows.Media.Brush;
 using Brushes = System.Windows.Media.Brushes;
 using Point = System.Windows.Point;
+using Datalaag;
+using Logica;
 
 namespace opdracht2
 {
@@ -35,6 +37,10 @@ namespace opdracht2
         List<Polygon> f;
         List<Ellipse> el;
         List<Polygon> buffer;
+        ListBox l;
+
+        PolygonManipulatie pm;
+        JsonReader j;
         public MainWindow()
         {
             //todo logica toevoegen als object
@@ -46,34 +52,7 @@ namespace opdracht2
             InitializeComponent();
             c = (Canvas)this.FindName("someCanvas");
             CompositionTarget.Rendering += DoUpdates;
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            if (openFileDialog.ShowDialog() == true)
-            {
-                //TODO remove
-                //Tuple<List<Polygon>, List<Ellipse>> t = GeoJsonParser.TriangulateJsonData(File.ReadAllText(openFileDialog.FileName), c.Width, c.Height);
-                f = GeoJsonParser.TriangulateJsonData(File.ReadAllText(openFileDialog.FileName), 800, 800);
-                el = new List<Ellipse>();
-            }
-            var st = new ScaleTransform();
-            c.RenderTransform = st;
-            foreach (Ellipse eli in el)
-            {
-                c.Children.Add(eli);
-            }
-            c.MouseWheel += (sender, e) =>
-            {
-                
-                if (e.Delta > 0)
-                {
-                    st.ScaleX *= 2;
-                    st.ScaleY *= 2;
-                }
-                else
-                {
-                    st.ScaleX /= 2;
-                    st.ScaleY /= 2;
-                }
-            };
+            l = (ListBox)this.FindName("lb");
             
             Debug.Write("done");
         }
@@ -125,6 +104,119 @@ namespace opdracht2
             }
             
         }
+
+        private void LoadFile_Click(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            if (openFileDialog.ShowDialog() == true)
+            {
+                //TODO remove
+                //Tuple<List<Polygon>, List<Ellipse>> t = GeoJsonParser.TriangulateJsonData(File.ReadAllText(openFileDialog.FileName), c.Width, c.Height);
+                //f = GeoJsonParser.TriangulateJsonData(File.ReadAllText(openFileDialog.FileName), 200, 200);
+                j = new JsonReader(openFileDialog.FileName);
+                el = new List<Ellipse>();
+                pm = new PolygonManipulatie(j);
+            }
+            foreach (object o in pm.GetPolygons())
+            {
+                try { l.Items.Add(o); } catch (Exception) { };
+
+            }
+            foreach (object o in pm.GetMultiPolygons())
+            {
+                try { l.Items.Add(o); } catch (Exception) { };
+
+            }
+            var st = new ScaleTransform();
+            c.RenderTransform = st;
+            foreach (Ellipse eli in el)
+            {
+                c.Children.Add(eli);
+            }
+            c.MouseWheel += (sender, e) =>
+            {
+                
+                if (e.Delta > 0)
+                {
+                    st.ScaleX *= 2;
+                    st.ScaleY *= 2;
+                }
+                else
+                {
+                    st.ScaleX /= 2;
+                    st.ScaleY /= 2;
+                }
+            };
+        }
+
+        private void lb_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            //TODO zorg ervoor dat als meerdere items geselecteerd worden, we een scaling methode hebben voor meerdere (wss gebruik van list)
+            //TODO als we zo een methode nodig hebben moeten we ook polygonpunten kunnen omzetten naar multipolygonpunten (met dan maar 1 polygon) 
+            //zodat we een 1 lijst kunnen gebruiken voor alle polygons
+            switch (lb.SelectedItem.GetType().Name)
+            {
+                case "MultiPolygonPunten":
+                    Debug.WriteLine(lb.SelectedItem.GetType().Name);
+                    c.Children.Clear();
+                    MultiPolygonPunten mp = pm.ScaleMultiPolygon((MultiPolygonPunten)lb.SelectedItem, 100, 100);
+                    //hier ervoor zorgen dat scaling, triangulation etc gebeurt door gebruik van logica layer functies te callen
+                    foreach(PolygonPunten pp in mp.PolygonPunten)
+                    {
+                        foreach (PolygonPunten ppd in pm.TriangulatePolygon(pp))
+                        {
+                            c.Children.Add(getPolygon(ppd));
+
+                        }
+                    }
+                    foreach(Polygon po in getPolygon(mp))
+                    {
+                        //c.Children.Add(po);
+                    }
+                    break;
+                case "PolygonPunten":
+                    Debug.WriteLine(lb.SelectedItem.GetType().Name);
+                    c.Children.Clear();
+                    PolygonPunten p = pm.ScalePolygon((PolygonPunten)lb.SelectedItem, 100, 100);
+                    c.Children.Add(getPolygon(p));
+                    break;
+
+            }
+
+        }
+
+        private List<Polygon> getPolygon(MultiPolygonPunten mp)
+        {
+            List<Polygon> lijst = new List<Polygon>();
+            foreach(PolygonPunten p in mp.PolygonPunten)
+            {
+                lijst.Add(getPolygon(p));
+            }
+            return lijst;
+        }
+        private Polygon getPolygon(PolygonPunten p)
+        {
+            Polygon returnWaarde = new Polygon();
+            PointCollection puntCollectie = new PointCollection();
+            foreach(Punt punt in p.Punten)
+            {
+                puntCollectie.Add(new Point(punt.X, punt.Y));
+            }
+            returnWaarde.Points = puntCollectie;
+            returnWaarde.StrokeThickness = 1;
+
+
+            // deze code zorgt ervoor dat de driehoeken duidelijker zijn op de afbeelding door de kleur willekeurig te selecteren
+            Random random = new Random();
+            Type brushType = typeof(Brushes);
+            PropertyInfo[] properties = brushType.GetProperties();
+            int randomIndex = random.Next(properties.Length);
+            Brush willekeurigeBrush = (Brush)properties[randomIndex].GetValue(null, null);
+            if (willekeurigeBrush == Brushes.White) willekeurigeBrush = Brushes.Black;
+            returnWaarde.Fill = willekeurigeBrush;
+            returnWaarde.Stroke = willekeurigeBrush;
+            return returnWaarde;
+        }
     }
 }
 
diff --git a/opdracht2/bin/Debug/netcoreapp3.1/Datalaag.dll b/opdracht2/bin/Debug/netcoreapp3.1/Datalaag.dll
index 114da74..661c35b 100644
Binary files a/opdracht2/bin/Debug/netcoreapp3.1/Datalaag.dll and b/opdracht2/bin/Debug/netcoreapp3.1/Datalaag.dll differ
diff --git a/opdracht2/bin/Debug/netcoreapp3.1/Datalaag.pdb b/opdracht2/bin/Debug/netcoreapp3.1/Datalaag.pdb
index 12df5e6..ff3e469 100644
Binary files a/opdracht2/bin/Debug/netcoreapp3.1/Datalaag.pdb and b/opdracht2/bin/Debug/netcoreapp3.1/Datalaag.pdb differ
diff --git a/opdracht2/bin/Debug/netcoreapp3.1/Globals.dll b/opdracht2/bin/Debug/netcoreapp3.1/Globals.dll
index f23089b..5fe1b25 100644
Binary files a/opdracht2/bin/Debug/netcoreapp3.1/Globals.dll and b/opdracht2/bin/Debug/netcoreapp3.1/Globals.dll differ
diff --git a/opdracht2/bin/Debug/netcoreapp3.1/Globals.pdb b/opdracht2/bin/Debug/netcoreapp3.1/Globals.pdb
index 2d79c7f..7965f15 100644
Binary files a/opdracht2/bin/Debug/netcoreapp3.1/Globals.pdb and b/opdracht2/bin/Debug/netcoreapp3.1/Globals.pdb differ
diff --git a/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll b/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll
index 5cfd484..904f54f 100644
Binary files a/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll and b/opdracht2/bin/Debug/netcoreapp3.1/Logica.dll differ
diff --git a/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb b/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb
index 9379db0..1a8c06d 100644
Binary files a/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb and b/opdracht2/bin/Debug/netcoreapp3.1/Logica.pdb differ
diff --git a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.deps.json b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.deps.json
index 5dc3e39..da7d885 100644
--- a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.deps.json
+++ b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.deps.json
@@ -8,7 +8,10 @@
     ".NETCoreApp,Version=v3.1": {
       "opdracht2/1.0.0": {
         "dependencies": {
+          "Datalaag": "1.0.0",
           "GeoJSON.Net": "1.2.19",
+          "Globals": "1.0.0",
+          "Logica": "1.0.0",
           "System.Drawing.Common": "4.7.0"
         },
         "runtime": {
@@ -837,6 +840,28 @@
           "System.Threading": "4.3.0",
           "System.Xml.ReaderWriter": "4.3.0"
         }
+      },
+      "Datalaag/1.0.0": {
+        "dependencies": {
+          "Globals": "1.0.0"
+        },
+        "runtime": {
+          "Datalaag.dll": {}
+        }
+      },
+      "Globals/1.0.0": {
+        "runtime": {
+          "Globals.dll": {}
+        }
+      },
+      "Logica/1.0.0": {
+        "dependencies": {
+          "Datalaag": "1.0.0",
+          "Globals": "1.0.0"
+        },
+        "runtime": {
+          "Logica.dll": {}
+        }
       }
     }
   },
@@ -1454,6 +1479,21 @@
       "sha512": "sha512-lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==",
       "path": "system.xml.xmldocument/4.3.0",
       "hashPath": "system.xml.xmldocument.4.3.0.nupkg.sha512"
+    },
+    "Datalaag/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "Globals/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "Logica/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
     }
   }
 }
\ No newline at end of file
diff --git a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll
index 7a2e517..ceb477e 100644
Binary files a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll and b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.dll differ
diff --git a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb
index c481c4a..290ed39 100644
Binary files a/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb and b/opdracht2/bin/Debug/netcoreapp3.1/opdracht2.pdb differ
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.cs b/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.cs
index 67c1efc..1b9a726 100644
--- a/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.cs
+++ b/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "68E7240A4F498547AC7EFB2C2D5F594143259E09"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "05D515F609A8E8D2AFAF26E4ADD6AF1BBA9D6ED8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -50,6 +50,14 @@ namespace opdracht2 {
         #line hidden
         
         
+        #line 20 "..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ListBox lb;
+        
+        #line default
+        #line hidden
+        
+        
         #line 21 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button LoadFile;
@@ -91,7 +99,22 @@ namespace opdracht2 {
             this.someCanvas = ((System.Windows.Controls.Canvas)(target));
             return;
             case 2:
+            this.lb = ((System.Windows.Controls.ListBox)(target));
+            
+            #line 20 "..\..\..\MainWindow.xaml"
+            this.lb.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.lb_SelectionChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 3:
             this.LoadFile = ((System.Windows.Controls.Button)(target));
+            
+            #line 21 "..\..\..\MainWindow.xaml"
+            this.LoadFile.Click += new System.Windows.RoutedEventHandler(this.LoadFile_Click);
+            
+            #line default
+            #line hidden
             return;
             }
             this._contentLoaded = true;
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs b/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs
index 67c1efc..1b9a726 100644
--- a/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs
+++ b/opdracht2/obj/Debug/netcoreapp3.1/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "68E7240A4F498547AC7EFB2C2D5F594143259E09"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "05D515F609A8E8D2AFAF26E4ADD6AF1BBA9D6ED8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -50,6 +50,14 @@ namespace opdracht2 {
         #line hidden
         
         
+        #line 20 "..\..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ListBox lb;
+        
+        #line default
+        #line hidden
+        
+        
         #line 21 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button LoadFile;
@@ -91,7 +99,22 @@ namespace opdracht2 {
             this.someCanvas = ((System.Windows.Controls.Canvas)(target));
             return;
             case 2:
+            this.lb = ((System.Windows.Controls.ListBox)(target));
+            
+            #line 20 "..\..\..\MainWindow.xaml"
+            this.lb.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.lb_SelectionChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 3:
             this.LoadFile = ((System.Windows.Controls.Button)(target));
+            
+            #line 21 "..\..\..\MainWindow.xaml"
+            this.LoadFile.Click += new System.Windows.RoutedEventHandler(this.LoadFile_Click);
+            
+            #line default
+            #line hidden
             return;
             }
             this._contentLoaded = true;
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csproj.CoreCompileInputs.cache b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csproj.CoreCompileInputs.cache
index c865990..f80f941 100644
--- a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csproj.CoreCompileInputs.cache
+++ b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-ab61051a8f40b80922d3e5ed73f33937fcfba690
+333d42d081eb5648599bfa58a7cbd5c56cf6bf43
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csproj.FileListAbsolute.txt b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csproj.FileListAbsolute.txt
index d15901d..d7db86c 100644
--- a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csproj.FileListAbsolute.txt
+++ b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csproj.FileListAbsolute.txt
@@ -20,3 +20,9 @@ C:\Users\Beppe\source\repos\opdracht2\opdracht2\obj\Debug\netcoreapp3.1\opdracht
 C:\Users\Beppe\source\repos\opdracht2\opdracht2\obj\Debug\netcoreapp3.1\opdracht2.pdb
 C:\Users\Beppe\source\repos\opdracht2\opdracht2\obj\Debug\netcoreapp3.1\opdracht2.genruntimeconfig.cache
 C:\Users\Beppe\source\repos\opdracht2\opdracht2\obj\Debug\netcoreapp3.1\opdracht2.csproj.CoreCompileInputs.cache
+C:\Users\Beppe\source\repos\opdracht2\opdracht2\bin\Debug\netcoreapp3.1\Datalaag.dll
+C:\Users\Beppe\source\repos\opdracht2\opdracht2\bin\Debug\netcoreapp3.1\Globals.dll
+C:\Users\Beppe\source\repos\opdracht2\opdracht2\bin\Debug\netcoreapp3.1\Logica.dll
+C:\Users\Beppe\source\repos\opdracht2\opdracht2\bin\Debug\netcoreapp3.1\Datalaag.pdb
+C:\Users\Beppe\source\repos\opdracht2\opdracht2\bin\Debug\netcoreapp3.1\Globals.pdb
+C:\Users\Beppe\source\repos\opdracht2\opdracht2\bin\Debug\netcoreapp3.1\Logica.pdb
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache
index 6070ca4..cfffd0d 100644
Binary files a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache and b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.csprojAssemblyReference.cache differ
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll
index 7a2e517..ceb477e 100644
Binary files a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll and b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.dll differ
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.g.resources b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.g.resources
index 3830977..16c29ce 100644
Binary files a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.g.resources and b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.g.resources differ
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb
index c481c4a..290ed39 100644
Binary files a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb and b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2.pdb differ
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.cache b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.cache
index 6d5d517..1c4b89c 100644
--- a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.cache
+++ b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.cache
@@ -16,5 +16,5 @@ C:\Users\Beppe\source\repos\opdracht2\opdracht2\App.xaml
 1981362301543
 MainWindow.xaml;
 
-True
+False
 
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.cache b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.cache
index 2744684..4449608 100644
--- a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.cache
+++ b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.cache
@@ -13,8 +13,8 @@ C:\Users\Beppe\source\repos\opdracht2\opdracht2\App.xaml
 11151548125
 
 6-680205189
-195549397899
+1981362301543
 MainWindow.xaml;
 
-False
+True
 
diff --git a/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.lref b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.lref
new file mode 100644
index 0000000..2e0809b
--- /dev/null
+++ b/opdracht2/obj/Debug/netcoreapp3.1/opdracht2_MarkupCompile.i.lref
@@ -0,0 +1,4 @@
+
+
+FC:\Users\Beppe\source\repos\opdracht2\opdracht2\MainWindow.xaml;;
+
diff --git a/opdracht2/obj/opdracht2.csproj.nuget.dgspec.json b/opdracht2/obj/opdracht2.csproj.nuget.dgspec.json
index 178a586..3340e16 100644
--- a/opdracht2/obj/opdracht2.csproj.nuget.dgspec.json
+++ b/opdracht2/obj/opdracht2.csproj.nuget.dgspec.json
@@ -5,7 +5,6 @@
   },
   "projects": {
     "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj": {
-      "version": "1.0.0",
       "restore": {
         "projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Datalaag\\Datalaag.csproj",
         "projectName": "Datalaag",
@@ -25,7 +24,6 @@
       }
     },
     "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Globals\\Globals.csproj": {
-      "version": "1.0.0",
       "restore": {
         "projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Globals\\Globals.csproj",
         "projectName": "Globals",
@@ -36,7 +34,6 @@
       }
     },
     "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj": {
-      "version": "1.0.0",
       "restore": {
         "projectUniqueName": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\Logica\\Logica.csproj",
         "projectName": "Logica",
diff --git a/opdracht2/obj/opdracht2.csproj.nuget.g.props b/opdracht2/obj/opdracht2.csproj.nuget.g.props
index 06e0a7a..f4394fb 100644
--- a/opdracht2/obj/opdracht2.csproj.nuget.g.props
+++ b/opdracht2/obj/opdracht2.csproj.nuget.g.props
@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Beppe\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.5.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
diff --git a/opdracht2/obj/project.nuget.cache b/opdracht2/obj/project.nuget.cache
index dc4ba08..c7b4006 100644
--- a/opdracht2/obj/project.nuget.cache
+++ b/opdracht2/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "p426YNxR+un7rXUpsV3S3g0htKyuFPUxB5pYHNl1fsHxje10LlIJDBLjupJb2IZCMEZ+Cv3TXWBEUMbbMYO5hA==",
+  "dgSpecHash": "Zy6jypDVLiSwLfNswZHvoD7ul/+NOG2AgIE/eLzWMMgAaQ+TzAjn3Or2nqa6RpIYT9zQrkp/4+yCHo1D0FoSMQ==",
   "success": true,
   "projectFilePath": "C:\\Users\\Beppe\\source\\repos\\opdracht2\\opdracht2\\opdracht2.csproj",
   "expectedPackageFiles": [