diff --git a/Windows Phone/VineCache/VineCache/App.xaml.cs b/Windows Phone/VineCache/VineCache/App.xaml.cs
index 77358c5..b3a911d 100644
--- a/Windows Phone/VineCache/VineCache/App.xaml.cs	
+++ b/Windows Phone/VineCache/VineCache/App.xaml.cs	
@@ -180,18 +180,23 @@ private void OnFacebookAuthenticationFinished(AccessTokenData session)
 
 		internal class VineCacheParseDelegate : ParseDelegate
 		{
+			bool eventReturned = false;
 			public void EventResult(PLEvent eventItem)
 			{
-				FacebookClient client = new FacebookClient(facebookToken);
-				client.GetTaskAsync("me", new { fields = "name, id, email" }).ContinueWith((Task<object> task, object item) => {
-					dynamic facebookInfo = task.Result;
-					App.facebookName = facebookInfo.name;
-					App.facebookID = facebookInfo.id;
-					//App.facebookEmail = facebookInfo.email;
-					parseDB.CreatePlayer(App.facebookName, App.facebookEmail, App.facebookID, item as PLEvent);
-					parseDB.GetMap(item as PLEvent);
-				}, eventItem);
-				
+				if (eventReturned)
+				{
+					FacebookClient client = new FacebookClient(facebookToken);
+					client.GetTaskAsync("me", new { fields = "name, id, email" }).ContinueWith((Task<object> task, object item) =>
+					{
+						dynamic facebookInfo = task.Result;
+						App.facebookName = facebookInfo.name;
+						App.facebookID = facebookInfo.id;
+						//App.facebookEmail = facebookInfo.email;
+						parseDB.CreatePlayer(App.facebookName, App.facebookEmail, App.facebookID, item as PLEvent);
+						parseDB.GetMap(item as PLEvent);
+					}, eventItem);
+				}
+				eventReturned = true;
 			}
 
 			public void MapResult(PLMap mapItem)
diff --git a/Windows Phone/VineCache/VineCache/DisplayVideoPage.xaml b/Windows Phone/VineCache/VineCache/DisplayVideoPage.xaml
index e77a807..688f2da 100644
--- a/Windows Phone/VineCache/VineCache/DisplayVideoPage.xaml	
+++ b/Windows Phone/VineCache/VineCache/DisplayVideoPage.xaml	
@@ -10,10 +10,11 @@
 
     <Grid Background="White">
         <TextBlock x:Name="gameNameTextBlock" Text="(Game name goes here)" Foreground="Green" FontSize="22" FontWeight="SemiBold" Margin="20,20,0,575"/>
-        <TextBlock Text="Find the location this video was taken:" Foreground="Green" FontSize="16" Margin="20,65,0,555"/>
+        <TextBlock Tapped="videoMediaElement_Tapped" Text="Find the location this video was taken:" Foreground="Green" FontSize="16" Margin="20,65,0,555"/>
         <StackPanel Background="Black" Margin="20,90,20,0" VerticalAlignment="Top" >
-            <MediaElement x:Name="videoMediaElement" Source="Assets/Fountain.small.mp4" AutoPlay="False" Tapped="videoMediaElement_Tapped" VerticalAlignment="Top"/>
+            <MediaElement x:Name="videoMediaElement" Source="C:/Data/Users/Public/Videos/vinecachetargetvideo.mp4" AutoPlay="False" Tapped="videoMediaElement_Tapped" VerticalAlignment="Top"/>
         </StackPanel>
+        <Button Name="NextPageButton" Content="Upload my video" Background="Green" HorizontalAlignment="Center" Click="NextPageButton_Click"/>
         <ProgressBar x:Name="distanceToObjectProgressBar" FlowDirection="LeftToRight" HorizontalAlignment="Left" Height="20" VerticalAlignment="Bottom" Margin="20,0,0,20" Width="360" />
     </Grid>
 </Page>
diff --git a/Windows Phone/VineCache/VineCache/DisplayVideoPage.xaml.cs b/Windows Phone/VineCache/VineCache/DisplayVideoPage.xaml.cs
index 24d6c36..818f1a9 100644
--- a/Windows Phone/VineCache/VineCache/DisplayVideoPage.xaml.cs	
+++ b/Windows Phone/VineCache/VineCache/DisplayVideoPage.xaml.cs	
@@ -14,6 +14,7 @@
 using Windows.UI.Xaml.Navigation;
 using Windows.Devices.Geolocation;
 using Windows.Storage;
+using System.Threading.Tasks;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkID=390556
 
@@ -26,6 +27,7 @@ public sealed partial class DisplayVideoPage : Page
     {
         private Geopoint startingPoint;
         private double m_startingDistance;
+		private bool videoTargetSet = false;
 
         public DisplayVideoPage()
         {
@@ -74,8 +76,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
         private async void videoMediaElement_Tapped(object sender, TappedRoutedEventArgs e)
         {
-			SetVideoTarget();
-			//this.NavigateToUploadVideoPage();
+			if (!videoTargetSet)
+			{
+				await SetVideoTarget();
+			}
 			videoMediaElement.Play();
             distanceToObjectProgressBar.Value = 50;
             if (this.startingPoint == null)
@@ -89,9 +93,12 @@ private async void videoMediaElement_Tapped(object sender, TappedRoutedEventArgs
             }
         }
 
-		public void SetVideoTarget()
+		public async Task SetVideoTarget()
 		{
-			this.videoMediaElement.Source = new Uri(KnownFolders.VideosLibrary.Path + "/vinecachetargetvideo.mp4");
+			StorageFile file = await KnownFolders.VideosLibrary.GetFileAsync("vinecachetargetvideo.mp4");
+			var stream = await file.OpenAsync(FileAccessMode.Read);
+			videoMediaElement.SetSource(stream, file.ContentType);
+			videoTargetSet = true;
 		}
 
         private void NavigateToUploadVideoPage()
@@ -105,5 +112,10 @@ private Point GetTargetCoordinates()
             //TODO: Get GPS Point from Node
             return new Point(47.6455, -122.1286);
         }
-    }
+
+		private void NextPageButton_Click(object sender, RoutedEventArgs e)
+		{
+			NavigateToUploadVideoPage();
+        }
+	}
 }
diff --git a/Windows Phone/VineCache/VineCache/ParseLibrary.cs b/Windows Phone/VineCache/VineCache/ParseLibrary.cs
index 9710ea4..098b965 100644
--- a/Windows Phone/VineCache/VineCache/ParseLibrary.cs	
+++ b/Windows Phone/VineCache/VineCache/ParseLibrary.cs	
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
+using System.Linq;
 
 namespace VineCache
 {
@@ -225,7 +226,8 @@ public void GetMap(PLEvent plEvent)
 
 				try
 				{
-					PLMap map = new PLMap((task.Result as ParseObject[])[0]);
+					ParseObject[] objects = task.Result.ToArray();
+					PLMap map = new PLMap(objects[0]);
 					
 					ParseDB._PLMap = map;