diff --git a/client/app/events/components/events.component.js b/client/app/events/components/events.component.js
index a0e4b2f..4f4b429 100644
--- a/client/app/events/components/events.component.js
+++ b/client/app/events/components/events.component.js
@@ -9,7 +9,6 @@ const events = {
         .then(function(res) {
           // Store array of JSON events.
           ctrl.events = res.data;
-          console.log(ctrl.events);
         })
         .then(function(data, status) {
           console.log('Data: ', data);
@@ -25,14 +24,25 @@ const events = {
         {{ $ctrl.events[0].place.location.state }} {{ $ctrl.events[0].place.location.zip }}
     </h4>
     <div>
-        <section ng-repeat="(key, value) in $ctrl.events">
+        <section ng-repeat="(key, value) in $ctrl.events" ng-if='value.start_time > "value.start_time" ' >
             <div><b>{{ value.name }}</b></div>
-            <div>Time: {{ value.start_time }} - {{ value.end_time }}</div>
+            <span>{{ value.start_time | date:"MM/dd/yyyy 'at' h:mma"}}</span> - <span>{{ value.end_time | date:"MM/dd/yyyy 'at' h:mma"}}</span><br>
             <div>Description: {{ value.description }}</div>
             <hr/>
         </section>
     </div>
+    <div ng-else>
+      <h2> Send us an email to schedule an event </h2>
+      <a href="mailto:info@40weightcoffee.com" target="_blank"><img src="images/email.png" alt="email"></a>
+    </div>
   `
 };
 
 angular.module('5340-site.events').component('events', events);
+
+
+
+
+
+
+
diff --git a/package.json b/package.json
index 69dfc96..7837d96 100644
--- a/package.json
+++ b/package.json
@@ -20,11 +20,12 @@
     "body-parser": "^1.17.2",
     "bootstrap": "3.3.7",
     "colors": "^1.1.2",
-    "express": "^4.15.3",
+    "express": "^4.16.2",
     "jquery": "^3.2.1",
     "mongoose": "^4.10.0",
     "morgan": "^1.8.1",
-    "request": "^2.81.0"
+    "request": "^2.81.0",
+    "yarn": "^1.3.2"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
diff --git a/server/controllers/eventsCtrl.js b/server/controllers/eventsCtrl.js
index 31d1a29..cf6a3ca 100644
--- a/server/controllers/eventsCtrl.js
+++ b/server/controllers/eventsCtrl.js
@@ -8,10 +8,11 @@ module.exports = {
 
         request(url, (err, response, body) => {
             if(!err && response.statusCode == 200) {
-                res.json((JSON.parse(body)).data);
+              res.json((JSON.parse(body)).data);
             } else {
                 console.log("ERROR: ", err);
             }
         });
     }
 };
+
diff --git a/server/controllers/menuCtrl.js b/server/controllers/menuCtrl.js
index db07326..c238196 100644
--- a/server/controllers/menuCtrl.js
+++ b/server/controllers/menuCtrl.js
@@ -1,8 +1,8 @@
 var menu = require('../data/menu.json');
 
 module.exports = {
-	// get things from the json file
-	get: (req, res) => {
-		res.json(menu);
-	}
-};
\ No newline at end of file
+  // get things from the json file
+  get: (req, res) => {
+    res.json(menu);
+  }
+};