diff --git a/UNCCScavenger/AndroidManifest.xml b/UNCCScavenger/AndroidManifest.xml
index 21706c5..950652e 100644
--- a/UNCCScavenger/AndroidManifest.xml
+++ b/UNCCScavenger/AndroidManifest.xml
@@ -6,7 +6,8 @@
 
     <uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="19" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
         android:allowBackup="true"
diff --git a/UNCCScavenger/libs/gson-2.2.4.jar b/UNCCScavenger/libs/gson-2.2.4.jar
new file mode 100644
index 0000000..9478253
Binary files /dev/null and b/UNCCScavenger/libs/gson-2.2.4.jar differ
diff --git a/UNCCScavenger/src/edu/uncc/scavenger/rest/LocationClient.java b/UNCCScavenger/src/edu/uncc/scavenger/rest/LocationClient.java
index d21a97a..b465f1d 100644
--- a/UNCCScavenger/src/edu/uncc/scavenger/rest/LocationClient.java
+++ b/UNCCScavenger/src/edu/uncc/scavenger/rest/LocationClient.java
@@ -3,9 +3,11 @@ package edu.uncc.scavenger.rest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
 
 import edu.uncc.scavenger.R;
 import android.content.Context;
+import android.os.AsyncTask;
 
 import retrofit.RestAdapter;
 
@@ -32,6 +34,23 @@ public class LocationClient {
 	}
 	
 	public List<Location> getLocations() {
-		return getAdapter().listLocations();
+		try {
+			// Inline AsyncTask
+			return new AsyncTask<Void, Void, List<Location>>() {
+				@Override
+				protected List<Location> doInBackground(Void... params) {
+					// Work happens here
+					return getAdapter().listLocations();
+				}
+			}.get();
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ExecutionException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		return null;
 	}
 }