diff --git a/client.js b/client.js
new file mode 100644
index 0000000..7260004
--- /dev/null
+++ b/client.js
@@ -0,0 +1,12 @@
+var eejs = require("ep_etherpad-lite/node/eejs");
+
+exports.eejsBlock_scripts = function (hook_name, args, cb) {
+  args.content = args.content + eejs.require("ep_email_notifications/templates/scripts.html", {}, module);
+  return cb();
+};
+
+exports.eejsBlock_toolbarRight = function (hook_name, args, cb) {
+  args.content = args.content + eejs.require("ep_email_notifications/templates/button.html", {}, module);
+  return cb();
+};
+
diff --git a/ep.json b/ep.json
index 364053e..7fc1f06 100644
--- a/ep.json
+++ b/ep.json
@@ -3,7 +3,10 @@
     {
       "name": "ep_email_notifications",
       "hooks": {
-        "padUpdate": "ep_email_notifications/update"
+        "padUpdate": "ep_email_notifications/update",
+        "handleMessage": "ep_email_notifications/update",
+        "eejsBlock_scripts": "ep_email_notifications/client",
+        "eejsBlock_editbarMenuRight": "ep_email_notifications/client:eejsBlock_toolbarRight"
       },
       "client_hooks": {
       }
diff --git a/static/js/ep_email.js b/static/js/ep_email.js
new file mode 100644
index 0000000..e279949
--- /dev/null
+++ b/static/js/ep_email.js
@@ -0,0 +1,13 @@
+function sendEmailToServer(){
+  var email = "john@mclear.co.uk";
+  var message = {};
+  message.type = 'USERINFO_UPDATE';
+  message.userInfo = {};
+  message.userInfo.colorId = "#0000";
+  message.userInfo.email = "test";
+  message.userInfo.userId = "FUCKING TEST";
+
+  if(email){
+    pad.collabClient.sendMessage(message);
+  }
+}
diff --git a/templates/button.html b/templates/button.html
new file mode 100644
index 0000000..56d3c8f
--- /dev/null
+++ b/templates/button.html
@@ -0,0 +1 @@
+<button onClick=sendEmailToServer();>FUCKING AY</button>
diff --git a/templates/scripts.html b/templates/scripts.html
new file mode 100644
index 0000000..1dbd00b
--- /dev/null
+++ b/templates/scripts.html
@@ -0,0 +1 @@
+<script type='text/javascript' src='/static/plugins/ep_email_notifications/static/js/ep_email.js'></script>
diff --git a/update.js b/update.js
index fab3f94..6fc0cb0 100644
--- a/update.js
+++ b/update.js
@@ -11,9 +11,22 @@ var timers = {};
 // When a new message comes in from the client
 exports.handleMessage = function(hook_name, context, callback){
   console.warn(context);
-  if ( context.message.type == 'USERINFO_UPDATE' ) {
-    console.warn ("LORDAMERCI!");
+  if (context.message && context.message.data){
+    if (context.message.data.type == 'USERINFO_UPDATE' ) { // if it smells okay..
+      if (context.message.data.userInfo){
+        if(context.message.data.userInfo.email){ // it contains email
+
+          exports.setAuthorEmail(
+            context.message.data.userInfo.userId, 
+            context.message.data.userInfo.email, callback);
+
+          console.warn ("WRITE MY GOODNESS TO THE DATABASE!",context.message.data.userInfo.email);
+        }
+      }
+      console.warn ("LORDAMERCI!");
+    }
   }
+  callback();
 }
 
 exports.padUpdate = function (hook_name, _pad) {