diff --git a/App.js b/App.js
index 5c5353f..2b7721e 100644
--- a/App.js
+++ b/App.js
@@ -1,10 +1,10 @@
 import Note from './Note.js';
-import {new_note_handler, search_term_change_handler, sorting_change_handler, load_notes} from './handlers/App.js';
+import {new_note_handler, search_term_change_handler, sorting_change_handler, load_notes, new_bin_handler} from './handlers/App.js';
 
 
 function App(vnode_init){
   const {state, dispatch} = vnode_init.attrs;
-  load_notes(state, dispatch);
+  //load_notes(state, dispatch);
   return {
     view: function(vnode){
       const s = vnode.attrs.state;
@@ -20,12 +20,12 @@ function App(vnode_init){
             ]),
           m('.top-right', {key: 'top-right'}, [
             m('.bin-id', {key: 'bin-id'}, s.bin.id),
-            m('button', {key: 'new-bin-button'}, 'New Bin...')
+            m('button', {key: 'new-bin-button', onclick: new_bin_handler.bind(null, s, dispatch)}, 'New Bin...')
             ])
           ]),
         m('.main', {key: 'main'}, [
           m('.notes', s.notes.map(note_state =>
-            m(Note, {note_state, dispatch, key: note_state.note.id})
+            m(Note, {state, note_state, dispatch, key: note_state.note.id})
             ))
           ])
         ]);
diff --git a/Note.js b/Note.js
index 6b8323e..a887b7b 100644
--- a/Note.js
+++ b/Note.js
@@ -8,7 +8,7 @@ function Note(vnode_init){
       const {is_editing, note} = note_state;
       if(is_editing){
         return m('.note', [
-          m('textarea', {key: 'textarea', onchange: text_change_handler.bind(null, note_state, dispatch) }, note.text),
+          m('textarea', {key: 'textarea', onchange: text_change_handler.bind(null, note_state, dispatch) }, note_state.temp_text),
           m('.buttons', {key: 'editing-buttons'}, [
             m('button', {key: 'cancel-button', onclick: cancel_handler.bind(null, note_state, dispatch) }, 'Cancel'),
             m('button', {key: 'save-button', onclick: save_handler.bind(null, note_state, dispatch) }, 'Save')
diff --git a/api-stub.js b/api-stub.js
index b704c18..334bf83 100644
--- a/api-stub.js
+++ b/api-stub.js
@@ -4,10 +4,15 @@ const api_stub = {};
 
 // for mocking persistent state, for use by the fake endpoints, just as a real server endpoint would have DB access for state:
 const state = {
-  notes: [
-    {id: nanoid(), text: 'Note one', modified: Date.now()},
-    {id: nanoid(), text: 'Note two', modified: Date.now()},
-    {id: nanoid(), text: 'Note three', modified: Date.now()}
+  bins: [
+    {
+      id: nanoid(),
+      notes: [
+        {id: nanoid(), text: 'Note one', modified: Date.now()},
+        {id: nanoid(), text: 'Note two', modified: Date.now()},
+        {id: nanoid(), text: 'Note three', modified: Date.now()}
+        ]
+      }
     ]
   };
 
@@ -16,11 +21,15 @@ const endpoints = {
   };
 
 endpoints.post['/load-notes'] = function(resolve, reject, body){
-  resolve( {status: 'ok', notes: state.notes} );
+  let i = 0;
+  if(body.bin_id){
+    i = state.bins.findIndex(b=>b.id===body.bin_id);
+    }
+  resolve( {status: 'ok', notes: state.bins[i].notes} );
   };
 
 endpoints.post['/search'] = function(resolve, reject, body){
-  const notes = state.notes.filter(n => n.text.indexOf(body.search_term) !== -1 )
+  const notes = state.bins.find(b=>b.id===body.bin_id).notes.filter(n => n.text.indexOf(body.search_term) !== -1 )
   if(body.sorting==='new->old'){
     notes.sort((a,b) => a.modified-b.modified);
     }
@@ -32,12 +41,18 @@ endpoints.post['/search'] = function(resolve, reject, body){
 
 endpoints.post['/save'] = function(resolve, reject, body){
   const {note_id, text} = body;
-  const note = state.notes.find( n => n.id===note_id );
+  let bin = state.bins.find(b=>b.id===body.bin_id);
+  if(!bin){
+    bin = {id: body.bin_id, notes: []};
+    state.bins.push(bin);
+    }
+  const note = bin.notes.find( n => n.id===note_id );
   if(note){
     note.text = text;
+    note.modified = Date.now();
     }
   else{
-    state.notes.push({id: note_id, text, modified: Date.now()});
+    bin.notes.push({id: note_id, text, modified: Date.now()});
     }
   resolve( {status: 'ok'} );
   };
diff --git a/handlers/App.js b/handlers/App.js
index 6633404..22d8b66 100644
--- a/handlers/App.js
+++ b/handlers/App.js
@@ -1,33 +1,39 @@
 import nanoid from '../nanoid.min.js';
-import api from '../api.js';
-//import api from '../api-stub.js';
+//import api from '../api.js';
+import api from '../api-stub.js';
 
 const load_notes = function(state, dispatch){
   api.post('/load-notes', {bin_id: state.bin.id})
     .then(res=>{
-      dispatch({type: 'notes-loaded', notes: res.notes});
+      dispatch('notes-loaded', res.notes);
       });
   };
 const runSearch = function(state, dispatch){
-  api.post('/search', {search_term: state.search_term, sorting: state.sorting})
+  api.post('/search', {search_term: state.search_term, sorting: state.sorting, bin_id: state.bin.id})
   .then(res=>{
-    dispatch({type:'update-search-results', notes: res.notes});
+    dispatch('update-search-results', res.notes);
     });
   };
 const new_note_handler = function(state, dispatch){
-  dispatch({type:'add-note', id: nanoid()});
+  dispatch('add-note', {id: nanoid(), date: Date.now()});
   };
 const search_term_change_handler = function(state, dispatch, e){
   if(e.code === 'Enter'){
     runSearch(state, dispatch);
     }
   else{
-    dispatch({type:'update-search-term', search_term: e.target.value});
+    dispatch('update-search-term', e.target.value);
     }
   };
 const sorting_change_handler = function(state, dispatch, e){
   runSearch(state, dispatch);
-  dispatch({type:'update-sorting', sorting: e.target.value});
+  dispatch('update-sorting', e.target.value);
+  };
+const new_bin_handler = function(state, dispatch){
+  const id = nanoid();
+  // TODO: consolidate: this will cause two redraws:
+  dispatch('new-bin', {id});
+  dispatch('notes-loaded', []);
   };
 
-export {new_note_handler, search_term_change_handler, sorting_change_handler, load_notes};
\ No newline at end of file
+export {new_note_handler, search_term_change_handler, sorting_change_handler, load_notes, new_bin_handler};
\ No newline at end of file
diff --git a/handlers/Note.js b/handlers/Note.js
index a48f899..e69de5d 100644
--- a/handlers/Note.js
+++ b/handlers/Note.js
@@ -1,21 +1,18 @@
-import api from '../api.js';
-//import api from '../api-stub.js';
+//import api from '../api.js';
+import api from '../api-stub.js';
 
 const edit_handler = function(note_state, dispatch){
-  dispatch({type: 'update-note-editing', note_id: note_state.note.id, is_editing: true});
+  dispatch('update-note-editing', {id: note_state.note.id, is_editing: true});
   };
 const cancel_handler = function(note_state, dispatch){
-  dispatch({type: 'update-note-editing', note_id: note_state.note.id, is_editing: false});
+  dispatch('update-note-editing', {id: note_state.note.id, is_editing: false});
   };
 const text_change_handler = function(note_state, dispatch, e){
   note_state.temp_text = e.target.value;
   };
 const save_handler = function(note_state, dispatch){
-  // TODO: consolidate: this will cause two redraws:
-  dispatch({type: 'update-note-text', note_id: note_state.note.id, text: note_state.temp_text});
-  //note.text = temp_text;
-  dispatch({type: 'update-note-editing', note_id: note_state.note.id, is_editing: false});
-  api.post('/save', {note_id: note_state.note.id, text: note_state.temp_text})
+  dispatch('save-note-edit', {id: note_state.note.id, text: note_state.temp_text});
+  api.post('/save', {bin_id: note_state.bin_id, note_id: note_state.note.id, text: note_state.temp_text})
   };
 
 export { edit_handler, cancel_handler, text_change_handler, save_handler };
\ No newline at end of file
diff --git a/immer.min.js b/immer.min.js
new file mode 100644
index 0000000..b2fe444
--- /dev/null
+++ b/immer.min.js
@@ -0,0 +1,2 @@
+!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((n=n||self).immer={})}(this,(function(n){function t(n){for(var t=arguments.length,r=Array(t>1?t-1:0),e=1;e<t;e++)r[e-1]=arguments[e];throw Error("[Immer] minified error nr: "+n+(r.length?" "+r.map((function(n){return"'"+n+"'"})).join(","):"")+". Find the full error at: https://bit.ly/3cXEKWf")}function r(n){return!!n&&!!n[L]}function e(n){return!!n&&(function(n){if(!n||"object"!=typeof n)return!1;var t=Object.getPrototypeOf(n);return!t||t===Object.prototype}(n)||Array.isArray(n)||!!n[H]||!!n.constructor[H]||v(n)||s(n))}function i(n,t,r){void 0===r&&(r=!1),0===u(n)?(r?Object.keys:T)(n).forEach((function(e){r&&"symbol"==typeof e||t(e,n[e],n)})):n.forEach((function(r,e){return t(e,r,n)}))}function u(n){var t=n[L];return t?t.t>3?t.t-4:t.t:Array.isArray(n)?1:v(n)?2:s(n)?3:0}function o(n,t){return 2===u(n)?n.has(t):Object.prototype.hasOwnProperty.call(n,t)}function f(n,t){return 2===u(n)?n.get(t):n[t]}function a(n,t,r){var e=u(n);2===e?n.set(t,r):3===e?(n.delete(t),n.add(r)):n[t]=r}function c(n,t){return n===t?0!==n||1/n==1/t:n!=n&&t!=t}function v(n){return X&&n instanceof Map}function s(n){return q&&n instanceof Set}function l(n){return n.i||n.u}function p(n){if(Array.isArray(n))return Array.prototype.slice.call(n);var t=U(n);delete t[L];for(var r=T(t),e=0;e<r.length;e++){var i=r[e],u=t[i];!1===u.writable&&(u.writable=!0,u.configurable=!0),(u.get||u.set)&&(t[i]={configurable:!0,writable:!0,enumerable:u.enumerable,value:n[i]})}return Object.create(Object.getPrototypeOf(n),t)}function h(n,t){return void 0===t&&(t=!1),y(n)||r(n)||!e(n)?n:(u(n)>1&&(n.set=n.add=n.clear=n.delete=d),Object.freeze(n),t&&i(n,(function(n,t){return h(t,!0)}),!0),n)}function d(){t(2)}function y(n){return null==n||"object"!=typeof n||Object.isFrozen(n)}function _(n){var r=V[n];return r||t(18,n),r}function b(n,t){V[n]||(V[n]=t)}function m(){return N}function j(n,t){t&&(_("Patches"),n.o=[],n.v=[],n.s=t)}function O(n){w(n),n.l.forEach(M),n.l=null}function w(n){n===N&&(N=n.p)}function S(n){return N={l:[],p:N,h:n,_:!0,m:0}}function M(n){var t=n[L];0===t.t||1===t.t?t.j():t.O=!0}function P(n,r){r.m=r.l.length;var i=r.l[0],u=void 0!==n&&n!==i;return r.h.S||_("ES5").M(r,n,u),u?(i[L].P&&(O(r),t(4)),e(n)&&(n=g(r,n),r.p||x(r,n)),r.o&&_("Patches").g(i[L],n,r.o,r.v)):n=g(r,i,[]),O(r),r.o&&r.s(r.o,r.v),n!==G?n:void 0}function g(n,t,r){if(y(t))return t;var e=t[L];if(!e)return i(t,(function(i,u){return A(n,e,t,i,u,r)}),!0),t;if(e.A!==n)return t;if(!e.P)return x(n,e.u,!0),e.u;if(!e.R){e.R=!0,e.A.m--;var u=4===e.t||5===e.t?e.i=p(e.k):e.i;i(3===e.t?new Set(u):u,(function(t,i){return A(n,e,u,t,i,r)})),x(n,u,!1),r&&n.o&&_("Patches").F(e,r,n.o,n.v)}return e.i}function A(n,t,i,u,f,c){if(r(f)){var v=g(n,f,c&&t&&3!==t.t&&!o(t.D,u)?c.concat(u):void 0);if(a(i,u,v),!r(v))return;n._=!1}if(e(f)&&!y(f)){if(!n.h.K&&n.m<1)return;g(n,f),t&&t.A.p||x(n,f)}}function x(n,t,r){void 0===r&&(r=!1),n.h.K&&n._&&h(t,r)}function z(n,t){var r=n[L];return(r?l(r):n)[t]}function E(n,t){if(t in n)for(var r=Object.getPrototypeOf(n);r;){var e=Object.getOwnPropertyDescriptor(r,t);if(e)return e;r=Object.getPrototypeOf(r)}}function R(n){n.P||(n.P=!0,n.p&&R(n.p))}function k(n){n.i||(n.i=p(n.u))}function F(n,t,r){var e=v(t)?_("MapSet").$(t,r):s(t)?_("MapSet").C(t,r):n.S?function(n,t){var r=Array.isArray(n),e={t:r?1:0,A:t?t.A:m(),P:!1,R:!1,D:{},p:t,u:n,k:null,i:null,j:null,I:!1},i=e,u=Y;r&&(i=[e],u=Z);var o=Proxy.revocable(i,u),f=o.revoke,a=o.proxy;return e.k=a,e.j=f,a}(t,r):_("ES5").J(t,r);return(r?r.A:m()).l.push(e),e}function D(n){return r(n)||t(22,n),function n(t){if(!e(t))return t;var r,o=t[L],c=u(t);if(o){if(!o.P&&(o.t<4||!_("ES5").N(o)))return o.u;o.R=!0,r=K(t,c),o.R=!1}else r=K(t,c);return i(r,(function(t,e){o&&f(o.u,t)===e||a(r,t,n(e))})),3===c?new Set(r):r}(n)}function K(n,t){switch(t){case 2:return new Map(n);case 3:return Array.from(n)}return p(n)}function $(){function n(n,t){var r=f[n];return r?r.enumerable=t:f[n]=r={configurable:!0,enumerable:t,get:function(){return Y.get(this[L],n)},set:function(t){Y.set(this[L],n,t)}},r}function t(n){for(var t=n.length-1;t>=0;t--){var r=n[t][L];if(!r.P)switch(r.t){case 5:u(r)&&R(r);break;case 4:e(r)&&R(r)}}}function e(n){for(var t=n.u,r=n.k,e=T(r),i=e.length-1;i>=0;i--){var u=e[i];if(u!==L){var f=t[u];if(void 0===f&&!o(t,u))return!0;var a=r[u],v=a&&a[L];if(v?v.u!==f:!c(a,f))return!0}}var s=!!t[L];return e.length!==T(t).length+(s?0:1)}function u(n){var t=n.k;if(t.length!==n.u.length)return!0;var r=Object.getOwnPropertyDescriptor(t,t.length-1);return!(!r||r.get)}var f={};b("ES5",{J:function(t,r){var e=Array.isArray(t),i=function(t,r){if(t){for(var e=Array(r.length),i=0;i<r.length;i++)Object.defineProperty(e,""+i,n(i,!0));return e}var u=U(r);delete u[L];for(var o=T(u),f=0;f<o.length;f++){var a=o[f];u[a]=n(a,t||!!u[a].enumerable)}return Object.create(Object.getPrototypeOf(r),u)}(e,t),u={t:e?5:4,A:r?r.A:m(),P:!1,R:!1,D:{},p:r,u:t,k:i,i:null,O:!1,I:!1};return Object.defineProperty(i,L,{value:u,writable:!0}),i},M:function(n,e,f){f?r(e)&&e[L].A===n&&t(n.l):(n.o&&function n(t){if(t&&"object"==typeof t){var r=t[L];if(r){var e=r.u,f=r.k,a=r.D,c=r.t;if(4===c)i(f,(function(t){t!==L&&(void 0!==e[t]||o(e,t)?a[t]||n(f[t]):(a[t]=!0,R(r)))})),i(e,(function(n){void 0!==f[n]||o(f,n)||(a[n]=!1,R(r))}));else if(5===c){if(u(r)&&(R(r),a.length=!0),f.length<e.length)for(var v=f.length;v<e.length;v++)a[v]=!1;else for(var s=e.length;s<f.length;s++)a[s]=!0;for(var l=Math.min(f.length,e.length),p=0;p<l;p++)void 0===a[p]&&n(f[p])}}}}(n.l[0]),t(n.l))},N:function(n){return 4===n.t?e(n):u(n)}})}function C(){function n(t){if(!e(t))return t;if(Array.isArray(t))return t.map(n);if(v(t))return new Map(Array.from(t.entries()).map((function(t){return[t[0],n(t[1])]})));if(s(t))return new Set(Array.from(t).map(n));var r=Object.create(Object.getPrototypeOf(t));for(var i in t)r[i]=n(t[i]);return r}function a(t){return r(t)?n(t):t}var c="add";b("Patches",{W:function(r,e){return e.forEach((function(e){for(var i=e.path,o=e.op,a=r,v=0;v<i.length-1;v++){var s=u(a),l=i[v];0!==s&&1!==s||"__proto__"!==l&&"constructor"!==l||t(24),"function"==typeof a&&"prototype"===l&&t(24),"object"!=typeof(a=f(a,l))&&t(15,i.join("/"))}var p=u(a),h=n(e.value),d=i[i.length-1];switch(o){case"replace":switch(p){case 2:return a.set(d,h);case 3:t(16);default:return a[d]=h}case c:switch(p){case 1:return a.splice(d,0,h);case 2:return a.set(d,h);case 3:return a.add(h);default:return a[d]=h}case"remove":switch(p){case 1:return a.splice(d,1);case 2:return a.delete(d);case 3:return a.delete(e.value);default:return delete a[d]}default:t(17,o)}})),r},F:function(n,t,r,e){switch(n.t){case 0:case 4:case 2:return function(n,t,r,e){var u=n.u,v=n.i;i(n.D,(function(n,i){var s=f(u,n),l=f(v,n),p=i?o(u,n)?"replace":c:"remove";if(s!==l||"replace"!==p){var h=t.concat(n);r.push("remove"===p?{op:p,path:h}:{op:p,path:h,value:l}),e.push(p===c?{op:"remove",path:h}:"remove"===p?{op:c,path:h,value:a(s)}:{op:"replace",path:h,value:a(s)})}}))}(n,t,r,e);case 5:case 1:return function(n,t,r,e){var i=n.u,u=n.D,o=n.i;if(o.length<i.length){var f=[o,i];i=f[0],o=f[1];var v=[e,r];r=v[0],e=v[1]}for(var s=0;s<i.length;s++)if(u[s]&&o[s]!==i[s]){var l=t.concat([s]);r.push({op:"replace",path:l,value:a(o[s])}),e.push({op:"replace",path:l,value:a(i[s])})}for(var p=i.length;p<o.length;p++){var h=t.concat([p]);r.push({op:c,path:h,value:a(o[p])})}i.length<o.length&&e.push({op:"replace",path:t.concat(["length"]),value:i.length})}(n,t,r,e);case 3:return function(n,t,r,e){var i=n.u,u=n.i,o=0;i.forEach((function(n){if(!u.has(n)){var i=t.concat([o]);r.push({op:"remove",path:i,value:n}),e.unshift({op:c,path:i,value:n})}o++})),o=0,u.forEach((function(n){if(!i.has(n)){var u=t.concat([o]);r.push({op:c,path:u,value:n}),e.unshift({op:"remove",path:u,value:n})}o++}))}(n,t,r,e)}},g:function(n,t,r,e){r.push({op:"replace",path:[],value:t}),e.push({op:"replace",path:[],value:n.u})}})}function I(){function n(n,t){function r(){this.constructor=n}f(n,t),n.prototype=(r.prototype=t.prototype,new r)}function r(n){n.i||(n.D=new Map,n.i=new Map(n.u))}function u(n){n.i||(n.i=new Set,n.u.forEach((function(t){if(e(t)){var r=F(n.A.h,t,n);n.l.set(t,r),n.i.add(r)}else n.i.add(t)})))}function o(n){n.O&&t(3,JSON.stringify(l(n)))}var f=function(n,t){return(f=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(n,t){n.__proto__=t}||function(n,t){for(var r in t)t.hasOwnProperty(r)&&(n[r]=t[r])})(n,t)},a=function(){function t(n,t){return this[L]={t:2,p:t,A:t?t.A:m(),P:!1,R:!1,i:void 0,D:void 0,u:n,k:this,I:!1,O:!1},this}n(t,Map);var u=t.prototype;return Object.defineProperty(u,"size",{get:function(){return l(this[L]).size}}),u.has=function(n){return l(this[L]).has(n)},u.set=function(n,t){var e=this[L];return o(e),l(e).has(n)&&l(e).get(n)===t||(r(e),R(e),e.D.set(n,!0),e.i.set(n,t),e.D.set(n,!0)),this},u.delete=function(n){if(!this.has(n))return!1;var t=this[L];return o(t),r(t),R(t),t.D.set(n,!1),t.i.delete(n),!0},u.clear=function(){var n=this[L];o(n),l(n).size&&(r(n),R(n),n.D=new Map,i(n.u,(function(t){n.D.set(t,!1)})),n.i.clear())},u.forEach=function(n,t){var r=this;l(this[L]).forEach((function(e,i){n.call(t,r.get(i),i,r)}))},u.get=function(n){var t=this[L];o(t);var i=l(t).get(n);if(t.R||!e(i))return i;if(i!==t.u.get(n))return i;var u=F(t.A.h,i,t);return r(t),t.i.set(n,u),u},u.keys=function(){return l(this[L]).keys()},u.values=function(){var n,t=this,r=this.keys();return(n={})[Q]=function(){return t.values()},n.next=function(){var n=r.next();return n.done?n:{done:!1,value:t.get(n.value)}},n},u.entries=function(){var n,t=this,r=this.keys();return(n={})[Q]=function(){return t.entries()},n.next=function(){var n=r.next();if(n.done)return n;var e=t.get(n.value);return{done:!1,value:[n.value,e]}},n},u[Q]=function(){return this.entries()},t}(),c=function(){function t(n,t){return this[L]={t:3,p:t,A:t?t.A:m(),P:!1,R:!1,i:void 0,u:n,k:this,l:new Map,O:!1,I:!1},this}n(t,Set);var r=t.prototype;return Object.defineProperty(r,"size",{get:function(){return l(this[L]).size}}),r.has=function(n){var t=this[L];return o(t),t.i?!!t.i.has(n)||!(!t.l.has(n)||!t.i.has(t.l.get(n))):t.u.has(n)},r.add=function(n){var t=this[L];return o(t),this.has(n)||(u(t),R(t),t.i.add(n)),this},r.delete=function(n){if(!this.has(n))return!1;var t=this[L];return o(t),u(t),R(t),t.i.delete(n)||!!t.l.has(n)&&t.i.delete(t.l.get(n))},r.clear=function(){var n=this[L];o(n),l(n).size&&(u(n),R(n),n.i.clear())},r.values=function(){var n=this[L];return o(n),u(n),n.i.values()},r.entries=function(){var n=this[L];return o(n),u(n),n.i.entries()},r.keys=function(){return this.values()},r[Q]=function(){return this.values()},r.forEach=function(n,t){for(var r=this.values(),e=r.next();!e.done;)n.call(t,e.value,e.value,this),e=r.next()},t}();b("MapSet",{$:function(n,t){return new a(n,t)},C:function(n,t){return new c(n,t)}})}var J,N,W="undefined"!=typeof Symbol&&"symbol"==typeof Symbol("x"),X="undefined"!=typeof Map,q="undefined"!=typeof Set,B="undefined"!=typeof Proxy&&void 0!==Proxy.revocable&&"undefined"!=typeof Reflect,G=W?Symbol.for("immer-nothing"):((J={})["immer-nothing"]=!0,J),H=W?Symbol.for("immer-draftable"):"__$immer_draftable",L=W?Symbol.for("immer-state"):"__$immer_state",Q="undefined"!=typeof Symbol&&Symbol.iterator||"@@iterator",T="undefined"!=typeof Reflect&&Reflect.ownKeys?Reflect.ownKeys:void 0!==Object.getOwnPropertySymbols?function(n){return Object.getOwnPropertyNames(n).concat(Object.getOwnPropertySymbols(n))}:Object.getOwnPropertyNames,U=Object.getOwnPropertyDescriptors||function(n){var t={};return T(n).forEach((function(r){t[r]=Object.getOwnPropertyDescriptor(n,r)})),t},V={},Y={get:function(n,t){if(t===L)return n;var r=l(n);if(!o(r,t))return function(n,t,r){var e,i=E(t,r);return i?"value"in i?i.value:null===(e=i.get)||void 0===e?void 0:e.call(n.k):void 0}(n,r,t);var i=r[t];return n.R||!e(i)?i:i===z(n.u,t)?(k(n),n.i[t]=F(n.A.h,i,n)):i},has:function(n,t){return t in l(n)},ownKeys:function(n){return Reflect.ownKeys(l(n))},set:function(n,t,r){var e=E(l(n),t);if(null==e?void 0:e.set)return e.set.call(n.k,r),!0;if(!n.P){var i=z(l(n),t),u=null==i?void 0:i[L];if(u&&u.u===r)return n.i[t]=r,n.D[t]=!1,!0;if(c(r,i)&&(void 0!==r||o(n.u,t)))return!0;k(n),R(n)}return n.i[t]=r,n.D[t]=!0,!0},deleteProperty:function(n,t){return void 0!==z(n.u,t)||t in n.u?(n.D[t]=!1,k(n),R(n)):delete n.D[t],n.i&&delete n.i[t],!0},getOwnPropertyDescriptor:function(n,t){var r=l(n),e=Reflect.getOwnPropertyDescriptor(r,t);return e?{writable:!0,configurable:1!==n.t||"length"!==t,enumerable:e.enumerable,value:r[t]}:e},defineProperty:function(){t(11)},getPrototypeOf:function(n){return Object.getPrototypeOf(n.u)},setPrototypeOf:function(){t(12)}},Z={};i(Y,(function(n,t){Z[n]=function(){return arguments[0]=arguments[0][0],t.apply(this,arguments)}})),Z.deleteProperty=function(n,t){return Y.deleteProperty.call(this,n[0],t)},Z.set=function(n,t,r){return Y.set.call(this,n[0],t,r,n[0])};var nn=function(){function n(n){this.S=B,this.K=!0,"boolean"==typeof(null==n?void 0:n.useProxies)&&this.setUseProxies(n.useProxies),"boolean"==typeof(null==n?void 0:n.autoFreeze)&&this.setAutoFreeze(n.autoFreeze),this.produce=this.produce.bind(this),this.produceWithPatches=this.produceWithPatches.bind(this)}var i=n.prototype;return i.produce=function(n,r,i){if("function"==typeof n&&"function"!=typeof r){var u=r;r=n;var o=this;return function(n){var t=this;void 0===n&&(n=u);for(var e=arguments.length,i=Array(e>1?e-1:0),f=1;f<e;f++)i[f-1]=arguments[f];return o.produce(n,(function(n){var e;return(e=r).call.apply(e,[t,n].concat(i))}))}}var f;if("function"!=typeof r&&t(6),void 0!==i&&"function"!=typeof i&&t(7),e(n)){var a=S(this),c=F(this,n,void 0),v=!0;try{f=r(c),v=!1}finally{v?O(a):w(a)}return"undefined"!=typeof Promise&&f instanceof Promise?f.then((function(n){return j(a,i),P(n,a)}),(function(n){throw O(a),n})):(j(a,i),P(f,a))}if(!n||"object"!=typeof n){if((f=r(n))===G)return;return void 0===f&&(f=n),this.K&&h(f,!0),f}t(21,n)},i.produceWithPatches=function(n,t){var r,e,i=this;return"function"==typeof n?function(t){for(var r=arguments.length,e=Array(r>1?r-1:0),u=1;u<r;u++)e[u-1]=arguments[u];return i.produceWithPatches(t,(function(t){return n.apply(void 0,[t].concat(e))}))}:[this.produce(n,t,(function(n,t){r=n,e=t})),r,e]},i.createDraft=function(n){e(n)||t(8),r(n)&&(n=D(n));var i=S(this),u=F(this,n,void 0);return u[L].I=!0,w(i),u},i.finishDraft=function(n,t){var r=(n&&n[L]).A;return j(r,t),P(void 0,r)},i.setAutoFreeze=function(n){this.K=n},i.setUseProxies=function(n){n&&!B&&t(20),this.S=n},i.applyPatches=function(n,t){var e;for(e=t.length-1;e>=0;e--){var i=t[e];if(0===i.path.length&&"replace"===i.op){n=i.value;break}}var u=_("Patches").W;return r(n)?u(n,t):this.produce(n,(function(n){return u(n,t.slice(e+1))}))},n}(),tn=new nn,rn=tn.produce,en=tn.produceWithPatches.bind(tn),un=tn.setAutoFreeze.bind(tn),on=tn.setUseProxies.bind(tn),fn=tn.applyPatches.bind(tn),an=tn.createDraft.bind(tn),cn=tn.finishDraft.bind(tn);n.Immer=nn,n.applyPatches=fn,n.castDraft=function(n){return n},n.castImmutable=function(n){return n},n.createDraft=an,n.current=D,n.default=rn,n.enableAllPlugins=function(){$(),I(),C()},n.enableES5=$,n.enableMapSet=I,n.enablePatches=C,n.finishDraft=cn,n.freeze=h,n.immerable=H,n.isDraft=r,n.isDraftable=e,n.nothing=G,n.original=function(n){return r(n)||t(23,n),n[L].u},n.produce=rn,n.produceWithPatches=en,n.setAutoFreeze=un,n.setUseProxies=on,Object.defineProperty(n,"__esModule",{value:!0})}));
+//# sourceMappingURL=immer.umd.production.min.js.map
diff --git a/index.html b/index.html
index 90a6b7e..20a687b 100644
--- a/index.html
+++ b/index.html
@@ -8,9 +8,9 @@
   <!--<link rel="stylesheet" href="animate.min.css"></link>-->
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <!--<script src="./mithril.min.js"></script>-->
   <script src="./mithril.min.js"></script>
   <script src="./redux.min.js"></script>
+  <script src="./immer.min.js"></script>
 </head>
 <body>
 <script type="module" src="./index.js"></script>
diff --git a/index.js b/index.js
index 09fe7a7..79f8250 100644
--- a/index.js
+++ b/index.js
@@ -1,77 +1,42 @@
 import App from './App.js';
 import nanoid from './nanoid.min.js';
+const produce = immer.produce;
+immer.setAutoFreeze(false); // needed for high-frequency updated values, like onkeyup->note.temp_text; only once 'save' is called will it produce a new immutable state tree
 
 var root = document.body;
 
-function bin_reducer(old_state, new_state, action){
-  new_state.bin = old_state.bin;
-  }
-
-function search_reducer(old_state, new_state, action){
-  if(action.type === 'update-search-term'){
-    new_state.search_term = action.search_term;
-    }
-  else if(action.type === 'update-search-results'){
-    new_state.notes = action.notes.map(note=>({is_editing: false, note}));
-    new_state.search_term = old_state.search_term;
-    }
-  else{
-    new_state.search_term = old_state.search_term;
-    }
-  }
-
-function notes_reducer(old_state, new_state, action){
-  if(action.type === 'add-note'){
-    new_state.notes = old_state.notes.concat([{is_editing: true, note: {id: action.id, text: '', modified: Date.now()}}])
-    }
-  else if(action.type === 'notes-loaded'){
-    new_state.notes = action.notes.map(note=>({is_editing: false, note}));
-    }
-  else if(action.type === 'update-note-text'){
-    const i = old_state.notes.findIndex(note_state => note_state.note.id === action.note_id);
-    new_state.notes = old_state.notes.slice();
-    new_state.notes[i] = {...new_state.notes[i], note: {...new_state.notes[i].note, text: action.text, modified: Date.now()}};
-    }
-  else if(action.type === 'update-note-editing'){
-    const i = old_state.notes.findIndex(note_state => note_state.note.id === action.note_id);
-    new_state.notes = old_state.notes.slice();
-    new_state.notes[i] = {...new_state.notes[i], is_editing: action.is_editing};
-    }
-  else{
-    new_state.notes = old_state.notes;
-    }
-  }
-
-function sorting_reducer(old_state, new_state, action){
-  if(action.type === 'update-sorting'){
-    new_state.sorting = action.sorting;
-    }
-  else{
-    new_state.sorting = old_state.sorting;
-    }
-  }
-
-function reducer(old_state, action){
-  const new_state = {};
-  bin_reducer(old_state, new_state, action);
-  notes_reducer(old_state, new_state, action);
-  search_reducer(old_state, new_state, action);
-  sorting_reducer(old_state, new_state, action);
-  return new_state;
-  }
+/* Ruthlessly taken from [https://gist.github.com/kitze/fb65f527803a93fb2803ce79a792fff8]: */
+const handleActions = (actionsMap, defaultState) => 
+  (state=defaultState,  {type, payload}) =>
+    produce(state, draft => {
+      const action = actionsMap[type];
+      action && action(draft, payload);
+      });
+
+const reducer = handleActions({
+    'new-bin': (s, bin) => {  s.bin=bin;  },
+    'update-search-term': (s, search_term) => {  s.search_term=search_term;  },
+    'update-search-results': (s, _notes) => {  s.notes =_notes.map(n=>({is_editing: false, temp_text: '', bin_id: s.bin.id, note:n}));  },
+    'add-note': (s, {id, date}) => {  s.notes.unshift({is_editing: true, temp_text: '', bin_id: s.bin.id, note: {id: id, text: '', modified: date}});  },
+    'notes-loaded': (s, _notes) => {  s.notes = _notes.map(n=>({is_editing: false, temp_text: n.text, bin_id: s.bin_id, note:n}));  },
+    'update-note-text': (s, {id, text}) => {  const note_s=s.notes.find(n=>n.note.id===id); note_s.note.text=text;  }, // updates underlying note text (i.e. the "model", not the app note_state) "in the background" (e.g. from a server-pushed update), regardless of whether it's being edited; "save" is a separate action, below
+    'update-note-editing': (s, {id, is_editing}) => {  const note_s=s.notes.find(n=>n.note.id===id); note_s.is_editing=is_editing; note_s.temp_text=note_s.note.text;  },
+    'save-note-edit': (s, {id, text}) => {  const note_s=s.notes.find(n=>n.note.id===id); note_s.note.text=text; note_s.temp_text=text; note_s.is_editing=false;  },
+    'update-sorting': (s, sorting) => {  s.sorting=sorting;  }
+    }, {
+        bin: {id: nanoid()},
+        notes: [
+          //{is_editing: false, temp_text: '', bin_id: '', note: {id: nanoid(), text: 'Note one', modified: 1}},
+          ],
+        search_term: '',
+        sorting: 'new->old'
+        //search_result_notes: []
+        });
 
 // create Redux store, with Redux DevTools enabled:
-const store = Redux.createStore(reducer, /* preloadedState, */ {
-    bin: {id: nanoid()},
-    notes: [
-      //{is_editing: false, note: {id: nanoid(), text: 'Note one', modified: 1}},
-      ],
-    search_term: '',
-    sorting: 'new->old'
-    //search_result_notes: []
-    },
+const store = Redux.createStore(reducer, /* preloadedState, */ 
    window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__());
-const dispatch = function(...args){ store.dispatch(...args); };
+const dispatch = function(action_type, payload){ store.dispatch({type:action_type, payload}); };
 
 store.subscribe(()=>{
   m.render(root, m(App, {state: store.getState(), dispatch}));