diff --git a/CampusAppWP8/CampusAppWP8/Assets/testmap.png b/CampusAppWP8/CampusAppWP8/Assets/testmap.png
new file mode 100644
index 00000000..a2cdfad3
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/testmap.png differ
diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index d8a484bf..7abfac75 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -282,6 +282,7 @@
     <Content Include="Assets\icons\student_council_159_light.png" />
     <Content Include="Assets\icons\webmail_159_dark.png" />
     <Content Include="Assets\icons\webmail_159_light.png" />
+    <Content Include="Assets\testmap.png" />
     <Content Include="Assets\Tiles\FlipCycleTileLarge.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
index 547c169a..3dec5811 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
@@ -41,11 +41,23 @@
                 <TextBox Grid.Column="0" />
                 <Image Grid.Column="1" Source="/Assets/icons/search_159_dark.png" Width="60" />
             </Grid>
-            <Controls:Map  Grid.Row="1" ZoomLevel="16">
+            <!--<Controls:Map  Grid.Row="1" ZoomLevel="17" CartographicMode="Hybrid">
                 <Controls:Map.Center>
                     <Location:GeoCoordinate Altitude="NaN" Course="NaN" HorizontalAccuracy="NaN" Longitude="14.3242" Latitude="51.7662" Speed="NaN" VerticalAccuracy="NaN"/>
                 </Controls:Map.Center>
-            </Controls:Map>
+            </Controls:Map> -->
+            <ScrollViewer Name="test" Grid.Row="1" HorizontalScrollBarVisibility="Auto" RenderTransformOrigin="0,0">
+                <Canvas Width="2000" Height="2000" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                    <Canvas.Background>
+                        <ImageBrush Stretch="Fill" ImageSource="/Assets/testmap.png">
+
+                        </ImageBrush>
+                    </Canvas.Background>
+                    
+                 
+                    <Image Name="bla" Source="/Assets/icons/search_159_light.png" Width="60" Canvas.ZIndex="1"  Canvas.Top="800" Canvas.Left="800"/>
+                </Canvas>
+            </ScrollViewer>
         </Grid>
     </Grid>
 
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
index 9e4cd703..ca9aebd8 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
@@ -7,6 +7,7 @@ using System.Windows.Controls;
 using System.Windows.Navigation;
 using Microsoft.Phone.Controls;
 using Microsoft.Phone.Shell;
+using System.Windows.Media;
 
 namespace CampusAppWP8.Pages.Campusmap
 {
@@ -15,6 +16,8 @@ namespace CampusAppWP8.Pages.Campusmap
         public CampusMapPage()
         {
             InitializeComponent();
+            test.SetValue(H, 800);
+
         }
 
         private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)