diff --git a/Server/src/package.json b/Server/src/package.json
index 1a8ac09..26fc65f 100644
--- a/Server/src/package.json
+++ b/Server/src/package.json
@@ -14,6 +14,7 @@
     "cookie-parser": "^1.4.3",
     "crypto": "^1.0.1",
     "express": "^4.15.4",
+    "moment-timezone": "^0.5.13",
     "multer": "^1.3.0",
     "mysql": "^2.14.1",
     "nodemailer": "^4.1.0"
diff --git a/Server/src/routes/api/api.js b/Server/src/routes/api/api.js
index 33bff38..a70e4d4 100644
--- a/Server/src/routes/api/api.js
+++ b/Server/src/routes/api/api.js
@@ -30,18 +30,21 @@ router.get('/cim/:month/:day',function(req,res){
     res.sendFile(file);
     return;
   }
-  child = execFile(dir + '/calendar_image_maker/bin/phantomjs', [dir + '/calendar_image_maker/script.js', req.params.month, req.params.day], (error, stdout, stderr) => {
-    console.log("MAKE");
-    if (error) {
-      throw error;
-    }
-    if (fs.existsSync(file)){
-      res.sendFile(file);
-      return;
-    } else {
-      res.error("Error");
-    }
-  });
+  if (process.platform != 'win32'){
+    child = execFile(dir + '/calendar_image_maker/bin/phantomjs', [dir + '/calendar_image_maker/script.js', req.params.month, req.params.day], (error, stdout, stderr) => {
+      console.log("MAKE");
+      if (error) {
+        throw error;
+      }
+      if (fs.existsSync(file)){
+        res.sendFile(file);
+        return;
+      } else {
+        res.error("Error");
+      }
+    });
+  }
+  res.send("WIN");  
 });
 
 module.exports = router;
\ No newline at end of file
diff --git a/Server/src/routes/api/email.js b/Server/src/routes/api/email.js
index b6803ca..aaa2ebc 100644
--- a/Server/src/routes/api/email.js
+++ b/Server/src/routes/api/email.js
@@ -33,7 +33,7 @@ router.post("/", function(req,res){
 
     let mailOptions = {
         from: 'donotreply@oldfashionbaptistbutte.com',
-        to: 'djmotog3@gmail.com',
+        to: 'contact@oldfashionbaptistbutte.com',
         subject: 'OFB - ' + req.body.message.substring(0,Math.min(50,req.body.message.length-1)),
         html: '<b>Name:</b> ' + req.body.name + '<br><b>Email:</b> ' + req.body.email + '<br><b>Phone:</b> ' + req.body.phone + '<br><br>' + req.body.message
     };
diff --git a/Server/src/routes/api/events.js b/Server/src/routes/api/events.js
index 7ff0424..423b54f 100644
--- a/Server/src/routes/api/events.js
+++ b/Server/src/routes/api/events.js
@@ -1,6 +1,7 @@
 var express   = require('express');
 var router    = express.Router();
 var dbEvents = require('../../database/events');
+var moment = require('moment-timezone');
 
 
 router.get("/:id",function(req,res){
@@ -28,6 +29,47 @@ router.get("/page/:page",function(req,res){
             res.status(500).json({"status":500,"message":"Error processing request","error":err});
             return;
         }
+        if (req.params.page < 2 && events.length < 23){        
+            var nowMountain = moment.tz(new Date(),"Mountain/Denver");            
+            var nextSundayMorning = nextDay(nowMountain, 0, 10);
+            var nextSundayMorning2 = nextDay(nowMountain, 0, 11);
+            var nextSundayEvening = nextDay(nowMountain, 0, 19);
+            var nextWednesday = nextDay(nowMountain, 3, 7, 19);
+            if (nextWednesday < nextSundayMorning){
+                nextWednesday.setHours(19);
+                nextWednesday.setMinutes(0);
+                nextWednesday.setSeconds(0);
+                events.push({
+                    title: 'Wednesday Evening',
+                    startDate: nextWednesday,
+                    endDate: new Date(nextWednesday).setHours(20),
+                    description: 'Bible study and prayer for Wednesday evening.'
+                });
+            }
+            events.push({
+                title: 'Sunday School',
+                startDate: nextSundayMorning,
+                endDate: new Date(nextSundayMorning).setHours(11),
+                description: 'Sunday School Service'
+            });
+            events.push({
+                title: 'Sunday Morning Worship',
+                startDate: nextSundayMorning2,
+                endDate: new Date(nextSundayMorning2).setHours(12),
+                description: 'Sunday Morning Worship Service'
+            });
+            events.push({
+                title: 'Sunday Evening',
+                startDate: nextSundayEvening,
+                endDate: new Date(nextSundayEvening).setHours(20),
+                description: 'Sunday Evening Service'
+            });
+            // id: json.id,
+            // title: json.title,
+            // startDate: new Date(json.startDate),
+            // endDate: new Date(json.endDate),
+            // description: json.description
+        }
         res.status(200).json({"status":200,"events":events,"page":req.params.page,"pageSize":pageSize > events.length ? events.length : pageSize});
     });
 });
@@ -70,5 +112,14 @@ router.delete("/a/",function(req,res){
     });
 });
 
+function nextDay(startDate, dayOfWeek, hour){
+    startDate = new Date(startDate);
+    startDate.setDate(startDate.getDate() + (dayOfWeek+(7-startDate.getDay())) % 7);
+    startDate.setHours(hour);
+    startDate.setMinutes(0);
+    startDate.setSeconds(0);
+    startDate.setMilliseconds(0);
+    return startDate;
+}
 
 module.exports = router;
\ No newline at end of file
diff --git a/git-post-receive b/git-post-receive
index 2460c1d..f9aba5f 100644
--- a/git-post-receive
+++ b/git-post-receive
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 BUILD_ANGULAR_ARG=$1
-BUILD_ANGULAR=true
+BUILD_ANGULAR=false
 if [ "$BUILD_ANGULAR_ARG" = -ng ]; then
 	BUILD_ANGULAR=true
 fi