diff --git a/apps/kbmulti/ChangeLog b/apps/kbmulti/ChangeLog
new file mode 100644
index 000000000..04b2430bb
--- /dev/null
+++ b/apps/kbmulti/ChangeLog
@@ -0,0 +1 @@
+0.01: New keyboard
diff --git a/apps/kbmulti/README.md b/apps/kbmulti/README.md
new file mode 100644
index 000000000..d40b2dd07
--- /dev/null
+++ b/apps/kbmulti/README.md
@@ -0,0 +1,16 @@
+# Multitap Keyboard
+
+A library that provides the ability to input text in a style familiar to anyone who had a mobile phone before they went all touchscreen.
+
+Swipe right for Space, left for Backspace, and up/down for Caps lock. Tap the '?' button in the app if you need a reminder!
+
+At time of writing, only the [Noteify app](http://microco.sm/out/Ffe9i) uses a keyboard.
+
+Uses the multitap keypad logic originally from here: http://www.espruino.com/Morse+Code+Texting
+
+![](screenshot_1.png)
+![](screenshot_2.png)
+
+Written by: [Sir Indy](https://github.com/sir-indy) and [Thyttan](https://github.com/thyttan)
+
+For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/)
\ No newline at end of file
diff --git a/apps/kbmulti/app.png b/apps/kbmulti/app.png
new file mode 100644
index 000000000..5607a0553
Binary files /dev/null and b/apps/kbmulti/app.png differ
diff --git a/apps/kbmulti/lib.js b/apps/kbmulti/lib.js
new file mode 100644
index 000000000..79c2d861a
--- /dev/null
+++ b/apps/kbmulti/lib.js
@@ -0,0 +1,145 @@
+//Multitap logic originally from here: http://www.espruino.com/Morse+Code+Texting
+
+exports.input = function(options) {
+  options = options||{};
+  var text = options.text;
+  if ("string"!=typeof text) text="";
+
+  var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {};
+  if (settings.firstLaunch===undefined) { settings.firstLaunch = true; }
+  if (settings.charTimeout===undefined) { settings.charTimeout = 500; }
+
+  var fontSize = "6x15";
+  var Layout = require("Layout");
+  var letters = {
+    "1":".,!?1","2":"ABC2","3":"DEF3",
+    "4":"GHI4","5":"JKL5","6":"MNO6",
+    "7":"PQRS7","8":"TUV80","9":"WXYZ9",
+  };
+  var helpMessage = 'swipe:\nRight: Space\nLeft:Backspace\nUp/Down: Caps lock\n';
+
+  var charTimeout; // timeout after a key is pressed
+  var charCurrent; // current character (index in letters)
+  var charIndex; // index in letters[charCurrent]
+  var caps = true;
+  var layout;
+
+  function displayText() {
+    layout.clear(layout.text);
+    layout.text.label = text.slice(-12);
+    layout.render(layout.text);
+  }
+
+  function backspace() {
+    // remove the timeout if we had one
+    if (charTimeout!==undefined) {
+      clearTimeout(charTimeout);
+      charTimeout = undefined;
+    }
+    text = text.slice(0, -1);
+    newCharacter();
+  }
+
+  function setCaps() {
+    caps = !caps;
+    for (var key in letters) {
+      layout[key].label = caps ? letters[key].toUpperCase() : letters[key].toLowerCase();
+    }
+    layout.render();
+  }
+
+  function newCharacter(ch) {
+    displayText();
+    charCurrent = ch;
+    charIndex = 0;
+  }
+
+  function onKeyPad(key) {
+    // remove the timeout if we had one
+    if (charTimeout!==undefined) {
+      clearTimeout(charTimeout);
+      charTimeout = undefined;
+    }
+    // work out which char was pressed
+    if (key==charCurrent) {
+      charIndex = (charIndex+1) % letters[charCurrent].length;
+      text = text.slice(0, -1);
+    } else {
+      newCharacter(key);
+    }
+    var newLetter = letters[charCurrent][charIndex];
+    text += (caps ? newLetter.toUpperCase() : newLetter.toLowerCase());
+    displayText();
+    // set a timeout
+    charTimeout = setTimeout(function() {
+      charTimeout = undefined;
+      newCharacter();
+    }, settings.charTimeout);
+  }
+
+  function onSwipe(dirLeftRight, dirUpDown) {
+    if (dirUpDown) {
+      setCaps();
+    } else if (dirLeftRight == 1) {
+      text += ' ';
+      newCharacter();
+    } else if (dirLeftRight == -1) {
+      backspace();
+    }
+  }
+
+  function onHelp(resolve,reject) {
+    Bangle.removeListener("swipe", onSwipe);
+    E.showPrompt(
+      helpMessage, {title: "Help", buttons : {"Ok":true}}
+    ).then(function(v) {
+      Bangle.on('swipe', onSwipe);
+      generateLayout(resolve,reject);
+      layout.render();
+    });
+  }
+
+  function generateLayout(resolve,reject) {
+    layout = new Layout( {
+    type:"v", c: [
+      {type:"h", c: [
+        {type:"txt", font:"12x20", label:text.slice(-12), id:"text", fillx:1},
+        {type:"btn", font:'6x8', label:'?', cb: l=>onHelp(resolve,reject), filly:1 },
+      ]},
+      {type:"h", c: [
+        {type:"btn", font:fontSize, label:letters[1], cb: l=>onKeyPad(1), id:'1', fillx:1, filly:1 },
+        {type:"btn", font:fontSize, label:letters[2], cb: l=>onKeyPad(2), id:'2', fillx:1, filly:1 },
+        {type:"btn", font:fontSize, label:letters[3], cb: l=>onKeyPad(3), id:'3', fillx:1, filly:1 },
+      ]},
+      {type:"h", filly:1, c: [
+        {type:"btn", font:fontSize, label:letters[4], cb: l=>onKeyPad(4), id:'4', fillx:1, filly:1 },
+        {type:"btn", font:fontSize, label:letters[5], cb: l=>onKeyPad(5), id:'5', fillx:1, filly:1 },
+        {type:"btn", font:fontSize, label:letters[6], cb: l=>onKeyPad(6), id:'6', fillx:1, filly:1 },
+      ]},
+      {type:"h", filly:1, c: [
+        {type:"btn", font:fontSize, label:letters[7], cb: l=>onKeyPad(7), id:'7', fillx:1, filly:1 },
+        {type:"btn", font:fontSize, label:letters[8], cb: l=>onKeyPad(8), id:'8', fillx:1, filly:1 },
+        {type:"btn", font:fontSize, label:letters[9], cb: l=>onKeyPad(9), id:'9', fillx:1, filly:1 },
+      ]},
+    ]
+    },{back: ()=>{
+      Bangle.setUI();
+      Bangle.removeListener("swipe", onSwipe);
+      g.clearRect(Bangle.appRect);
+      resolve(text);
+    }});
+  }
+
+  return new Promise((resolve,reject) => {
+    g.clearRect(Bangle.appRect);
+    if (settings.firstLaunch) { 
+      onHelp(resolve,reject); 
+      settings.firstLaunch = false;
+      require('Storage').writeJSON("kbmulti.settings.json", settings);
+    } else {
+      generateLayout(resolve,reject);
+      Bangle.on('swipe', onSwipe);
+      layout.render();
+    }
+  });
+};
diff --git a/apps/kbmulti/metadata.json b/apps/kbmulti/metadata.json
new file mode 100644
index 000000000..6c813e321
--- /dev/null
+++ b/apps/kbmulti/metadata.json
@@ -0,0 +1,18 @@
+{ "id": "kbmulti",
+  "name": "Multitap keyboard",
+  "version":"0.01",
+  "description": "A library for text input via multitap/T9 style keypad",
+  "icon": "app.png",
+  "type":"textinput",
+  "tags": "keyboard",
+  "supports" : ["BANGLEJS2"],
+  "screenshots": [{"url":"screenshot_1.png"},{"url":"screenshot_2.png"}],
+  "readme": "README.md",
+  "storage": [
+    {"name":"textinput","url":"lib.js"},
+    {"name":"kbmulti.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name":"kbmulti.settings.json"}
+  ]
+}
diff --git a/apps/kbmulti/screenshot_1.png b/apps/kbmulti/screenshot_1.png
new file mode 100644
index 000000000..37e6e5da2
Binary files /dev/null and b/apps/kbmulti/screenshot_1.png differ
diff --git a/apps/kbmulti/screenshot_2.png b/apps/kbmulti/screenshot_2.png
new file mode 100644
index 000000000..d150d13bf
Binary files /dev/null and b/apps/kbmulti/screenshot_2.png differ
diff --git a/apps/kbmulti/settings.js b/apps/kbmulti/settings.js
new file mode 100644
index 000000000..d3148eca7
--- /dev/null
+++ b/apps/kbmulti/settings.js
@@ -0,0 +1,31 @@
+(function(back) {
+    function settings() {
+      var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {};
+      if (settings.firstLaunch===undefined) { settings.firstLaunch = true; }
+      if (settings.charTimeout===undefined) { settings.charTimeout = 500; }
+      return settings;
+    }
+      
+    function updateSetting(setting, value) {
+      var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {};
+      settings[setting] = value;
+      require('Storage').writeJSON("kbmulti.settings.json", settings);
+    }
+    
+    var mainmenu = {
+      "" : { "title" : /*LANG*/"Multitap keyboard" },
+      "< Back" : back,
+      /*LANG*/'Character selection timeout [ms]': {
+        value: settings().charTimeout,
+        min: 200, max: 1500, step : 50,
+        format: v => v,
+        onchange: v => updateSetting("charTimeout", v),
+      },
+      /*LANG*/'Show help on first launch': {
+        value: !!settings().firstLaunch,
+        format: v => v?"Yes":"No",
+        onchange: v =>  updateSetting("firstLaunch", v)
+      }
+    };
+    E.showMenu(mainmenu);
+  })
\ No newline at end of file