diff --git a/.jshintrc b/.jshintrc
index 9bc465f..75b8c12 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,5 +1,4 @@
 {
-  "node": true,
   "esnext": true,
   "bitwise": true,
   "camelcase": true,
diff --git a/dist/bespoke-keys.js b/dist/bespoke-keys.js
index dfd1bdf..7e76c95 100644
--- a/dist/bespoke-keys.js
+++ b/dist/bespoke-keys.js
@@ -1,5 +1,5 @@
 /*!
- * bespoke-keys v1.0.0
+ * bespoke-keys v1.1.0
  *
  * Copyright 2015, Mark Dalgleish
  * This content is released under the MIT license
@@ -9,21 +9,37 @@
 !function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n;"undefined"!=typeof window?n=window:"undefined"!=typeof global?n=global:"undefined"!=typeof self&&(n=self);var o=n;o=o.bespoke||(o.bespoke={}),o=o.plugins||(o.plugins={}),o.keys=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
 module.exports = function(options) {
   return function(deck) {
-    var isHorizontal = options !== 'vertical';
+    var KEYCODE = { SPACE: 32, PAGE_UP: 33, PAGE_DOWN: 34, END: 35, HOME: 36, LEFT: 37, UP: 38, RIGHT: 39, DOWN: 40 },
+      isHorizontal = options !== 'vertical',
+      indexOfLastSlide = deck.slides.length - 1,
+      isModifierKeyDown = function(e) {
+        return !!(e.ctrlKey || e.shiftKey || e.altKey || e.metaKey);
+      },
+      keydownHandler = function(e) {
+        if (e.which === KEYCODE.SPACE) {
+          if (!e.ctrlKey && !e.altKey && !e.metaKey) {
+            return e.shiftKey ? deck.prev() : deck.next();
+          }
+        }
+        else if (e.which === KEYCODE.PAGE_DOWN ||
+            (isHorizontal && e.which === KEYCODE.RIGHT) ||
+            (!isHorizontal && e.which === KEYCODE.DOWN)) {
+          if (!isModifierKeyDown(e)) { deck.next(); }
+        }
+        else if (e.which === KEYCODE.PAGE_UP ||
+            (isHorizontal && e.which === KEYCODE.LEFT) ||
+            (!isHorizontal && e.which === KEYCODE.UP)) {
+          if (!isModifierKeyDown(e)) { deck.prev(); }
+        }
+        else if (e.which === KEYCODE.END) {
+          if (deck.slide() !== indexOfLastSlide && !isModifierKeyDown(e)) { deck.slide(indexOfLastSlide); }
+        }
+        else if (e.which === KEYCODE.HOME) {
+          if (deck.slide() !== 0 && !isModifierKeyDown(e)) { deck.slide(0); }
+        }
+      };
 
-    document.addEventListener('keydown', function(e) {
-      if (e.which == 34 || // PAGE DOWN
-        (e.which == 32 && !e.shiftKey) || // SPACE WITHOUT SHIFT
-        (isHorizontal && e.which == 39) || // RIGHT
-        (!isHorizontal && e.which == 40) // DOWN
-      ) { deck.next(); }
-
-      if (e.which == 33 || // PAGE UP
-        (e.which == 32 && e.shiftKey) || // SPACE + SHIFT
-        (isHorizontal && e.which == 37) || // LEFT
-        (!isHorizontal && e.which == 38) // UP
-      ) { deck.prev(); }
-    });
+    document.addEventListener('keydown', keydownHandler, false);
   };
 };
 
diff --git a/dist/bespoke-keys.min.js b/dist/bespoke-keys.min.js
index 6b8ae6e..7079ca8 100644
--- a/dist/bespoke-keys.min.js
+++ b/dist/bespoke-keys.min.js
@@ -1,2 +1,2 @@
-/*! bespoke-keys v1.0.0 © 2015 Mark Dalgleish, MIT License */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n;"undefined"!=typeof window?n=window:"undefined"!=typeof global?n=global:"undefined"!=typeof self&&(n=self);var i=n;i=i.bespoke||(i.bespoke={}),i=i.plugins||(i.plugins={}),i.keys=e()}}(function(){return function e(n,i,t){function r(f,u){if(!i[f]){if(!n[f]){var c="function"==typeof require&&require;if(!u&&c)return c(f,!0);if(o)return o(f,!0);throw new Error("Cannot find module '"+f+"'")}var d=i[f]={exports:{}};n[f][0].call(d.exports,function(e){var i=n[f][1][e];return r(i?i:e)},d,d.exports,e,n,i,t)}return i[f].exports}for(var o="function"==typeof require&&require,f=0;f<t.length;f++)r(t[f]);return r}({1:[function(e,n){n.exports=function(e){return function(n){var i="vertical"!==e;document.addEventListener("keydown",function(e){(34==e.which||32==e.which&&!e.shiftKey||i&&39==e.which||!i&&40==e.which)&&n.next(),(33==e.which||32==e.which&&e.shiftKey||i&&37==e.which||!i&&38==e.which)&&n.prev()})}}},{}]},{},[1])(1)});
\ No newline at end of file
+/*! bespoke-keys v1.1.0 © 2015 Mark Dalgleish, MIT License */
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n;"undefined"!=typeof window?n=window:"undefined"!=typeof global?n=global:"undefined"!=typeof self&&(n=self);var t=n;t=t.bespoke||(t.bespoke={}),t=t.plugins||(t.plugins={}),t.keys=e()}}(function(){return function e(n,t,i){function r(f,u){if(!t[f]){if(!n[f]){var c="function"==typeof require&&require;if(!u&&c)return c(f,!0);if(o)return o(f,!0);throw new Error("Cannot find module '"+f+"'")}var l=t[f]={exports:{}};n[f][0].call(l.exports,function(e){var t=n[f][1][e];return r(t?t:e)},l,l.exports,e,n,t,i)}return t[f].exports}for(var o="function"==typeof require&&require,f=0;f<i.length;f++)r(i[f]);return r}({1:[function(e,n){n.exports=function(e){return function(n){var t={SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40},i="vertical"!==e,r=n.slides.length-1,o=function(e){return!!(e.ctrlKey||e.shiftKey||e.altKey||e.metaKey)},f=function(e){if(e.which===t.SPACE){if(!e.ctrlKey&&!e.altKey&&!e.metaKey)return e.shiftKey?n.prev():n.next()}else e.which===t.PAGE_DOWN||i&&e.which===t.RIGHT||!i&&e.which===t.DOWN?o(e)||n.next():e.which===t.PAGE_UP||i&&e.which===t.LEFT||!i&&e.which===t.UP?o(e)||n.prev():e.which===t.END?n.slide()===r||o(e)||n.slide(r):e.which===t.HOME&&(0===n.slide()||o(e)||n.slide(0))};document.addEventListener("keydown",f,!1)}}},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/lib/bespoke-keys.js b/lib/bespoke-keys.js
index dc4bf4d..8ad6917 100644
--- a/lib/bespoke-keys.js
+++ b/lib/bespoke-keys.js
@@ -1,19 +1,35 @@
 module.exports = function(options) {
   return function(deck) {
-    var isHorizontal = options !== 'vertical';
+    var KEYCODE = { SPACE: 32, PAGE_UP: 33, PAGE_DOWN: 34, END: 35, HOME: 36, LEFT: 37, UP: 38, RIGHT: 39, DOWN: 40 },
+      isHorizontal = options !== 'vertical',
+      indexOfLastSlide = deck.slides.length - 1,
+      isModifierKeyDown = function(e) {
+        return !!(e.ctrlKey || e.shiftKey || e.altKey || e.metaKey);
+      },
+      keydownHandler = function(e) {
+        if (e.which === KEYCODE.SPACE) {
+          if (!e.ctrlKey && !e.altKey && !e.metaKey) {
+            return e.shiftKey ? deck.prev() : deck.next();
+          }
+        }
+        else if (e.which === KEYCODE.PAGE_DOWN ||
+            (isHorizontal && e.which === KEYCODE.RIGHT) ||
+            (!isHorizontal && e.which === KEYCODE.DOWN)) {
+          if (!isModifierKeyDown(e)) { deck.next(); }
+        }
+        else if (e.which === KEYCODE.PAGE_UP ||
+            (isHorizontal && e.which === KEYCODE.LEFT) ||
+            (!isHorizontal && e.which === KEYCODE.UP)) {
+          if (!isModifierKeyDown(e)) { deck.prev(); }
+        }
+        else if (e.which === KEYCODE.END) {
+          if (deck.slide() !== indexOfLastSlide && !isModifierKeyDown(e)) { deck.slide(indexOfLastSlide); }
+        }
+        else if (e.which === KEYCODE.HOME) {
+          if (deck.slide() !== 0 && !isModifierKeyDown(e)) { deck.slide(0); }
+        }
+      };
 
-    document.addEventListener('keydown', function(e) {
-      if (e.which == 34 || // PAGE DOWN
-        (e.which == 32 && !e.shiftKey) || // SPACE WITHOUT SHIFT
-        (isHorizontal && e.which == 39) || // RIGHT
-        (!isHorizontal && e.which == 40) // DOWN
-      ) { deck.next(); }
-
-      if (e.which == 33 || // PAGE UP
-        (e.which == 32 && e.shiftKey) || // SPACE + SHIFT
-        (isHorizontal && e.which == 37) || // LEFT
-        (!isHorizontal && e.which == 38) // UP
-      ) { deck.prev(); }
-    });
+    document.addEventListener('keydown', keydownHandler, false);
   };
 };
diff --git a/package.json b/package.json
index f50128d..25b497b 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
   },
   "devDependencies": {
     "bespoke": "^1.0.0-beta",
+    "bespoke-forms": "^1.0.0",
     "browserify": "^4.1.5",
     "function-bind": "^0.1.0",
     "gulp": "^3.5.1",
diff --git a/test/spec/bespoke-keysSpec.js b/test/spec/bespoke-keysSpec.js
index 0043614..90f3143 100755
--- a/test/spec/bespoke-keysSpec.js
+++ b/test/spec/bespoke-keysSpec.js
@@ -1,24 +1,34 @@
 describe("bespoke-keys", function() {
 
   Function.prototype.bind = Function.prototype.bind || require('function-bind');
-  require('simulant/simulant');
 
-  var bespoke = require('bespoke'),
-    keys = require('../../lib-instrumented/bespoke-keys.js');
+  var simulant = require('simulant'),
+    bespoke = require('bespoke'),
+    keys = require('../../lib-instrumented/bespoke-keys.js'),
+    forms = require('bespoke-forms');
 
   var deck,
-
+    inputBox = null,
     createDeck = function(optionValue) {
       var parent = document.createElement('article');
-      parent.innerHTML = '<section></section><section></section>';
+      for (var i = 0; i < 3; i++) {
+        var slide = document.createElement('section');
+        if (i === 0) {
+          inputBox = document.createElement('input');
+          inputBox.type = 'text';
+          slide.appendChild(inputBox);
+        }
+        parent.appendChild(slide);
+      }
 
       deck = bespoke.from(parent, [
-        keys(optionValue)
+        keys(optionValue),
+        forms(optionValue)
       ]);
     },
 
-    pressKey = function(which, isShift) {
-      simulant.fire(document, 'keydown', { which: which, shiftKey: !!isShift });
+    pressKey = function(which, isShift, element) {
+      simulant.fire((element || document), 'keydown', { which: which, shiftKey: !!isShift });
     };
 
   describe("horizontal deck", function() {
@@ -46,6 +56,16 @@ describe("bespoke-keys", function() {
             expect(deck.slide()).toBe(1);
           });
 
+          it("should not go to the next slide when pressing the right arrow with shift pressed", function() {
+            pressKey(39, true);
+            expect(deck.slide()).toBe(0);
+          });
+
+          it("should not go to the next slide when pressing the space bar in an input field", function() {
+            pressKey(32, false, inputBox);
+            expect(deck.slide()).toBe(0);
+          });
+
         });
 
         describe("previous slide", function() {
@@ -69,6 +89,37 @@ describe("bespoke-keys", function() {
             expect(deck.slide()).toBe(0);
           });
 
+          it("should not go to the previous slide when pressing the left arrow with shift pressed", function() {
+            pressKey(37, true);
+            expect(deck.slide()).toBe(1);
+          });
+
+          it("should not go to the previous slide when pressing the shift and space bar in an input field", function() {
+            pressKey(32, true, inputBox);
+            expect(deck.slide()).toBe(1);
+          });
+
+        });
+
+        describe("last slide", function() {
+          beforeEach(function() {
+            deck.slide(2);
+          });
+
+          it("should go to the first slide when pressing home", function() {
+            pressKey(36);
+            expect(deck.slide()).toBe(0);
+          });
+
+        });
+
+        describe("first slide", function() {
+
+          it("should go to the last slide when pressing end", function() {
+            pressKey(35);
+            expect(deck.slide()).toBe(2);
+          });
+
         });
 
       });