diff --git a/portfolio/src/main/java/com/google/sps/servlets/MarkerServlet.java b/portfolio/src/main/java/com/google/sps/servlets/MarkerServlet.java
index 02cbd11..ee31172 100644
--- a/portfolio/src/main/java/com/google/sps/servlets/MarkerServlet.java
+++ b/portfolio/src/main/java/com/google/sps/servlets/MarkerServlet.java
@@ -14,6 +14,12 @@
 
 package com.google.sps.servlets;
 
+import com.google.gson.Gson;
+import com.google.appengine.api.datastore.DatastoreService;
+import com.google.appengine.api.datastore.DatastoreServiceFactory;
+import com.google.appengine.api.datastore.Entity;
+import com.google.appengine.api.datastore.PreparedQuery;
+import com.google.appengine.api.datastore.Query;
 import com.google.appengine.api.users.UserService;
 import com.google.appengine.api.users.UserServiceFactory;
 import java.io.IOException;
@@ -21,12 +27,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.google.gson.Gson;
-import com.google.appengine.api.datastore.DatastoreService;
-import com.google.appengine.api.datastore.DatastoreServiceFactory;
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.Query;
+import java.util.ArrayList;
+import java.util.List;
 
 
 @WebServlet("/markers")
@@ -37,12 +39,10 @@ private static class Marker {
 
     private final double lat;
     private final double lng;
-    private final String content;
 
-    public Marker(double lat, double lng, String content) {
+    public Marker(double lat, double lng) {
       this.lat = lat;
       this.lng = lng;
-      this.content = content;
     }
   }
   private DatastoreService datastore;
@@ -54,6 +54,14 @@ public void init() {
   
   @Override
   public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    List<Marker> markers = new ArrayList<>();
+  
+    for (Entity entity : (datastore.prepare(new Query("Marker")).asIterable())) {
+      markers.add(new Marker(Double.parseDouble((String) entity.getProperty("lat")),
+          Double.parseDouble((String) entity.getProperty("lng"))));
+    }
+    response.setContentType("application/json");
+    response.getWriter().println(new Gson().toJson(markers));
   }
   
   @Override
diff --git a/portfolio/src/main/webapp/map.js b/portfolio/src/main/webapp/map.js
index e467ce0..b9bdee4 100644
--- a/portfolio/src/main/webapp/map.js
+++ b/portfolio/src/main/webapp/map.js
@@ -12,28 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const API_KEY = "AIzaSyAxYeZWtbYyULIb5s59BaENaSpZD2Qr3RA";
+const API_KEY = "AIzaSyDOLA6fsSWwR-ONnnzTR0FnjxWhXc33wJw";
 
 function loadPage() {
-  createMap();
-  renderAddressForm();
+  renderMarkers(createMap());
+  activateAddressForm();
 }
 
-function renderAddressForm() {
+function activateAddressForm() {
   // On submit, address-form will convert city, state to lat, lng and POST that to datastore
   document.getElementById('address-form').addEventListener('submit', (e) => {
+    // Need to preventDefault() so page doesn't refresh immediately.
+    e.preventDefault();
     const formData = new FormData(e.target);
     const city = formData.get("city").replace(' ', '+');
     const state = formData.get("state").replace(' ', '+');
     fetch("https://maps.googleapis.com/maps/api/geocode/json?address=" + city + "," + state + "&key=" + API_KEY)
       .then((response) => response.json())
       .then((json) => {
-        debugLog(json);
-        const lat = json.results[0].geometry.location.lat;
-        const lng = json.results[0].geometry.location.lng;
-        debugLog(lat);
-        debugLog(lng);
-        return fetch("/markers?lat=" + lat + "&lng=" + lng, {method: 'POST'})
+        return fetch(`/markers?lat=${json.results[0].geometry.location.lat}&lng=${json.results[0].geometry.location.lng}`, 
+          {method: 'POST'});
       })
       .then((response) => {
         if (response.redirected) {
@@ -41,15 +39,23 @@ function renderAddressForm() {
         }
       })
       .catch((error) => {
-        debugLog('Error:', error);
+        alert('Error:', error);
       });
   });
 }
 
+function renderMarkers(map) {
+  fetch('/markers').then(response => response.json()).then((markers) => {
+    markers.forEach((marker) => {
+      new google.maps.Marker({position: {lat: marker.lat, lng: marker.lng}, map: map});
+    });
+  });
+}
+
 /** Creates a map in Aubergine style and adds it to the page. */
 function createMap() {
   const USCenterX = 38.5, USCenterY = -98;
-  const map = new google.maps.Map(
+  return new google.maps.Map(
     document.getElementById('map'), {
       center: {lat: USCenterX, lng: USCenterY}, 
       zoom: 3,