diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5e5f137
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/bower_components/
+/nbproject/
+/node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000..7c49e89
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,45 @@
+module.exports = function(grunt) {
+  require('load-grunt-tasks')(grunt);
+  
+  directoryConfiguration = {
+    target: 'dist'
+  };  
+  
+  grunt.initConfig({
+    dir: directoryConfiguration,
+    pkg: grunt.file.readJSON('package.json'),
+    banner: '/*\n' +
+            ' * Knockout Observable Dictionary\n' +            
+            ' * (c) James Foster\n' +
+            ' * License: MIT (http://www.opensource.org/licenses/mit-license.php)\n' +
+            ' * <%= grunt.template.today("yyyy-mm-dd") %>\n' +
+            ' */',    
+    clean: {
+      dist: '<%= dir.target %>',
+    },
+    concat: {
+      options: {
+        separator: ';'
+      },
+      js: {
+        src: ['<%= pkg.name %>.js'],
+        dest: '<%= dir.target %>/<%= pkg.name %>.js'
+      }
+    },
+    uglify: {
+      dist: {
+        options: {
+          banner: '<%= banner %>',
+          sourceMap: true       
+        },
+        files: {
+          '<%= dir.target %>/<%= pkg.name %>.min.js': ['<%= concat.js.dest %>']
+        }
+      }
+    }    
+  });
+  
+  grunt.registerTask('build', ['clean', 'concat:js']);
+  grunt.registerTask('minify', ['build', 'uglify']);
+  grunt.registerTask('default', ['minify']);
+};
diff --git a/README.md b/README.md
index cd0a718..c44a9e0 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,8 @@ To loop over the items in the dictionary simply data bind to the items property.
 
     <ul data-bind="foreach: person.items">
         <li>
-            <span data-bind="key"></span>
-            <span data-bind="value"></span>
+            <span data-bind="text: key"></span>
+            <span data-bind="text: value"></span>
         </li>
     </ul>
 
diff --git a/bower.json b/bower.json
new file mode 100644
index 0000000..6a11fe7
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,24 @@
+{
+  "name": "knockout-observable-dictionary",
+  "description": "Implementation of an obversable dictionary for Knockout.",
+  "main": "dist/ko.observableDictionary.js",
+  "authors": [
+    {
+      "name": "James Foster",
+      "email": "james.foster@thap.co.uk"
+    }
+  ],
+  "ignore": [
+    "*.html",
+    "bower.json",
+    "Gruntfile.js",
+    "package.json"
+  ],
+  "dependencies": {
+    "knockout": "~3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/jamesfoster/knockout.observableDictionary.git"
+  }
+}
diff --git a/dist/ko.observableDictionary.js b/dist/ko.observableDictionary.js
new file mode 100644
index 0000000..3139d8c
--- /dev/null
+++ b/dist/ko.observableDictionary.js
@@ -0,0 +1,224 @@
+// Knockout Observable Dictionary
+// (c) James Foster
+// License: MIT (http://www.opensource.org/licenses/mit-license.php)
+
+(function () {
+    function DictionaryItem(key, value, dictionary) {
+        var observableKey = new ko.observable(key);
+
+        this.value = new ko.observable(value);
+        this.key = new ko.computed({
+            read: observableKey,
+            write: function (newKey) {
+                var current = observableKey();
+
+                if (current == newKey) return;
+
+                // no two items are allowed to share the same key.
+                dictionary.remove(newKey);
+
+                observableKey(newKey);
+            }
+        });
+    }
+
+    ko.observableDictionary = function (dictionary, keySelector, valueSelector) {
+        var result = {};
+
+        result.items = new ko.observableArray();
+
+        result._wrappers = {};
+        result._keySelector = keySelector || function (value, key) { return key; };
+        result._valueSelector = valueSelector || function (value) { return value; };
+
+        if (typeof keySelector == 'string') result._keySelector = function (value) { return value[keySelector]; };
+        if (typeof valueSelector == 'string') result._valueSelector = function (value) { return value[valueSelector]; };
+
+        ko.utils.extend(result, ko.observableDictionary['fn']);
+
+        result.pushAll(dictionary);
+
+        return result;
+    };
+
+    ko.observableDictionary['fn'] = {
+        remove: function (valueOrPredicate) {
+            var predicate = valueOrPredicate;
+
+            if (valueOrPredicate instanceof DictionaryItem) {
+                predicate = function (item) {
+                    return item.key() === valueOrPredicate.key();
+                };
+            }
+            else if (typeof valueOrPredicate != "function") {
+                predicate = function (item) {
+                    return item.key() === valueOrPredicate;
+                };
+            }
+
+            ko.observableArray['fn'].remove.call(this.items, predicate);
+        },
+
+        push: function (key, value) {
+            var item = null;
+
+            if (key instanceof DictionaryItem) {
+                // handle the case where only a DictionaryItem is passed in
+                item = key;
+                value = key.value();
+                key = key.key();
+            }
+
+            if (value === undefined) {
+                value = this._valueSelector(key);
+                key = this._keySelector(value);
+            }
+            else {
+                value = this._valueSelector(value);
+            }
+
+            var current = this.get(key, false);
+            if (current) {
+                // update existing value
+                current(value);
+                return current;
+            }
+
+            if (!item) {
+                item = new DictionaryItem(key, value, this);
+            }
+
+            ko.observableArray['fn'].push.call(this.items, item);
+
+            return value;
+        },
+
+        pushAll: function (dictionary) {
+            var self = this;
+            var items = self.items();
+
+            if (dictionary instanceof Array) {
+                $.each(dictionary, function (index, item) {
+                    var key = self._keySelector(item, index);
+                    var value = self._valueSelector(item);
+                    items.push(new DictionaryItem(key, value, self));
+                });
+            }
+            else {
+                for (var prop in dictionary) {
+                    if (dictionary.hasOwnProperty(prop)) {
+                        var item = dictionary[prop];
+                        var key = self._keySelector(item, prop);
+                        var value = self._valueSelector(item);
+                        items.push(new DictionaryItem(key, value, self));
+                    }
+                }
+            }
+
+            self.items.valueHasMutated();
+        },
+
+        sort: function (method) {
+            if (method === undefined) {
+                method = function (a, b) {
+                    return defaultComparison(a.key(), b.key());
+                };
+            }
+
+            return ko.observableArray['fn'].sort.call(this.items, method);
+        },
+
+        indexOf: function (key) {
+            if (key instanceof DictionaryItem) {
+                return ko.observableArray['fn'].indexOf.call(this.items, key);
+            }
+
+            var underlyingArray = this.items();
+            for (var index = 0; index < underlyingArray.length; index++) {
+                if (underlyingArray[index].key() == key)
+                    return index;
+            }
+            return -1;
+        },
+
+        get: function (key, wrap) {
+            if (wrap == false)
+                return getValue(key, this.items());
+
+            var wrapper = this._wrappers[key];
+
+            if (wrapper == null) {
+                wrapper = this._wrappers[key] = new ko.computed({
+                    read: function () {
+                        var value = getValue(key, this.items());
+                        return value ? value() : null;
+                    },
+                    write: function (newValue) {
+                        var value = getValue(key, this.items());
+
+                        if (value)
+                            value(newValue);
+                        else
+                            this.push(key, newValue);
+                    }
+                }, this);
+            }
+
+            return wrapper;
+        },
+
+        set: function (key, value) {
+            return this.push(key, value);
+        },
+
+        keys: function () {
+            return ko.utils.arrayMap(this.items(), function (item) { return item.key(); });
+        },
+
+        values: function () {
+            return ko.utils.arrayMap(this.items(), function (item) { return item.value(); });
+        },
+        
+        removeAll: function () {
+            this.items.removeAll();
+        },
+
+        toJSON: function () {
+            var result = {};
+            var items = ko.utils.unwrapObservable(this.items);
+
+            ko.utils.arrayForEach(items, function (item) {
+                var key = ko.utils.unwrapObservable(item.key);
+                var value = ko.utils.unwrapObservable(item.value);
+
+                result[key] = value;
+            });
+
+            return result;
+        }
+    };
+
+    function getValue(key, items) {
+        var found = ko.utils.arrayFirst(items, function (item) {
+            return item.key() == key;
+        });
+        return found ? found.value : null;
+    }
+})();
+
+
+// Utility methods
+// ---------------------------------------------
+function isNumeric(n) {
+    return !isNaN(parseFloat(n)) && isFinite(n);
+}
+
+function defaultComparison(a, b) {
+    if (isNumeric(a) && isNumeric(b)) return a - b;
+
+    a = a.toString();
+    b = b.toString();
+
+    return a == b ? 0 : (a < b ? -1 : 1);
+}
+// ---------------------------------------------
diff --git a/dist/ko.observableDictionary.min.js b/dist/ko.observableDictionary.min.js
new file mode 100644
index 0000000..2ab92fa
--- /dev/null
+++ b/dist/ko.observableDictionary.min.js
@@ -0,0 +1,8 @@
+/*
+ * Knockout Observable Dictionary
+ * (c) James Foster
+ * License: MIT (http://www.opensource.org/licenses/mit-license.php)
+ * 2014-06-20
+ */
+function isNumeric(a){return!isNaN(parseFloat(a))&&isFinite(a)}function defaultComparison(a,b){return isNumeric(a)&&isNumeric(b)?a-b:(a=a.toString(),b=b.toString(),a==b?0:b>a?-1:1)}!function(){function a(a,b,c){var d=new ko.observable(a);this.value=new ko.observable(b),this.key=new ko.computed({read:d,write:function(a){var b=d();b!=a&&(c.remove(a),d(a))}})}function b(a,b){var c=ko.utils.arrayFirst(b,function(b){return b.key()==a});return c?c.value:null}ko.observableDictionary=function(a,b,c){var d={};return d.items=new ko.observableArray,d._wrappers={},d._keySelector=b||function(a,b){return b},d._valueSelector=c||function(a){return a},"string"==typeof b&&(d._keySelector=function(a){return a[b]}),"string"==typeof c&&(d._valueSelector=function(a){return a[c]}),ko.utils.extend(d,ko.observableDictionary.fn),d.pushAll(a),d},ko.observableDictionary.fn={remove:function(b){var c=b;b instanceof a?c=function(a){return a.key()===b.key()}:"function"!=typeof b&&(c=function(a){return a.key()===b}),ko.observableArray.fn.remove.call(this.items,c)},push:function(b,c){var d=null;b instanceof a&&(d=b,c=b.value(),b=b.key()),void 0===c?(c=this._valueSelector(b),b=this._keySelector(c)):c=this._valueSelector(c);var e=this.get(b,!1);return e?(e(c),e):(d||(d=new a(b,c,this)),ko.observableArray.fn.push.call(this.items,d),c)},pushAll:function(b){var c=this,d=c.items();if(b instanceof Array)$.each(b,function(b,e){var f=c._keySelector(e,b),g=c._valueSelector(e);d.push(new a(f,g,c))});else for(var e in b)if(b.hasOwnProperty(e)){var f=b[e],g=c._keySelector(f,e),h=c._valueSelector(f);d.push(new a(g,h,c))}c.items.valueHasMutated()},sort:function(a){return void 0===a&&(a=function(a,b){return defaultComparison(a.key(),b.key())}),ko.observableArray.fn.sort.call(this.items,a)},indexOf:function(b){if(b instanceof a)return ko.observableArray.fn.indexOf.call(this.items,b);for(var c=this.items(),d=0;d<c.length;d++)if(c[d].key()==b)return d;return-1},get:function(a,c){if(0==c)return b(a,this.items());var d=this._wrappers[a];return null==d&&(d=this._wrappers[a]=new ko.computed({read:function(){var c=b(a,this.items());return c?c():null},write:function(c){var d=b(a,this.items());d?d(c):this.push(a,c)}},this)),d},set:function(a,b){return this.push(a,b)},keys:function(){return ko.utils.arrayMap(this.items(),function(a){return a.key()})},values:function(){return ko.utils.arrayMap(this.items(),function(a){return a.value()})},removeAll:function(){this.items.removeAll()},toJSON:function(){var a={},b=ko.utils.unwrapObservable(this.items);return ko.utils.arrayForEach(b,function(b){var c=ko.utils.unwrapObservable(b.key),d=ko.utils.unwrapObservable(b.value);a[c]=d}),a}}}();
+//# sourceMappingURL=ko.observableDictionary.min.js.map
\ No newline at end of file
diff --git a/dist/ko.observableDictionary.min.js.map b/dist/ko.observableDictionary.min.js.map
new file mode 100644
index 0000000..8c47710
--- /dev/null
+++ b/dist/ko.observableDictionary.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"ko.observableDictionary.min.js","sources":["ko.observableDictionary.js"],"names":["isNumeric","n","isNaN","parseFloat","isFinite","defaultComparison","a","b","toString","DictionaryItem","key","value","dictionary","observableKey","ko","observable","this","computed","read","write","newKey","current","remove","getValue","items","found","utils","arrayFirst","item","observableDictionary","keySelector","valueSelector","result","observableArray","_wrappers","_keySelector","_valueSelector","extend","pushAll","valueOrPredicate","predicate","call","push","undefined","get","self","Array","$","each","index","prop","hasOwnProperty","valueHasMutated","sort","method","indexOf","underlyingArray","length","wrap","wrapper","newValue","set","keys","arrayMap","values","removeAll","toJSON","unwrapObservable","arrayForEach"],"mappings":"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"}
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..1df89dd
--- /dev/null
+++ b/index.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>TODO supply a title</title>
+    <meta charset="UTF-8" />
+    <script src="bower_components/knockout/dist/knockout.js"></script>
+    <script src="ko.observableDictionary.js"></script>
+  </head>
+  <body>
+    <div id="view">
+      <ul data-bind="foreach: person.items">
+        <li>
+          <span data-bind="text: 'Key: '+key()+' Value: '+value()"></span>
+        </li>
+      </ul>
+    </div>
+    <script>
+      console.group('Testing: ko.observableDictionary.js');
+
+      var logValue = function(key) {
+        console.group(key);
+        console.log('Key: ' + key);
+        console.log('Type: ' + typeof viewModel.person.get(key)());
+        console.log('Value: ' + viewModel.person.get(key)());
+        console.groupEnd();
+      };
+
+      var dictionary = {
+        name: 'Joe Bloggs',
+        height: 180,
+        'hair colour': 'brown'
+      };
+
+      var viewModel = {
+        person: new ko.observableDictionary(dictionary)
+      };
+
+      ko.applyBindings(viewModel, document.getElementById('view'));
+      
+      logValue('name');
+      logValue('height');
+      logValue('hair colour');
+
+      console.groupEnd();
+    </script>
+  </body>
+</html>
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..13a329a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "knockout-observable-dictionary",
+  "devDependencies": {
+    "grunt": "~0",
+    "grunt-contrib-clean": "~0",
+    "grunt-contrib-concat": "~0",
+    "grunt-contrib-less": "~0",
+    "grunt-contrib-uglify": "*",
+    "load-grunt-tasks": "*"
+  }
+}