diff --git a/google/calendar.html b/google/calendar.html
index b8360fc0..05bd147c 100644
--- a/google/calendar.html
+++ b/google/calendar.html
@@ -14,6 +14,124 @@
   limitations under the License.
 -->
 
+<script type="text/x-red" data-template-name="google calendar in">
+    <div class="form-row">
+        <label for="node-input-google"><i class="fa fa-user"></i> Google</label>
+        <input type="text" id="node-input-google">
+    </div>
+    <div class="form-row">
+        <label for="node-input-calendar"><i class="fa fa-tag"></i> Calendar</label>
+        <input type="text" id="node-input-calendar">
+    </div>
+    <div class="form-row">
+        Inject message
+        <select id="node-input-offsetType" style="width:6em;">
+            <option value="at">at</option>
+            <option value="before">before</option>
+            <option value="after">after</option>
+        </select>
+        the
+        <select id="node-input-offsetFrom" style="width:5em;">
+            <option value="start">start</option>
+            <option value="end">end</option>
+        </select>
+        of each event.
+    </div>
+
+    <div id="node-row-offset" class="form-row hidden">
+        Inject message <input type="text" id="node-input-offset"
+                            style="width: 3em;" />
+        <select id="node-input-offsetUnits" style="width:7em;">
+            <option value="seconds">seconds</option>
+            <option value="minutes" selected="true">minutes</option>
+            <option value="hours">hours</option>
+            <option value="days">days</option>
+        </select>
+        <span id="node-input-type">before</span> the <span id="node-input-from">start</span> of each event.
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="google calendar in">
+  <p>Send a message every time an event occurs in a <a href="https://www.google.com/calendar">Google Calendar</a>.</p>
+  <p>The message sent from the node will have properties:
+    <ul>
+      <li><b>title</b> - the summary string from the calendar entry</li>
+      <li><b>description</b> - the description from the calendar entry</li>
+      <li><b>location.description</b> - the location string from the calendar entry</li>
+      <li><b>data</b> - the raw event from the google calendar query as described in the <a href="https://developers.google.com/google-apps/calendar/v3/reference/events/list">event list API documentation</a></li>
+      <li><b>payload</b> - an object containing:
+        <ul>
+          <li><b>title</b> - the summary string from the calendar entry</li>
+          <li><b>description</b> - the description from the calendar entry</li>
+          <li><b>location.description</b> - the location string from the calendar entry</li>
+          <li><b>start</b> - Javascript Date of start time - midnight for all day event</li>
+          <li><b>end</b> - Javascript Date of end time - midnight for all day event</li>
+          <li><b>allDayEvent</b> - true if event is an all day event</li>
+          <li><b>creator</b> - object containing name and email properties</li>
+          <li><b>attendees</b> - list of objects containing name and email properties</li>
+        </ul>
+      </li>
+    </ul>
+  </p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('google calendar in',{
+        category: 'social',
+        color:"#C0DEED",
+        defaults: {
+            google: {type:"google-credentials",required:true},
+            name: {value:""},
+            calendar: {value:""},
+            offsetType: {value:"at"},
+            offsetFrom: {value:"start"},
+            offset: {value:"10"},
+            offsetUnits: {value:"minutes"}
+        },
+        inputs:0,
+        outputs:1,
+        icon: "google-calendar.png",
+        label: function() {
+            return this.name||"Google Calendar";
+        },
+        oneditprepare: function() {
+            var type = this.offsetType || "at";
+            $("#node-input-offsetType option").filter(function() {
+                return $(this).val() == type;
+            }).attr('selected', true);
+            var from = this.offsetFrom || "start";
+            $("#node-input-offsetFrom option").filter(function() {
+                return $(this).val() == from;
+            }).attr('selected', true);
+            $("#node-input-offset").val(this.offset || "0");
+            var units = this.offsetUnits || "minutes";
+            $("#node-input-offsetUnits option").filter(function() {
+                return $(this).val() == units;
+            }).attr('selected', true);
+
+            var updateOptions = function() {
+                var type = $("#node-input-offsetType option:selected").val();
+                var from = $("#node-input-offsetFrom option:selected").val();
+                if (type === "at") {
+                    $("#node-row-offset").hide();
+                } else {
+                    $("#node-input-type").html(type);
+                    $("#node-input-from").html(from);
+                    $("#node-row-offset").show();
+                }
+             };
+             updateOptions();
+             $("#node-input-offsetType").change(updateOptions);
+             $("#node-input-offsetFrom").change(updateOptions);
+        },
+    });
+</script>
+
 <script type="text/x-red" data-template-name="google calendar">
     <div class="form-row">
         <label for="node-input-google"><i class="fa fa-user"></i> Google</label>
diff --git a/google/calendar.js b/google/calendar.js
index 1007509e..696b2c90 100644
--- a/google/calendar.js
+++ b/google/calendar.js
@@ -17,137 +17,165 @@
 module.exports = function(RED) {
     "use strict";
 
-    function GoogleCalendarQueryNode(n) {
+    function GoogleCalendarInputNode(n) {
         RED.nodes.createNode(this,n);
         this.google = RED.nodes.getNode(n.google);
-        this.calendar = n.calendar || 'primary';
-
-        this.calendars = {};
         if (!this.google || !this.google.credentials.accessToken) {
             this.warn("Missing google credentials");
             return;
         }
+        this.calendar = n.calendar || 'primary';
+        if (!n.offsetType || n.offsetType === 'at') {
+            this.offset = 0;
+        } else {
+            var plusOrMinus = n.offsetType === 'before' ? 1 : -1;
+            var multiplier = {
+                seconds: 1000,
+                minutes: 60*1000,
+                hours: 60*60*1000,
+                days: 24*60*60*1000
+            }[n.offsetUnits];
+            this.offset = plusOrMinus * n.offset * multiplier;
+        }
 
+        var setNextTimeout;
+        var eventsBetween;
+        if (!n.offsetFrom || n.offsetFrom === 'start') {
+            setNextTimeout = setNextStartingTimeout;
+            eventsBetween = eventsStartingBetween;
+        } else {
+            setNextTimeout = setNextEndingTimeout;
+            eventsBetween = eventsEndingBetween;
+        }
         var node = this;
         node.status({fill:"blue",shape:"dot",text:"querying"});
-        this.google.request('https://www.googleapis.com/calendar/v3/users/me/calendarList', function(err, data) {
+        calendarList(node, function(err) {
             if (err) {
-                node.error("failed to fetch calendar list: " + err.toString());
+                node.error(err);
                 node.status({fill:"red",shape:"ring",text:"failed"});
                 return;
             }
-            if (data.error) {
-                node.error("failed to fetch calendar list: " +
-                           data.error.message);
-                node.status({fill:"red",shape:"ring",text:"failed"});
+            var cal = calendarByNameOrId(node, node.calendar);
+            if (!cal) {
+                node.status({fill:"red",shape:"ring",text:"invalid calendar"});
                 return;
             }
-            for (var i = 0; i < data.items.length; i++) {
-                var cal = data.items[i];
-                if (cal.primary) {
-                    node.calendars.primary = cal;
+            node.status({});
+            node.on('input', function(msg) {
+                node.status({fill:"blue",shape:"dot",text:"querying"});
+                var now = new Date();
+                eventsBetween(node, cal, {}, node.last, now, function(err,events) {
+                    setNextTimeout(node, cal, now, function() {
+                        node.emit('input', {});
+                    });
+                    if (err) {
+                        node.warn(err);
+                        node.status({fill:"blue",shape:"dot",text:"failed"});
+                    } else {
+                        node.status({});
+                        events.forEach(function (ev) {
+                            sendEvent(node, ev, {});
+                        });
+                    }
+                });
+            });
+            node.timeout = setNextTimeout(node, cal, new Date(), function() {
+                node.emit('input', {});
+            });
+            node.on("close", function() {
+                if (node.timeout !== null) {
+                    clearTimeout(node.timeout);
+                    delete node.timeout;
                 }
-                node.calendars[cal.id] = cal;
+            });
+        });
+    }
+    RED.nodes.registerType("google calendar in", GoogleCalendarInputNode);
+
+    function setNextStartingTimeout(node, cal, after, cb) {
+        node.status({fill:"blue",shape:"dot",text:"querying next event"});
+        node.last = new Date(after.getTime());
+        after = new Date(after.getTime()+node.offset); // apply offset
+        nextStartingEvent(node, cal, {}, after, function(err, ev) {
+            var timeout = 900000; // 15 minutes
+            node.status({});
+            if (!err && ev) {
+                var start = getEventDate(ev);
+                if (start) {
+                    timeout =
+                        Math.min(timeout, start.getTime() - after.getTime());
+                }
+            }
+            if (timeout >= 0) {
+                node.timeout = setTimeout(cb, timeout);
+            } else {
+                console.log("timeout invalid");
+            }
+        });
+    }
+
+    function setNextEndingTimeout(node, cal, after, cb) {
+        node.status({fill:"blue",shape:"dot",text:"querying next event"});
+        node.last = new Date(after.getTime());
+        after = new Date(after.getTime()+node.offset); // apply offset
+        nextEndingEvent(node, cal, {}, after, function(err, ev) {
+            var timeout = 900000; // 15 minutes
+            node.status({});
+            if (!err && ev) {
+                var end = getEventDate(ev, 'end');
+                if (end) {
+                    timeout =
+                        Math.min(timeout, end.getTime() - after.getTime());
+                }
+            }
+            if (timeout >= 0) {
+                node.timeout = setTimeout(cb, timeout);
+            } else {
+                console.log("timeout invalid");
+            }
+        });
+    }
+
+    function GoogleCalendarQueryNode(n) {
+        RED.nodes.createNode(this,n);
+        this.google = RED.nodes.getNode(n.google);
+        this.calendar = n.calendar || 'primary';
+
+        if (!this.google || !this.google.credentials.accessToken) {
+            this.warn("Missing google credentials");
+            return;
+        }
+
+        var node = this;
+        node.status({fill:"blue",shape:"dot",text:"querying"});
+        calendarList(node, function(err) {
+            if (err) {
+                node.error(err);
+                node.status({fill:"red",shape:"ring",text:"failed"});
+                return;
             }
             node.status({});
 
             node.on('input', function(msg) {
                 node.status({fill:"blue",shape:"dot",text:"querying"});
-                var cal = node.calendars[msg.calendar] || node.calendarByName(msg.calendar) || node.calendars[node.calendar] || node.calendarByName(node.calendar);
+                var cal = calendarByNameOrId(node, msg.calendar) ||
+                    calendarByNameOrId(node, node.calendar);
                 if (!cal) {
                     node.status({fill:"red",shape:"ring",text:"invalid calendar"});
                     return;
                 }
-                var request = {
-                    url: 'https://www.googleapis.com/calendar/v3/calendars/'+cal.id+'/events',
-                };
-                var now = new Date();
-                request.qs = {
-                    maxResults: 10,
-                    orderBy: 'startTime',
-                    singleEvents: true,
-                    showDeleted: false,
-                    timeMin: now.toISOString()
-                };
-                if (msg.payload) {
-                    request.qs.q = RED.util.ensureString(msg.payload);
-                }
-                node.google.request(request, function(err, data) {
+                nextStartingEvent(node, cal, msg, function(err, ev) {
                     if (err) {
                         node.error("Error: " + err.toString());
                         node.status({fill:"red",shape:"ring",text:"failed"});
-                    } else if (data.error) {
-                        node.error("Error " + data.error.code + ": " +
-                                JSON.stringify(data.error.message));
-                        node.status({fill:"red",shape:"ring",text:"failed"});
+                        sendError(node, "event lookup failed", msg);
+                        return;
+                    }
+                    if (!ev) {
+                        sendError(node, "no event found", msg);
+                        node.status({fill:"red",shape:"ring",text:"no event"});
                     } else {
-                        var payload = msg.payload = {};
-                        var ev;
-                        /* 0 - 10 events ending after now ordered by startTime
-                         * so we find the first that starts after now to
-                         * give us the "next" event
-                         */
-                        for (var i = 0; i<data.items.length; i++) {
-                            ev = data.items[i];
-                            var start = getEventDate(ev);
-                            if (start && start.getTime() > now.getTime()) {
-                                payload.start = start;
-                                break;
-                            }
-                            ev = undefined;
-                        }
-                        if (!ev) {
-                            delete msg.data;
-                            node.send(msg);
-                            node.status({fill:"red",shape:"ring",text:"no event"});
-                            return;
-                        }
-                        if (ev.summary) {
-                            payload.title = msg.title = ev.summary;
-                        }
-                        if (ev.description) {
-                            payload.description = msg.description = ev.description;
-                        } else {
-                            delete msg.description;
-                        }
-                        if (ev.location) {
-                            /* intentionally the same object so that
-                             * if a node modifies msg.location (for
-                             * example by looking up
-                             * msg.location.description and adding
-                             * msg.location.{lat,lon} then both copies
-                             * will be updated.
-                             */
-                            payload.location = msg.location = {
-                                description: ev.location
-                            };
-                        } else {
-                            delete msg.location;
-                        }
-                        if (ev.start && ev.start.date) {
-                            payload.allDayEvent = true;
-                        }
-                        var end = getEventDate(ev, 'end');
-                        if (end) {
-                            payload.end = end;
-                        }
-                        if (ev.creator) {
-                            payload.creator = {
-                                name: ev.creator.displayName,
-                                email: ev.creator.email,
-                            };
-                        }
-                        if (ev.attendees) {
-                            payload.attendees = [];
-                            ev.attendees.forEach(function (a) {
-                                payload.attendees.push({
-                                    name: a.displayName,
-                                    email: a.email
-                                });
-                            });
-                        }
-                        msg.data = ev;
-                        node.send(msg);
+                        sendEvent(node, ev, msg);
                         node.status({});
                     }
                 });
@@ -156,6 +184,343 @@ module.exports = function(RED) {
     }
     RED.nodes.registerType("google calendar", GoogleCalendarQueryNode);
 
+    function calendarByName(node, name) {
+        if (typeof name === 'undefined') {
+            return null;
+        }
+        for (var cal in node.calendars) {
+            if (node.calendars.hasOwnProperty(cal)) {
+                if (node.calendars[cal].summary === name) {
+                    return node.calendars[cal];
+                }
+            }
+        }
+        return null;
+    }
+
+    function calendarByNameOrId(node, nameOrId) {
+        return node.calendars.hasOwnProperty(nameOrId) ?
+            node.calendars[nameOrId] : // an id
+            calendarByName(node, nameOrId); // maybe a name
+    }
+
+    function calendarList(node, cb) {
+        node.calendars = {};
+        node.google.request('https://www.googleapis.com/calendar/v3/users/me/calendarList', function(err, data) {
+            if (err) {
+                cb("failed to fetch calendar list: " + err.toString());
+                return;
+            }
+            if (data.error) {
+                cb("failed to fetch calendar list: " + data.error.message);
+                return;
+            }
+            for (var i = 0; i < data.items.length; i++) {
+                var cal = data.items[i];
+                if (cal.primary) {
+                    node.calendars.primary = cal;
+                }
+                node.calendars[cal.id] = cal;
+            }
+            cb(null);
+        });
+    }
+
+    function nextStartingEvent(node, cal, msg, after, cb) {
+        if (typeof after === 'function') {
+            cb = after;
+            after = new Date();
+        }
+
+        var request = {
+            url: 'https://www.googleapis.com/calendar/v3/calendars/'+cal.id+'/events'
+        };
+        request.qs = {
+            maxResults: 10,
+            orderBy: 'startTime',
+            singleEvents: true,
+            showDeleted: false,
+            timeMin: after.toISOString()
+        };
+        if (msg.payload) {
+            request.qs.q = RED.util.ensureString(msg.payload);
+        }
+        var handle_response = function(err, data) {
+            if (err) {
+                cb("Error: " + err.toString(), null);
+            } else if (data.error) {
+                cb("Error " + data.error.code + ": " +
+                        JSON.stringify(data.error.message), null);
+            } else {
+                var ev;
+                /* 0 - 10 events ending after now ordered by startTime
+                 * so we find the first that starts after now to
+                 * give us the "next" event
+                 */
+                for (var i = 0; i<data.items.length; i++) {
+                    ev = data.items[i];
+                    var start = getEventDate(ev);
+                    if (start && start.getTime() > after.getTime()) {
+                        break;
+                    }
+                    ev = undefined;
+                }
+                if (!ev && data.hasOwnProperty('nextPageToken')) {
+                    request.qs.pageToken = data.nextPageToken;
+                    node.google.request(request, handle_response);
+                } else {
+                    cb(null, ev);
+                }
+            }
+        };
+        node.google.request(request, handle_response);
+    }
+
+    function nextEndingEvent(node, cal, msg, after, cb) {
+        if (typeof after === 'function') {
+            cb = after;
+            after = new Date();
+        }
+
+        var request = {
+            url: 'https://www.googleapis.com/calendar/v3/calendars/'+cal.id+'/events'
+        };
+        /* orderby: endTime is not permitted by API so for now this assumes
+         * that events are not nested.
+         * TODO: support nested events - at least simple, common cases
+         * such as an event overlapping an all day event
+         */
+        request.qs = {
+            maxResults: 10,
+            orderBy: 'startTime',
+            singleEvents: true,
+            showDeleted: false,
+            timeMin: after.toISOString()
+        };
+        if (msg.payload) {
+            request.qs.q = RED.util.ensureString(msg.payload);
+        }
+        var handle_response = function(err, data) {
+            if (err) {
+                cb("Error: " + err.toString(), null);
+            } else if (data.error) {
+                cb("Error " + data.error.code + ": " +
+                        JSON.stringify(data.error.message), null);
+            } else {
+                var ev;
+                /* 0 - 10 events ending after now ordered by startTime
+                 * so we find the first that starts after now to
+                 * give us the "next" event
+                 */
+                for (var i = 0; i<data.items.length; i++) {
+                    ev = data.items[i];
+                    var end = getEventDate(ev, 'end');
+                    if (end && end.getTime() > after.getTime()) {
+                        break;
+                    }
+                    ev = undefined;
+                }
+                if (!ev && data.hasOwnProperty('nextPageToken')) {
+                    request.qs.pageToken = data.nextPageToken;
+                    node.google.request(request, handle_response);
+                } else {
+                    cb(null, ev);
+                }
+            }
+        };
+        node.google.request(request, handle_response);
+    }
+
+    function eventsStartingBetween(node, cal, msg, start, end, results, cb) {
+        if (typeof results === 'function') {
+            cb = results;
+            results = {
+                events: []
+            };
+        }
+        start = new Date(start.getTime()+node.offset); // apply offset
+        end = new Date(end.getTime()+node.offset); // apply offset
+        var request = {
+            url: 'https://www.googleapis.com/calendar/v3/calendars/'+cal.id+'/events'
+        };
+        request.qs = {
+            maxResults: 10,
+            orderBy: 'startTime',
+            singleEvents: true,
+            showDeleted: false,
+            timeMin: start.toISOString(),
+            timeMax: (new Date(end.getTime() + 60*1000)).toISOString()
+        };
+        if (msg.payload) {
+            request.qs.q = RED.util.ensureString(msg.payload);
+        }
+        if (results.hasOwnProperty('nextPageToken')) {
+            request.qs.pageToken = results.nextPageToken;
+        }
+        node.google.request(request, function(err, data) {
+            if (err) {
+                cb("Error: " + err.toString(), null);
+            } else if (data.error) {
+                cb("Error " + data.error.code + ": " +
+                        JSON.stringify(data.error.message), null);
+            } else {
+                /* 0 - 10 events ending after now ordered by startTime
+                 * so we find the first that starts after now to
+                 * give us the "next" event
+                 */
+                for (var i = 0; i < data.items.length; i++) {
+                    var ev = data.items[i];
+                    var evStart = getEventDate(ev);
+                    if (evStart) {
+                         if (evStart.getTime() > end.getTime()) {
+                             // timeMax should catch these
+                             break;
+                         } else if (evStart.getTime() > start.getTime()) {
+                             results.events.push(ev);
+                         }
+                    }
+                }
+                if (data.hasOwnProperty('nextPageToken')) {
+                    results.nextPageToken = data.nextPageToken;
+                    eventsStartingBetween(node, cal, msg, start, end, results, cb);
+                } else {
+                    cb(null, results.events);
+                }
+            }
+        });
+    }
+
+    function eventsEndingBetween(node, cal, msg, start, end, results, cb) {
+        if (typeof results === 'function') {
+            cb = results;
+            results = {
+                events: []
+            };
+        }
+        start = new Date(start.getTime()+node.offset); // apply offset
+        end = new Date(end.getTime()+node.offset); // apply offset
+        var request = {
+            url: 'https://www.googleapis.com/calendar/v3/calendars/'+cal.id+'/events'
+        };
+        /* orderby: endTime is not permitted by API so for now events are
+         * returned in startTime order rather than end time order which
+         * would be more natural. This is probably okay for most cases.
+         * TODO: post-process events list to order them by end time
+         */
+        request.qs = {
+            maxResults: 10,
+            orderBy: 'startTime', // endTime is not permitted by API
+            singleEvents: true,
+            showDeleted: false,
+            timeMin: start.toISOString(),
+            timeMax: (new Date(end.getTime() + 60*1000)).toISOString()
+        };
+        if (msg.payload) {
+            request.qs.q = RED.util.ensureString(msg.payload);
+        }
+        if (results.hasOwnProperty('nextPageToken')) {
+            request.qs.pageToken = results.nextPageToken;
+        }
+        node.google.request(request, function(err, data) {
+            if (err) {
+                cb("Error: " + err.toString(), null);
+            } else if (data.error) {
+                cb("Error " + data.error.code + ": " +
+                        JSON.stringify(data.error.message), null);
+            } else {
+                /* 0 - 10 events ending after now ordered by startTime
+                 * so we find the first that starts after now to
+                 * give us the "next" event
+                 */
+                for (var i = 0; i < data.items.length; i++) {
+                    var ev = data.items[i];
+                    var evEnd = getEventDate(ev, 'end');
+                    if (evEnd) {
+                         if (evEnd.getTime() > end.getTime()) {
+                             break;
+                         } else if (evEnd.getTime() > start.getTime()) {
+                             results.events.push(ev);
+                         }
+                    }
+                }
+                if (data.hasOwnProperty('nextPageToken')) {
+                    results.nextPageToken = data.nextPageToken;
+                    eventsEndingBetween(node, cal, msg, start, end, results, cb);
+                } else {
+                    cb(null, results.events);
+                }
+            }
+        });
+    }
+
+    function sendError(node, error, msg) {
+        if (typeof msg === 'undefined') {
+            msg = {};
+        }
+        delete msg.payload;
+        delete msg.data;
+        msg.error = error;
+        node.send(msg);
+    }
+
+    function sendEvent(node, ev, msg) {
+        if (typeof msg === 'undefined') {
+            msg = {};
+        }
+        delete msg.error;
+        var payload = msg.payload = {};
+        if (ev.summary) {
+            payload.title = msg.title = ev.summary;
+        }
+        if (ev.description) {
+            payload.description = msg.description = ev.description;
+        } else {
+            delete msg.description;
+        }
+        if (ev.location) {
+            /* intentionally the same object so that
+             * if a node modifies msg.location (for
+             * example by looking up
+             * msg.location.description and adding
+             * msg.location.{lat,lon} then both copies
+             * will be updated.
+             */
+            payload.location = msg.location = {
+                description: ev.location
+            };
+        } else {
+            delete msg.location;
+        }
+        var start = getEventDate(ev);
+        if (start) {
+            payload.start = start;
+        }
+        if (ev.start && ev.start.date) {
+            payload.allDayEvent = true;
+        }
+        var end = getEventDate(ev, 'end');
+        if (end) {
+            payload.end = end;
+        }
+        if (ev.creator) {
+            payload.creator = {
+                name: ev.creator.displayName,
+                email: ev.creator.email,
+            };
+        }
+        if (ev.attendees) {
+            payload.attendees = [];
+            ev.attendees.forEach(function (a) {
+                payload.attendees.push({
+                    name: a.displayName,
+                    email: a.email
+                });
+            });
+        }
+        msg.data = ev;
+        node.send(msg);
+    }
+
     function getEventDate(ev, type) {
         if (typeof type === 'undefined') {
             type = 'start';
@@ -169,23 +534,11 @@ module.exports = function(RED) {
         }
     }
 
-    GoogleCalendarQueryNode.prototype.calendarByName = function(name) {
-        for (var cal in this.calendars) {
-            if (this.calendars.hasOwnProperty(cal)) {
-                if (this.calendars[cal].summary === name) {
-                    return this.calendars[cal];
-                }
-            }
-        }
-        return;
-    };
-
     function GoogleCalendarOutNode(n) {
         RED.nodes.createNode(this,n);
         this.google = RED.nodes.getNode(n.google);
         this.calendar = n.calendar || 'primary';
 
-        this.calendars = {};
         if (!this.google || !this.google.credentials.accessToken) {
             this.warn("Missing google credentials");
             return;
@@ -193,30 +546,18 @@ module.exports = function(RED) {
 
         var node = this;
         node.status({fill:"blue",shape:"dot",text:"querying"});
-        this.google.request('https://www.googleapis.com/calendar/v3/users/me/calendarList', function(err, data) {
+        calendarList(node, function(err) {
             if (err) {
-                node.error("failed to fetch calendar list: " + err.toString());
-                node.status({fill:"red",shape:"ring",text:"failed"});
-                return;
-            }
-            if (data.error) {
-                node.error("failed to fetch calendar list: " +
-                           data.error.message);
+                node.error(err);
                 node.status({fill:"red",shape:"ring",text:"failed"});
                 return;
             }
-            for (var i = 0; i < data.items.length; i++) {
-                var cal = data.items[i];
-                if (cal.primary) {
-                    node.calendars.primary = cal;
-                }
-                    node.calendars[cal.id] = cal;
-            }
             node.status({});
 
             node.on('input', function(msg) {
                 node.status({fill:"blue",shape:"dot",text:"creating"});
-                var cal = node.calendars[msg.calendar] || node.calendarByName(msg.calendar) || node.calendars[node.calendar];
+                var cal = calendarByNameOrId(node, msg.calendar) ||
+                    calendarByNameOrId(node, node.calendar);
                 if (!cal) {
                     node.status({fill:"red",shape:"ring",text:"invalid calendar"});
                     return;
@@ -253,15 +594,4 @@ module.exports = function(RED) {
         });
     }
     RED.nodes.registerType("google calendar out", GoogleCalendarOutNode);
-
-    GoogleCalendarOutNode.prototype.calendarByName = function(name) {
-        for (var cal in this.calendars) {
-            if (this.calendars.hasOwnProperty(cal)) {
-                if (this.calendars[cal].summary === name) {
-                    return this.calendars[cal];
-                }
-            }
-        }
-        return;
-    };
 }
diff --git a/test/google/calendar_spec.js b/test/google/calendar_spec.js
index c7e62be4..477df387 100644
--- a/test/google/calendar_spec.js
+++ b/test/google/calendar_spec.js
@@ -21,11 +21,15 @@ var googleNode = require("../../google/google.js");
 var helper = require('../helper.js');
 var nock = helper.nock;
 
-function ISOTimeString(offsetSeconds) {
+function TimeOffset(offsetSeconds) {
     if (!offsetSeconds) {
      offsetSeconds = 0;
     }
-    return (new Date((new Date()).getTime()+offsetSeconds*1000)).toISOString();
+    return (new Date((new Date()).getTime()+offsetSeconds*1000));
+}
+
+function ISOTimeString(offsetSeconds) {
+    return TimeOffset(offsetSeconds).toISOString();
 }
 
 describe('google calendar nodes', function() {
@@ -41,12 +45,342 @@ describe('google calendar nodes', function() {
         helper.unload();
     });
 
+    describe('input node', function() {
+        if (!nock) { return; }
+        it('injects message for calendar entry', function(done) {
+            var oneMinuteAgo = TimeOffset(-60); // definitely passed
+            var now = TimeOffset();
+            var oneSecondFromNow = TimeOffset(1);
+            var oneMinuteFromNow = TimeOffset(60);
+            var oneMinuteOneSecondFromNow = TimeOffset(61);
+            var twoMinutesFromNow = TimeOffset(120);
+            var scope = nock('https://www.googleapis.com:443')
+                .filteringPath(function(path) {
+                    path = path.replace(/\.\d\d\dZ$/g, '.000Z');
+                    path =
+                        path.replace(
+                            'timeMin='
+                              +encodeURIComponent(oneMinuteAgo.toISOString()),
+                            'timeMin=oneMinuteAgo');
+                    [now, oneSecondFromNow].forEach(function(t) {
+                        path =
+                            path.replace(
+                                'timeMin='+
+                                    encodeURIComponent(t.toISOString())
+                                        .replace(/\.\d\d\dZ$/, '.000Z'),
+                                'timeMin=now');
+                    });
+                    [oneMinuteFromNow, oneMinuteOneSecondFromNow].forEach(function(t) {
+                        path =
+                            path.replace(
+                                'timeMax='+encodeURIComponent(t.toISOString())
+                                    .replace(/\.\d\d\dZ$/, '.000Z'),
+                                'timeMax=oneMinuteFromNow');
+                    });
+                    return path;
+                })
+                .get('/calendar/v3/users/me/calendarList')
+                .reply(200, {
+                    kind : "calendar#calendarList",
+                    items : [
+                        { id: "bob", summary: "Bob", primary: true },
+                        { id: "work", summary: "Work" },
+                        { id: "home", summary: "Home" }
+                    ]
+                }, {
+                    date: 'Tue, 11 Nov 2014 10:53:24 GMT',
+                    'content-type': 'application/json; charset=UTF-8'
+                })
+                .get('/calendar/v3/calendars/bob/events?maxResults=10&orderBy=startTime&singleEvents=true&showDeleted=false&timeMin=now')
+                .reply(200, {
+                    kind: "calendar#events",
+                    items: [
+                        {
+                            creator: {
+                                email: "foo@example.com",
+                                self: true,
+                                displayName: "Bob Foo"
+                            },
+                            status: "confirmed",
+                            kind: "calendar#event",
+                            summary: "Coffee",
+                            attendees: [
+                                {
+                                    email: "foo@example.com",
+                                    responseStatus: "needsAction",
+                                    organizer: true,
+                                    self: true,
+                                    displayName: "Bob Foo"
+                                }
+                            ],
+                            start: {
+                                dateTime: oneMinuteFromNow.toISOString()
+                            },
+                            end: {
+                                dateTime: twoMinutesFromNow.toISOString()
+                            }
+                        }
+                    ]
+                }, {
+                    date: 'Tue, 11 Nov 2014 10:53:24 GMT',
+                    'content-type': 'application/json; charset=UTF-8'
+                })
+                .get('/calendar/v3/calendars/bob/events?maxResults=10&orderBy=startTime&singleEvents=true&showDeleted=false&timeMin=oneMinuteAgo&timeMax=oneMinuteFromNow')
+                .reply(200, {
+                    kind: "calendar#events",
+                    items: [
+                        {
+                            creator: {
+                                email: "foo@example.com",
+                                self: true,
+                                displayName: "Bob Foo"
+                            },
+                            status: "confirmed",
+                            kind: "calendar#event",
+                            summary: "Meeting",
+                            attendees: [
+                                {
+                                    email: "foo@example.com",
+                                    responseStatus: "needsAction",
+                                    organizer: true,
+                                    self: true,
+                                    displayName: "Bob Foo"
+                                }
+                            ],
+                            start: {
+                                dateTime: now.toISOString()
+                            },
+                            end: {
+                                dateTime: oneMinuteFromNow.toISOString()
+                            }
+                        }
+                    ]
+                }, {
+                    date: 'Tue, 11 Nov 2014 10:53:24 GMT',
+                    'content-type': 'application/json; charset=UTF-8'
+                })
+                .get('/calendar/v3/calendars/bob/events?maxResults=10&orderBy=startTime&singleEvents=true&showDeleted=false&timeMin=now')
+                .reply(200, {
+                    kind: "calendar#events",
+                    items: []
+                }, {
+                    date: 'Tue, 11 Nov 2014 10:53:24 GMT',
+                    'content-type': 'application/json; charset=UTF-8'
+                });
+            helper.load([googleNode, calendarNode], [
+                {id:"google-config", type:"google-credentials",
+                    displayName: "Bob"},
+                {id:"calendar", type:"google calendar in",
+                    google: "google-config", wires:[["output"]]},
+                {id:"output", type:"helper"}
+            ], {
+                "google-config": {
+                    clientId: "id",
+                    clientSecret: "secret",
+                    accessToken: "access",
+                    refreshToken: "refresh",
+                    expireTime: 1000+(new Date().getTime()/1000),
+                    displayName: "Bob"
+                },
+            }, function() {
+                var calendar = helper.getNode("calendar");
+                calendar.should.have.property('id', 'calendar');
+                var output = helper.getNode("output");
+                output.should.have.property('id', 'output');
+                output.on("input", function(msg) {
+                    msg.should.have.property('title', 'Meeting');
+                    scope.isDone();
+                    done();
+                });
+
+                // wait for calendar.status({}) to be called twice
+                var count = 0;
+                var stub = sinon.stub(calendar, 'status', function(status) {
+                    if (Object.getOwnPropertyNames(status).length === 0) {
+                        count++;
+                        if (count == 2) {
+                            stub.restore();
+                            // hack last check time back a minute
+                            calendar.last = oneMinuteAgo;
+                            calendar.should.have.property('timeout');
+                            calendar.emit('input',{});
+                        }
+                    }
+                });
+            });
+        });
+
+        it('injects message for calendar entry based on end time', function(done) {
+            var oneMinuteAgo = TimeOffset(-60); // definitely passed
+            var now = TimeOffset();
+            var oneSecondFromNow = TimeOffset(1);
+            var oneMinuteFromNow = TimeOffset(60);
+            var oneMinuteOneSecondFromNow = TimeOffset(61);
+            var twoMinutesFromNow = TimeOffset(120);
+            var scope = nock('https://www.googleapis.com:443')
+                .filteringPath(function(path) {
+                    path = path.replace(/\.\d\d\dZ$/g, '.000Z');
+                    path =
+                        path.replace(
+                            'timeMin='
+                              +encodeURIComponent(oneMinuteAgo.toISOString()),
+                            'timeMin=oneMinuteAgo');
+                    [now, oneSecondFromNow].forEach(function(t) {
+                        path =
+                            path.replace(
+                                'timeMin='+
+                                    encodeURIComponent(t.toISOString())
+                                        .replace(/\.\d\d\dZ$/, '.000Z'),
+                                'timeMin=now');
+                    });
+                    [oneMinuteFromNow, oneMinuteOneSecondFromNow].forEach(function(t) {
+                        path =
+                            path.replace(
+                                'timeMax='+encodeURIComponent(t.toISOString())
+                                    .replace(/\.\d\d\dZ$/, '.000Z'),
+                                'timeMax=oneMinuteFromNow');
+                    });
+                    return path;
+                })
+                .get('/calendar/v3/users/me/calendarList')
+                .reply(200, {
+                    kind : "calendar#calendarList",
+                    items : [
+                        { id: "bob", summary: "Bob", primary: true },
+                        { id: "work", summary: "Work" },
+                        { id: "home", summary: "Home" }
+                    ]
+                }, {
+                    date: 'Tue, 11 Nov 2014 10:53:24 GMT',
+                    'content-type': 'application/json; charset=UTF-8'
+                })
+                .get('/calendar/v3/calendars/bob/events?maxResults=10&orderBy=startTime&singleEvents=true&showDeleted=false&timeMin=now')
+                .reply(200, {
+                    kind: "calendar#events",
+                    items: [
+                        {
+                            creator: {
+                                email: "foo@example.com",
+                                self: true,
+                                displayName: "Bob Foo"
+                            },
+                            status: "confirmed",
+                            kind: "calendar#event",
+                            summary: "Coffee",
+                            attendees: [
+                                {
+                                    email: "foo@example.com",
+                                    responseStatus: "needsAction",
+                                    organizer: true,
+                                    self: true,
+                                    displayName: "Bob Foo"
+                                }
+                            ],
+                            start: {
+                                dateTime: oneMinuteFromNow.toISOString()
+                            },
+                            end: {
+                                dateTime: twoMinutesFromNow.toISOString()
+                            }
+                        }
+                    ]
+                }, {
+                    date: 'Tue, 11 Nov 2014 10:53:24 GMT',
+                    'content-type': 'application/json; charset=UTF-8'
+                })
+                .get('/calendar/v3/calendars/bob/events?maxResults=10&orderBy=startTime&singleEvents=true&showDeleted=false&timeMin=oneMinuteAgo&timeMax=oneMinuteFromNow')
+                .reply(200, {
+                    kind: "calendar#events",
+                    items: [
+                        {
+                            creator: {
+                                email: "foo@example.com",
+                                self: true,
+                                displayName: "Bob Foo"
+                            },
+                            status: "confirmed",
+                            kind: "calendar#event",
+                            summary: "Meeting",
+                            attendees: [
+                                {
+                                    email: "foo@example.com",
+                                    responseStatus: "needsAction",
+                                    organizer: true,
+                                    self: true,
+                                    displayName: "Bob Foo"
+                                }
+                            ],
+                            start: {
+                                dateTime: oneMinuteAgo.toISOString()
+                            },
+                            end: {
+                                dateTime: now.toISOString()
+                            }
+                        }
+                    ]
+                }, {
+                    date: 'Tue, 11 Nov 2014 10:53:24 GMT',
+                    'content-type': 'application/json; charset=UTF-8'
+                })
+                .get('/calendar/v3/calendars/bob/events?maxResults=10&orderBy=startTime&singleEvents=true&showDeleted=false&timeMin=now')
+                .reply(200, {
+                    kind: "calendar#events",
+                    items: []
+                }, {
+                    date: 'Tue, 11 Nov 2014 10:53:24 GMT',
+                    'content-type': 'application/json; charset=UTF-8'
+                });
+            helper.load([googleNode, calendarNode], [
+                {id:"google-config", type:"google-credentials",
+                    displayName: "Bob"},
+                {id:"calendar", type:"google calendar in",
+                    offsetFrom: "end",
+                    google: "google-config", wires:[["output"]]},
+                {id:"output", type:"helper"}
+            ], {
+                "google-config": {
+                    clientId: "id",
+                    clientSecret: "secret",
+                    accessToken: "access",
+                    refreshToken: "refresh",
+                    expireTime: 1000+(new Date().getTime()/1000),
+                    displayName: "Bob"
+                },
+            }, function() {
+                var calendar = helper.getNode("calendar");
+                calendar.should.have.property('id', 'calendar');
+                var output = helper.getNode("output");
+                output.should.have.property('id', 'output');
+                output.on("input", function(msg) {
+                    msg.should.have.property('title', 'Meeting');
+                    scope.isDone();
+                    done();
+                });
+
+                // wait for calendar.status({}) to be called twice
+                var count = 0;
+                var stub = sinon.stub(calendar, 'status', function(status) {
+                    if (Object.getOwnPropertyNames(status).length === 0) {
+                        count++;
+                        if (count == 2) {
+                            stub.restore();
+                            // hack last check time back a minute
+                            calendar.last = oneMinuteAgo;
+                            calendar.should.have.property('timeout');
+                            calendar.emit('input',{});
+                        }
+                    }
+                });
+            });
+        });
+    });
+
     describe('query node', function() {
         if (!nock) { return; }
         it('returns calendar entry', function(done) {
-            var oneHourAgo = ISOTimeString(-3600);
-            var oneHourFromNow = ISOTimeString(3600);
-            var twoHoursFromNow = ISOTimeString(7200);
+            var oneHourAgo = TimeOffset(-3600);
+            var oneHourFromNow = TimeOffset(3600);
+            var twoHoursFromNow = TimeOffset(7200);
             nock('https://www.googleapis.com:443')
                 .get('/calendar/v3/users/me/calendarList')
                 .reply(200, {
@@ -60,7 +394,7 @@ describe('google calendar nodes', function() {
                     date: 'Tue, 11 Nov 2014 10:53:24 GMT',
                     'content-type': 'application/json; charset=UTF-8'
                 })
-                .filteringPath(/timeMin=[^&]*/g, 'timeMin=now')
+                .filteringPath(/timeMin=\d[^&]*/g, 'timeMin=now')
                 .get('/calendar/v3/calendars/bob/events?maxResults=10&orderBy=startTime&singleEvents=true&showDeleted=false&timeMin=now')
                 .reply(200, {
                     kind: "calendar#events",
@@ -84,10 +418,10 @@ describe('google calendar nodes', function() {
                                 }
                             ],
                             start: {
-                                dateTime: oneHourAgo
+                                dateTime: oneHourAgo.toISOString()
                             },
                             end: {
-                                dateTime: oneHourFromNow
+                                dateTime: oneHourFromNow.toISOString()
                             }
                         },
                         {
@@ -109,10 +443,10 @@ describe('google calendar nodes', function() {
                                 }
                             ],
                             start: {
-                                dateTime: oneHourFromNow
+                                dateTime: oneHourFromNow.toISOString()
                             },
                             end: {
-                                dateTime: twoHoursFromNow
+                                dateTime: twoHoursFromNow.toISOString()
                             }
                         }
                     ]
@@ -248,7 +582,7 @@ describe('google calendar nodes', function() {
                     date: 'Tue, 11 Nov 2014 10:53:24 GMT',
                     'content-type': 'application/json; charset=UTF-8'
                 })
-                .post('/calendar/v3/calendars/bob/events', {
+                .post('/calendar/v3/calendars/work/events', {
                     start: { dateTime: "2014-11-12T11:00:00Z" },
                     end: { dateTime: "2014-11-12T12:00:00Z" },
                     location: "Starbucks",
@@ -277,7 +611,7 @@ describe('google calendar nodes', function() {
             helper.load([googleNode, calendarNode], [
                 {id:"google-config", type:"google-credentials",
                     displayName: "Bob"},
-                {id:"calendar", type:"google calendar out",
+                {id:"calendar", type:"google calendar out", calendar: "Work",
                     google: "google-config"}
             ], {
                 "google-config": {