diff --git a/lib/event.js.example b/lib/event.js.example
new file mode 100644
index 00000000..61696a11
--- /dev/null
+++ b/lib/event.js.example
@@ -0,0 +1,5 @@
+{
+  "key": "value",
+  "key2": "value2",
+  "other_key": "other_value"
+}
diff --git a/lib/main.js b/lib/main.js
index 2e56298c..30d4a965 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -9,6 +9,7 @@ var path = require('path');
 var async = require('async');
 var zip = new require('node-zip')();
 var wrench = require('wrench');
+var util = require('util');
 
 var Lambda = function() {
   this.version = packageJson.version;
@@ -29,12 +30,12 @@ Lambda.prototype._createSampleFile = function(file) {
 Lambda.prototype.setup = function() {
   console.log('Running setup.');
   this._createSampleFile('.env');
-  this._createSampleFile('event.json');
-  console.log('Setup done. Edit the .env and event.json files as needed.');
+  this._createSampleFile('event.js');
+  console.log('Setup done. Edit the .env and event.js files as needed.');
 };
 
 Lambda.prototype.run = function(program) {
-  this._createSampleFile('event.json');
+  this._createSampleFile('event.js');
 
   var dir = program.directory;
   var splitHandler = program.handler.split('.');
@@ -42,23 +43,27 @@ Lambda.prototype.run = function(program) {
   var handlername = splitHandler[1];
 
   var handler = require(process.cwd() + '/' + filename)[handlername];
-  var event = require(process.cwd() + '/event.json');
-
-  this._runHandler(handler, event);
+  var event = require(process.cwd() + '/event.js');
+  var this_instance = this;
+  
+  event.feed( function(event) {
+    this_instance._runHandler(handler, event);
+  });
 };
 
 Lambda.prototype._runHandler = function(handler, event) {
   var context = {
     succeed: function(result) {
-      console.log('succeed: ' + result);
+      console.log('succeed:\n' + util.inspect(result, {depth: 5}));
       process.exit(0);
     },
     fail: function(error) {
-      console.log('fail: ' + error);
+      console.log('fail:\n' + util.inspect(error, {depth: 5}));
       process.exit(-1);
     },
-    done: function() {
-      process.exit(0);
+    done: function(error, result) {
+        console.log('done:\n' + util.inspect(Array.slice(arguments), {depth: 5}));
+        process.exit( error ? -1 : 0);
     }
   };