diff --git a/zip-api/app.js b/zip-api/app.js
index df1f97b..54cf3f7 100644
--- a/zip-api/app.js
+++ b/zip-api/app.js
@@ -13,14 +13,25 @@ app.get('/', (req, res) => {
   res.json({test: 'Yay'});
 });
 
-
 app.get('/zip/:zipcode', (req, res) => {
-  // fill in...
+	const zip_records = zipdb.byZip[req.params.zipcode];
+	if (zip_records === undefined){
+		res.sendStatus(404);
+	}
+	else {
+		res.json(zip_records);
+	}
 });
 
 
 app.get('/city/:cityname', (req, res) => {
-  // fill in...
+	const cityRecords = zipdb.byCity[req.params.cityname];
+	if(cityRecords === undefined) {
+		res.sendStatus(404);
+	} 
+	else {
+		res.json(cityRecords);	
+	}
 });
 
 
diff --git a/zip-api/package-lock.json b/zip-api/package-lock.json
index 3b11c21..a0dd899 100644
--- a/zip-api/package-lock.json
+++ b/zip-api/package-lock.json
@@ -1210,13 +1210,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -1226,6 +1219,13 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "bundled": true,
@@ -2162,14 +2162,6 @@
         "duplexer": "0.1.1"
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -2179,6 +2171,14 @@
         "strip-ansi": "4.0.0"
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "strip-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
diff --git a/zip-api/package.json b/zip-api/package.json
index 6fb1e13..af43fd4 100644
--- a/zip-api/package.json
+++ b/zip-api/package.json
@@ -4,7 +4,7 @@
   "description": "Simple API backend for CTP lecture.",
   "main": "app.js",
   "scripts": {
-    "start": "node app.js"
+    "start": "nodemon -L app.js"
   },
   "author": "Edgardo Molina",
   "license": "ISC",