diff --git a/NavCityBreda/Model/Landmark.cs b/NavCityBreda/Model/Landmark.cs
new file mode 100644
index 0000000..5a2ab95
--- /dev/null
+++ b/NavCityBreda/Model/Landmark.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Devices.Geolocation;
+
+namespace NavCityBreda.Model
+{
+    class Landmark : Waypoint
+    {
+        public Landmark(Geopoint p) : base (p)
+        {
+
+        }
+    }
+}
diff --git a/NavCityBreda/Model/Waypoint.cs b/NavCityBreda/Model/Waypoint.cs
index fde0d43..9d7b243 100644
--- a/NavCityBreda/Model/Waypoint.cs
+++ b/NavCityBreda/Model/Waypoint.cs
@@ -3,10 +3,22 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Windows.Devices.Geolocation;
 
 namespace NavCityBreda.Model
 {
     class Waypoint
     {
+        Geopoint location;
+
+        public Waypoint(Geopoint p)
+        {
+            location = p;
+        }
+
+        public Waypoint(int a, int la, int lo)
+        {
+            location = new Geopoint(new BasicGeoposition() { Altitude = a, Latitude = la, Longitude = lo });
+        }
     }
 }
diff --git a/NavCityBreda/Views/MapView.xaml b/NavCityBreda/Views/MapView.xaml
index 82c6b07..9138097 100644
--- a/NavCityBreda/Views/MapView.xaml
+++ b/NavCityBreda/Views/MapView.xaml
@@ -13,6 +13,6 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         
-        <map:MapControl Grid.Row="0" Name="Map" ZoomInteractionMode="GestureAndControl" PanInteractionMode="Auto" TiltInteractionMode="GestureOnly" RotateInteractionMode="GestureOnly" MapServiceToken="74Y70e71HVjjN7lnx4Eh~3wugTlBDe2DbPGuR_AM2aA~AjMbg-pU2qn4gYf97oH0GZI1oY9Jc4vH-4WyIRyoYQM0Q71CnfbWalEN37bdSgms" />
+        <map:MapControl Grid.Row="0" Name="Map" ZoomInteractionMode="GestureAndControl" PanInteractionMode="Auto" TiltInteractionMode="ControlOnly" RotateInteractionMode="GestureAndControl" MapServiceToken="74Y70e71HVjjN7lnx4Eh~3wugTlBDe2DbPGuR_AM2aA~AjMbg-pU2qn4gYf97oH0GZI1oY9Jc4vH-4WyIRyoYQM0Q71CnfbWalEN37bdSgms" />
     </Grid>
 </Page>