diff --git a/labs/architecture-examples/epitome/bower.json b/labs/architecture-examples/epitome/bower.json
index 43da517e3f..82adbb2fe0 100644
--- a/labs/architecture-examples/epitome/bower.json
+++ b/labs/architecture-examples/epitome/bower.json
@@ -2,7 +2,7 @@
   "name": "todomvc-epitome",
   "version": "0.0.0",
   "dependencies": {
-    "epitome": "0.2.2",
+    "epitome": "0.3.1",
     "todomvc-common": "~0.1.6"
   }
 }
diff --git a/labs/architecture-examples/epitome/bower_components/epitome/Epitome-min.js b/labs/architecture-examples/epitome/bower_components/epitome/Epitome-min.js
index 5948fd16f9..bb0c9a7dd4 100644
--- a/labs/architecture-examples/epitome/bower_components/epitome/Epitome-min.js
+++ b/labs/architecture-examples/epitome/bower_components/epitome/Epitome-min.js
@@ -1 +1 @@
-(function(t){var e=function(){Events.prototype.$subscribers={};var t=function(t){return t.replace(/^on([A-Z])/,function(t,e){return e.toLowerCase()})},e=function(e,n,i){return e=t(e),this.$events[e]=(this.$events[e]||[]).include(n),i&&(n.internal=!0),this}.overloadSetter(),n="*",i=new Class({Extends:Events,on:e,trigger:function(e,i,o){e=t(e);var r=this.$events[e]||[],s=e in this.$subscribers?this.$subscribers[e]:n in this.$subscribers?this.$subscribers[n]:[],u=this;return r||s?(i=Array.from(i),r.each(function(t){o?t.delay(o,u,i):t.apply(u,i)}),s.each(function(t){o&&t.fn.delay(o,t.context,i),t.fn.apply(t.context,i)}),this):this},listenTo:function(t,e,i){var o=[].slice.call(arguments);2===o.length&&(i=e,e=n),t.$subscribers[e]||(t.$subscribers[e]=[]),t.$subscribers[e].include({context:t,fn:i}),console.log(t.$subscribers)}}),o=new i;return o.Events=i,o};"function"==typeof define&&define.amd?define("epitome",e):t.Epitome=e(t)})(this),function(t){var e=function(){var t=function(e,n,i){if(i=i||[],e===n)return 0!==e||1/e==1/n;if(null==e||null==n)return e===n;var o=typeOf(e),r=typeOf(n);if(o!=r)return!1;switch(o){case"string":return e==n+"";case"number":return e!=+e?n!=+n:0==e?1/e==1/n:e==+n;case"date":case"boolean":return+e==+n;case"regexp":return e.source==n.source&&e.global==n.global&&e.multiline==n.multiline&&e.ignoreCase==n.ignoreCase}if("object"!=typeof e||"object"!=typeof n)return!1;for(var s=i.length;s--;)if(i[s]==e)return!0;i.push(e);var u=0,a=!0;if("array"==o){if(u=e.length,a=u==n.length)for(;u--&&(a=u in e==u in n&&t(e[u],n[u],i)););}else{if("constructor"in e!="constructor"in n||e.constructor!=n.constructor)return!1;for(var c in e)if(e.hasOwnProperty(c)&&(u++,!(a=n.hasOwnProperty(c)&&t(e[c],n[c],i))))break;if(a){for(c in n)if(n.hasOwnProperty(c)&&!u--)break;a=!u}}return i.pop(),a};return t};"function"==typeof define&&define.amd?define("epitome-isequal",["./epitome"],e):(t.Epitome||(t.Epitome={}),t.Epitome.isEqual=e(t.Epitome))}(this),function(t){var e=function(t){return new Class({Implements:[Options,Events],_attributes:{},properties:{id:{get:function(){var t=this._attributes.id||String.uniqueID();return this.cid||(this.cid=t),this._attributes.id}}},validators:{},options:{defaults:{}},collections:[],initialize:function(t,e){return e&&e.defaults&&(this.options.defaults=Object.merge(this.options.defaults,e.defaults)),t=t&&"object"===typeOf(t)?t:{},this.set(Object.merge(this.options.defaults,t)),this.setOptions(e),this.fireEvent("ready")},set:function(){this.propertiesChanged=[],this.validationFailed=[],this._set.apply(this,arguments),this.propertiesChanged.length&&this.fireEvent("change",this.get(this.propertiesChanged)),this.validationFailed.length&&this.fireEvent("error",[this.validationFailed])},_set:function(e,n){if(!e||n===void 0)return this;if(this.properties[e]&&this.properties[e].set)return this.properties[e].set.call(this,n);if(this._attributes[e]&&t(this._attributes[e],n))return this;var i=this.validate(e,n);if(this.validators[e]&&i!==!0){var o={};return o[e]={key:e,value:n,error:i},this.validationFailed.push(o),this.fireEvent("error:"+e,o[e]),this}return null===n?delete this._attributes[e]:this._attributes[e]=n,this.fireEvent("change:"+e,n),this.propertiesChanged.push(e),this}.overloadSetter(),get:function(t){return t&&this.properties[t]&&this.properties[t].get?this.properties[t].get.call(this):t&&this._attributes[t]!==void 0?this._attributes[t]:null}.overloadGetter(),unset:function(){var t=Array.prototype.slice.apply(arguments),e={},n=t.length;return n?(Array.each(Array.flatten(t),function(t){e[t]=null}),this.set(e),this):this},toJSON:function(){return Object.clone(this._attributes)},empty:function(){var t=Object.keys(this.toJSON()),e=this;this.fireEvent("change",[t]),Array.each(t,function(t){e.fireEvent("change:"+t,null)},this),this._attributes={},this.fireEvent("empty")},destroy:function(){this._attributes={},this.fireEvent("destroy")},validate:function(t,e){return t in this.validators?this.validators[t].call(this,e):!0}})};"function"==typeof define&&define.amd?define("epitome-model",["./epitome-isequal"],e):(t.Epitome||(t.Epitome={isEqual:{}}),t.Epitome.Model=e(t.Epitome.isEqual))}(this),function(t){var e=new Class({Extends:Request,options:{secure:!0},initialize:function(t){this.parent(t),Object.append(this.headers,{Accept:"application/json,text/plain;q=0.2,text/html;q=0.1","X-Request":"JSON"})},success:function(t){var e;try{e=this.response.json=JSON.decode(t,this.options.secure)}catch(n){return this.fireEvent("error",[t,n]),void 0}t&&null==e&&204!=this.status?this.onFailure():this.onSuccess(e,t)}}),n=function(t){var n="sync:",i={create:"POST",read:"GET",update:"PUT",delete_:"DELETE"};return new Class({Extends:t,properties:{urlRoot:{set:function(t){this.urlRoot=t,delete this._attributes.urlRoot},get:function(){var t=this.urlRoot||this.options.urlRoot||"no-urlRoot-set";return"/"!=t.charAt(t.length-1)&&(t+="/"),t}}},options:{request:e,emulateREST:!1,useJSON:!1},initialize:function(t,e){this.setOptions(e),this.setupSync(),this.parent(t,this.options)},sync:function(t,e){var n={};return t=t&&i[t]?i[t]:i.read,n.method=t,(t==i.create||t==i.update)&&(n.data=e||this.toJSON(),this.preProcessor&&(n.data=this.preProcessor(n.data))),this.options.useJSON&&["POST","PUT","DELETE"].contains(t)?(n.data=JSON.encode(n.data),n.urlEncoded=!1,this.request.setHeader("Content-type","application/json")):n.urlEncoded=!0,n.url=[this.get("urlRoot"),this.get("id")].join(""),"/"!==n.url.slice(-1)&&(n.url+="/"),this.request.setOptions(n),this.request[t](e),this},setupSync:function(){var t,e=this,o=0,r=function(){o++};return this.getRequestId=function(){return o+1},t={link:"chain",url:this.get("urlRoot"),emulation:this.options.emulateREST,onRequest:r,onCancel:function(){this.removeEvents(n+o)},onSuccess:function(t){t=e.postProcessor&&e.postProcessor(t),e.isNewModel=!1,e.fireEvent(n+o,[t]),e.fireEvent("sync",[t,this.options.method,this.options.data])},onFailure:function(){e.fireEvent(n+"error",[this.options.method,this.options.url,this.options.data]),e.fireEvent("requestFailure",[this.status,this.response.text])}},this.options.headers&&(t.headers=this.options.headers),this.request=new this.options.request(t),Object.each(i,function(t,n){e[n]=function(t){this.sync(n,t)}}),this},_throwAwaySyncEvent:function(t,e){t=t||n+this.getRequestId();var i=this,o={};return o[t]=function(t){t&&"object"==typeof t&&i.set(t),e&&e.call(i,t),i.removeEvents(o)},this.addEvents(o)}.protect(),postProcessor:function(t){return t},preProcessor:function(t){return t},fetch:function(){return this._throwAwaySyncEvent(n+this.getRequestId(),function(){this.isNewModel=!1,this.fireEvent("fetch")}),this.read(),this},save:function(t,e){var i=["update","create"][+this.isNew()];if(t){var o=typeOf(t),r="object"==o||"string"==o&&e!==void 0;r&&this._set.apply(this,arguments)}return this._throwAwaySyncEvent(n+this.getRequestId(),function(){this.fireEvent("save"),this.fireEvent(i)}),this[i](),this},destroy:function(){this._throwAwaySyncEvent(n+this.getRequestId(),function(){this._attributes={},this.fireEvent("destroy")}),this.delete_()},isNew:function(){return this.isNewModel===void 0&&(this.isNewModel=!this.get("id")),this.isNewModel}})};"function"==typeof define&&define.amd?define("epitome-model-sync",["./epitome-model"],n):(t.Epitome||(t.Epitome={Model:{}}),t.Epitome.Model.Sync=n(t.Epitome.Model))}(this),function(t){var e=function(){var e=function(){var e=!("object"!=typeof t.localStorage||!t.localStorage.getItem),n="localStorage",i="sessionStorage",o=function(n){var i,o="epitome-"+n,r={},s="model";if(e)try{r=JSON.decode(t[n].getItem(o))||r}catch(u){e=!1}if(!e)try{i=JSON.decode(t.name),i&&"object"==typeof i&&i[o]&&(r=i[o])}catch(u){f()}var a={store:function(t){t=t||this.toJSON(),h([s,this.get("id")].join(":"),t),this.fireEvent("store",t)},eliminate:function(){return l([s,this.get("id")].join(":")),this.fireEvent("eliminate")},retrieve:function(){var t=c([s,this.get("id")].join(":"))||null;return this.fireEvent("retrieve",t),t}},c=function(t){return r[t]||null},h=function(i,s){if(r=e?JSON.decode(t[n].getItem(o))||r:r,r[i]=s,e)try{t[n].setItem(o,JSON.encode(r))}catch(u){}else f();return this},l=function(i){if(delete r[i],e)try{t[n].setItem(o,JSON.encode(r))}catch(s){}else f()},f=function(){var e={},n=JSON.decode(t.name);e[o]=r,t.name=JSON.encode(Object.merge(e,n))};return function(t){return t&&(s=t),new Class(Object.clone(a))}};return{localStorage:o(n),sessionStorage:o(i)}}();return e};"function"==typeof define&&define.amd?define("epitome-storage",["./epitome"],e):(t.Epitome||(t.Epitome={}),t.Epitome.Storage=e(t))}(this),function(t){var e=function(e){var n=["forEach","each","invoke","filter","map","some","indexOf","contains","getRandom","getLast"];Function.extend({monitorModelEvents:function(t,e){var n=this;return e=e||this,t&&t.fireEvent&&!t.hasOwnProperty("fireEvent")?function(i,o,r){n.apply(e,arguments),t.getModelByCID(e.cid)&&t.fireEvent(i,Array.flatten([e,o]),r)}:this}});var i=new Class({Implements:[Options,Events],model:e,_models:[],initialize:function(t,e){return this.setOptions(e),t&&this.setUp(t),this.id=this.options.id||String.uniqueID(),this.fireEvent("ready")},setUp:function(t){return t=Array.from(t),Array.each(t,this.addModel.bind(this)),this.addEvent("destroy",this.removeModel.bind(this)),this},addModel:function(t,e){var n;return"object"!=typeOf(t)||instanceOf(t,this.model)||(t=new this.model(t)),t.cid=t.cid||t.get("id")||String.uniqueID(),n=this.getModelByCID(t.cid),n&&e!==!0?this.fireEvent("add:error",t):(n&&e===!0&&(this._models[this._models.indexOf(t)]=t),t.fireEvent=Function.monitorModelEvents.apply(t.fireEvent,[this,t]),this._models.push(t),t.collections.include(this),this.length=this._models.length,this.fireEvent("add",[t,t.cid]).fireEvent("reset",[t,t.cid]))},removeModel:function(t,e){var n=this;return t=Array.from(t).slice(),Array.each(t,function(t){t.collections.erase(n),t.collections.length||delete t.fireEvent,Array.erase(n._models,t),n.length=n._models.length,e||n.fireEvent("remove",[t,t.cid])}),this.fireEvent("reset",[t])},get:function(t){return this[t]},getModelByCID:function(t){var e=null;return this.some(function(n){return n.cid==t&&(e=n)}),e},getModelById:function(t){var e=null;return this.some(function(n){return n.get("id")==t&&(e=n)}),e},getModel:function(t){return this._models[t]},toJSON:function(){var t=function(t){return t.toJSON()};return Array.map(this._models,t)},empty:function(t){return this.removeModel(this._models,t),this.fireEvent("empty")},sort:function(t){if(!t)return this._models.sort(),this.fireEvent("sort");if("function"==typeof t)return this.model.sort(t),this.fireEvent("sort");var e="asc",n=t.split(","),i=function(t,e){return e>t?-1:t>e?1:0};return this._models.sort(function(t,o){var r=0;return Array.some(n,function(n){n=n.trim();var s=n.split(":"),u=s[0],a=s[1]?s[1]:e,c=t.get(u),h=o.get(u),l=i(c,h),f={asc:l,desc:-l};return f[a]===void 0&&(a=e),r=f[a],0!=r}),r}),this.fireEvent("sort")},reverse:function(){return Array.reverse(this._models),this.fireEvent("sort")},find:function(e){var n=t.Slick.parse(e),i=[],o=this,r={"=":function(t,e){return t==e},"!=":function(t,e){return t!=e},"^=":function(t,e){return 0===t.indexOf(e)},"*=":function(t,e){return-1!==t.indexOf(e)},"$=":function(t,e){return t.indexOf(e)==t.length-e.length},"*":function(t){return t!==void 0}},s=function(t){return t&&r[t]?r[t]:null},u=function(t){var e=t.key,n=t.value||null,i=t.tag||null,r=s(t.operator);o=o.filter(function(t){var o,s;return i&&e?(o=t.get(i),s=o?o[e]:null):s=i?t.get(i):t.get(e),null!==s&&null!==n&&null!==r?r(s,n):null!=s})};if(n.expressions.length){var a,c,h,l,f,d,p,v,m=n.expressions;t:for(c=0;l=m[c];c++){for(a=0;f=l[a];a++){if(h=f.attributes,d=f.id,d&&(p={key:"id",value:d,operator:"="},h||(h=[]),h.push(p)),v=f.tag,v&&"*"!=v&&(h||(h=[{key:null,value:"",operator:"*"}]),h=Array.map(h,function(t){return t.tag=v,t})),!h)continue t;Array.each(h,u)}i[c]=o,o=this}}return[].combine(Array.flatten(i))},findOne:function(t){var e=this.find(t);return e.length?e[0]:null}});return Array.each(n,function(t){i.implement(t,function(){return Array.prototype[t].apply(this._models,arguments)})}),i};"function"==typeof define&&define.amd?define("epitome-collection",["./epitome-model"],e):(t.Epitome||(t.Epitome={Model:{}}),t.Epitome.Collection=e(t.Epitome.Model))}(this),function(t){var e=function(t){var e="no-urlRoot-set",n="fetch:";return new Class({Extends:t,options:{urlRoot:e},initialize:function(t,e){this.setupSync(),this.parent(t,e)},setupSync:function(){var t=this,e=0,i=function(){e++};return this.getRequestId=function(){return e+1},this.request=new Request.JSON({link:"chain",url:this.options.urlRoot,emulation:this.options.emulateREST,onRequest:i,onCancel:function(){this.removeEvents(n+e)},onSuccess:function(i){i=t.postProcessor&&t.postProcessor(i),t.fireEvent(n+e,[[i]])},onFailure:function(){t.fireEvent(n+"error",[this.options.method,this.options.url,this.options.data])}}),this.request.setHeader("Accept","application/json,text/plain;q=0.2,text/html;q=0.1"),this},fetch:function(t,e){return e||(e={}),this._throwAwayEvent(function(e){t?(this.empty(),Array.each(e,this.addModel.bind(this))):this.processModels(e),this.fireEvent("fetch",[e])}),this.request.get(e),this},processModels:function(t){var e=this;Array.each(t,function(t){var n=t.id&&e.getModelById(t.id);n?n.set(t):e.addModel(t)})},_throwAwayEvent:function(t){var e=n+this.getRequestId(),i=this,o={};if(t&&"function"==typeof t)return o[e]=function(e){t.apply(i,e),i.removeEvents(o)},this.addEvents(o)}.protect(),postProcessor:function(t){return t}})};"function"==typeof define&&define.amd?define("epitome-collection-sync",["./epitome-collection"],e):(t.Epitome||(t.Epitome={Collection:{}}),t.Epitome.Collection.Sync=e(t.Epitome.Collection))}(this),function(t){(function(){var t={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","/":"&#x2F;"},e=RegExp("["+Object.keys(t).join("")+"]","g");String.implement({escape:function(){return(this+"").replace(e,function(e){return t[e]})}})})();var e=function(){return new Class({options:{evaluate:/<%([\s\S]+?)%>/g,normal:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g,noMatch:/.^/,escaper:/\\|'|\r|\n|\t|\u2028|\u2029/g},Implements:[Options],initialize:function(t){this.setOptions(t);var e=this.escapes={"\\":"\\","'":"'",r:"\r",n:"\n",t:"	",u2028:"\u2028",u2029:"\u2029"};return Object.each(e,function(t,e){this[t]=e},e),this.matcher=RegExp([(this.options.escape||this.options.noMatch).source,(this.options.normal||this.options.noMatch).source,(this.options.evaluate||this.options.noMatch).source].join("|")+"|$","g"),this},template:function(t,e,n){var i,o=n?Object.merge(this.options,n):this.options,r=this.escapes,s=o.escaper,u=0,a="__p+='";t.replace(this.matcher,function(e,n,i,o,c){return a+=t.slice(u,c).replace(s,function(t){return"\\"+r[t]}),n&&(a+="'+\n((__t=(obj['"+n+"']))==null?'':String.escape(__t))+\n'"),i&&(a+="'+\n((__t=(obj['"+i+"']))==null?'':__t)+\n'"),o&&(a+="';\n"+o+"\n__p+='"),u=c+e.length,e}),a+="';\n",o.variable||(a="obj=obj||{};with(obj){\n"+a+"}\n"),a="var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};\n"+a+"return __p;\n";try{i=Function(o.variable||"obj",a)}catch(c){throw c.source=a,c}if(e)return i(e);var h=function(t){return i.call(this,t)};return h.source="function("+(o.variable||"obj")+"){\n"+a+"}",h}})};"function"==typeof define&&define.amd?define("epitome-template",["./epitome"],e):(t.Epitome||(t.Epitome={}),t.Epitome.Template=e(t.Epitome))}(this),function(t){var e=function(t,e,n){return new Class({Implements:[Options,Events],element:null,collection:null,model:null,options:{template:"",events:{}},initialize:function(t){return t&&t.collection&&(this.setCollection(t.collection),delete t.collection),t&&t.model&&(this.setModel(t.model),delete t.model),this.setOptions(t),this.options.element&&(this.setElement(this.options.element,this.options.events),delete this.options.element),this.fireEvent("ready")},setElement:function(t,e){return this.element&&this.detachEvents()&&this.destroy(),this.element=document.id(t),e&&this.attachEvents(e),this},setCollection:function(t){var e=this,i=function(t){return function(){e.fireEvent(t+":collection",arguments)}};return instanceOf(t,n)&&(this.collection=t,this.collection.addEvents({change:i("change"),fetch:i("fetch"),add:i("add"),remove:i("remove"),sort:i("sort"),reset:i("reset"),error:i("error")})),this},setModel:function(t){var n=this,i=function(t){return function(){n.fireEvent(t+":model",arguments)}};return instanceOf(t,e)&&(this.model=t,this.model.addEvents({change:i("change"),destroy:i("destroy"),empty:i("empty"),error:i("error")})),this},attachEvents:function(t){var e=this;return Object.each(t,function(t,n){e.element.addEvent(n,function(){e.fireEvent(t,arguments)})}),this.element.store("attachedEvents",t),this},detachEvents:function(){var t=this.element.retrieve("attachedEvents");return t&&this.element.removeEvents(t).eliminate("attachedEvents"),this},template:function(e,n){n=n||this.options.template;var i=this.Template||(this.Template=new t);return i.template(n,e)},render:function(){return this.fireEvent("render")},empty:function(t){return t?this.element.empty():this.element.set("html",""),this.fireEvent("empty")},dispose:function(){return this.element.dispose(),this.fireEvent("dispose")},destroy:function(){return this.element.destroy(),this.fireEvent("destroy")}})};"function"==typeof define&&define.amd?define("epitome-view",["./epitome-template","./epitome-model","./epitome-collection"],e):(t.Epitome||(t.Epitome={Template:{},Model:{},Collection:{}}),t.Epitome.View=e(t.Epitome.Template,t.Epitome.Model,t.Epitome.Collection))}(this),function(t){var e=function(){var t,e="hashchange",n="on"+e in window,i=[window,document],o=function(t){for(var e,n={},i=/([^&=]+)=([^&]*)/g;e=i.exec(t);)n[decodeURIComponent(e[1])]=decodeURIComponent(e[2]);return n};return Element.Events.hashchange={onAdd:function(){var o=location.hash,r=function(){o!=location.hash&&(o=location.hash,i.invoke("fireEvent",e,0==o.indexOf("#")?o.substr(1):o))};n&&(window.onhashchange=r)||(t=r.periodical(100))},onRemove:function(){n&&(window.onhashchange=null)||clearInterval(t)}},new Class({Implements:[Options,Events],options:{triggerOnLoad:!0},routes:{},boundEvents:{},initialize:function(t){var n=this;this.setOptions(t),this.options.routes&&(this.routes=this.options.routes),window.addEvent(e,function(){var t,e=location.hash,i=e.split("?")[0],r=e.split("?")[1]||"",s=!0;for(t in n.routes){var u=[],a=n.normalize(t,u,!0,!1),c=a.exec(i),h=!1;if(c){s=!1,n.req=c[0];var l=c.slice(1),f={};Array.each(l,function(t,e){u[e]!==void 0&&(f[u[e].name]=t)}),n.route=t,n.param=f||{},n.query=r&&o(r),h=n.routes[t],n.fireEvent("before",h),h&&n.$events[h]?(n.fireEvent(h+":before"),n.fireEvent(h,Object.values(n.param))):n.fireEvent("error",["Route",h,"is undefined"].join(" ")),n.fireEvent("after",h),h&&n.fireEvent(h+":after");break}}s&&n.fireEvent("undefined")}),this.fireEvent("ready"),this.options.triggerOnLoad&&window.fireEvent(e)},navigate:function(t,n){location.hash==t&&n?window.fireEvent(e):location.hash=t},normalize:function(t,e,n,i){return t instanceof RegExp?t:(t=t.concat(i?"":"/?").replace(/\/\(/g,"(?:/").replace(/(\/)?(\.)?:(\w+)(?:(\(.*?\)))?(\?)?/g,function(t,n,i,o,r,s){return e.push({name:o,optional:!!s}),n=n||"",[s?"":n,"(?:",s?n:"",(i||"")+(r||i&&"([^/.]+?)"||"([^/]+?)")+")",s||""].join("")}).replace(/([\/.])/g,"\\$1").replace(/\*/g,"(.*)"),RegExp("^"+t+"$",n?"":"i"))},addRoute:function(t){return t&&t.route&&t.id&&t.events?t.id.length?this.routes[t.route]?this.fireEvent("error",'Route "{route}" or id "{id}" already exists, aborting'.substitute(t)):(this.routes[t.route]=t.id,this.addEvents(this.boundEvents[t.route]=t.events),this.fireEvent("route:add",t)):this.fireEvent("error","Route id cannot be empty, aborting"):this.fireEvent("error","Please include route, id and events in the argument object when adding a route")},removeRoute:function(t){return t&&this.routes[t]&&this.boundEvents[t]?(this.removeEvents(this.boundEvents[t]),delete this.routes[t],delete this.boundEvents[t],this.fireEvent("route:remove",t)):this.fireEvent("error","Could not find route or route is not removable")}})};"function"==typeof define&&define.amd?define("epitome-router",["./epitome"],e):(t.Epitome||(t.Epitome={}),t.Epitome.Router=e(t.Epitome))}(this);
\ No newline at end of file
+(function(t){var e=function(t){return t.replace(/^on([A-Z])/,function(t,e){return e.toLowerCase()})},i=function(t,i){t=e(t);var n=t.split(/\s+/),r=this;return n.each(function(t){r.$events[t]=(r.$events[t]||[]).include(i)}),this}.overloadSetter(),n=function(t,i){t=e(t);var n=this.$events[t];if(n)if(i){var r=n.indexOf(i);-1!==r&&delete n[r]}else delete this.$events[t];return this}.overloadSetter(),r="*",o="function",s=new Class({$events:{},$subscribers:{},on:i,off:n,trigger:function(t,i){t=e(t);var n=this.$events[t]||[],o=t in this.$subscribers?this.$subscribers[t]:r in this.$subscribers?this.$subscribers[r]:[],s=this;return n||o?(i=Array.from(i),n.each(function(t){t.apply(s,i)}),o.each(function(e){e.fn?e.fn.apply(e.context,i):e.subscriber.trigger(t,Array.flatten([s,i]))}),this):this},listenTo:function(t,e,i){var n=typeof e,s={context:t,subscriber:this};return n===o?(i=e,e=r):"undefined"===n&&(e=r),i&&(s.fn=i),t.$subscribers[e]=(t.$subscribers[e]||[]).include(s),this},stopListening:function(t,e,i){var n;return Object.each(t.$subscribers,function(r,o){if(n=r.length,e!==void 0){if(o===e)for(;n--;)(i&&i===r[n].fn||!i)&&r[n].context===t&&r.splice(n,1)}else for(;n--;)r[n].context===t&&r.splice(n,1)}),this},setOptions:function(){var t,e=this.options=Object.merge.apply(null,[{},this.options].append(arguments));for(t in e)typeOf(e[t])===o&&/^on[A-Z]/.test(t)&&(this.on(t,e[t]),delete e[t]);return this}});"function"==typeof define&&define.amd?define("epitome-events",[],function(){return s}):(t.Epitome||(t.Epitome={}),t.Epitome.Events=s)})(this),function(t){var e=function(t){var e=new t;return e.Events=t,e};"function"==typeof define&&define.amd?define("epitome",["./epitome-events"],e):t.Epitome=e(t.Epitome.Events)}(this),function(t){var e=function(){var t=function(e,i,n){if(n=n||[],e===i)return 0!==e||1/e==1/i;if(null==e||null==i)return e===i;var r=typeOf(e),o=typeOf(i);if(r!=o)return!1;switch(r){case"string":return e==i+"";case"number":return e!=+e?i!=+i:0==e?1/e==1/i:e==+i;case"date":case"boolean":return+e==+i;case"regexp":return e.source==i.source&&e.global==i.global&&e.multiline==i.multiline&&e.ignoreCase==i.ignoreCase}if("object"!=typeof e||"object"!=typeof i)return!1;for(var s=n.length;s--;)if(n[s]==e)return!0;n.push(e);var u=0,a=!0;if("array"==r){if(u=e.length,a=u==i.length)for(;u--&&(a=u in e==u in i&&t(e[u],i[u],n)););}else{if("constructor"in e!="constructor"in i||e.constructor!=i.constructor)return!1;for(var c in e)if(e.hasOwnProperty(c)&&(u++,!(a=i.hasOwnProperty(c)&&t(e[c],i[c],n))))break;if(a){for(c in i)if(i.hasOwnProperty(c)&&!u--)break;a=!u}}return n.pop(),a};return t};"function"==typeof define&&define.amd?define("epitome-isequal",["./epitome"],e):(t.Epitome||(t.Epitome={}),t.Epitome.isEqual=e(t.Epitome))}(this),function(t){var e=function(t,e){return new Class({Implements:[e],_attributes:{},properties:{id:{get:function(){var t=this._attributes.id||String.uniqueID();return this.cid||(this.cid=t),this._attributes.id}}},validators:{},options:{defaults:{}},collections:[],initialize:function(t,e){return e&&e.defaults&&(this.options.defaults=Object.merge(this.options.defaults,e.defaults)),t=t&&"object"===typeOf(t)?t:{},this.set(Object.merge(this.options.defaults,t)),this.setOptions(e),this.trigger("ready")},set:function(){this.propertiesChanged=[],this.validationFailed=[],this._set.apply(this,arguments),this.propertiesChanged.length&&this.trigger("change",this.get(this.propertiesChanged)),this.validationFailed.length&&this.trigger("error",[this.validationFailed])},_set:function(e,i){if(!e||i===void 0)return this;if(this.properties[e]&&this.properties[e].set)return this.properties[e].set.call(this,i);if(this._attributes[e]&&t(this._attributes[e],i))return this;var n=this.validate(e,i);if(this.validators[e]&&n!==!0){var r={};return r[e]={key:e,value:i,error:n},this.validationFailed.push(r),this.trigger("error:"+e,r[e]),this}return null===i?delete this._attributes[e]:this._attributes[e]=i,this.trigger("change:"+e,i),this.propertiesChanged.push(e),this}.overloadSetter(),get:function(t){return t&&this.properties[t]&&this.properties[t].get?this.properties[t].get.call(this):t&&this._attributes[t]!==void 0?this._attributes[t]:null}.overloadGetter(),unset:function(){var t=Array.prototype.slice.apply(arguments),e={},i=t.length;return i?(Array.each(Array.flatten(t),function(t){e[t]=null}),this.set(e),this):this},toJSON:function(){return Object.clone(this._attributes)},empty:function(){var t=Object.keys(this.toJSON()),e=this;this.trigger("change",[t]),Array.each(t,function(t){e.trigger("change:"+t,null)},this),this._attributes={},this.trigger("empty")},destroy:function(){this._attributes={},this.trigger("destroy")},validate:function(t,e){return t in this.validators?this.validators[t].call(this,e):!0}})};"function"==typeof define&&define.amd?define("epitome-model",["./epitome-isequal","./epitome-events"],e):(t.Epitome||(t.Epitome={isEqual:{},Events:{}}),t.Epitome.Model=e(t.Epitome.isEqual,t.Epitome.Events))}(this),function(t){var e=new Class({Extends:Request,options:{secure:!0},initialize:function(t){this.parent(t),Object.append(this.headers,{Accept:"application/json,text/plain;q=0.2,text/html;q=0.1","X-Request":"JSON"})},success:function(t){var e;try{e=this.response.json=JSON.decode(t,this.options.secure)}catch(i){return this.fireEvent("error",[t,i]),void 0}t&&null==e&&204!=this.status?this.onFailure():this.onSuccess(e,t)}}),i=function(t){var i="sync:",n={create:"POST",read:"GET",update:"PUT",delete_:"DELETE"};return new Class({Extends:t,properties:{urlRoot:{set:function(t){this.urlRoot=t,delete this._attributes.urlRoot},get:function(){var t=this.urlRoot||this.options.urlRoot||"no-urlRoot-set";return"/"!==t.charAt(t.length-1)&&(t+="/"),t}}},options:{request:e,emulateREST:!1,useJSON:!1},initialize:function(t,e){this.setOptions(e),this.setupSync(),this.parent(t,this.options)},sync:function(t,e){var i={};return t=t&&n[t]?n[t]:n.read,i.method=t,(t===n.create||t===n.update)&&(i.data=e||this.toJSON(),this.preProcessor&&(i.data=this.preProcessor(i.data))),this.options.useJSON&&["POST","PUT","DELETE"].contains(t)?(i.data=JSON.encode(i.data),i.urlEncoded=!1,this.request.setHeader("Content-type","application/json")):i.urlEncoded=!0,i.url=[this.get("urlRoot"),this.get("id")].join(""),"/"!==i.url.slice(-1)&&(i.url+="/"),this.request.setOptions(i),this.request[t](e),this},setupSync:function(){var t,e=this,r=0,o=function(){r++};return this.getRequestId=function(){return r+1},t={link:"chain",url:this.get("urlRoot"),emulation:this.options.emulateREST,onRequest:o,onCancel:function(){this.removeEvents(i+r)},onSuccess:function(t){t=e.postProcessor&&e.postProcessor(t),e.isNewModel=!1,e.trigger(i+r,[t]),e.trigger("sync",[t,this.options.method,this.options.data])},onFailure:function(){e.trigger(i+"error",[this.options.method,this.options.url,this.options.data]),e.trigger("requestFailure",[this.status,this.response.text])}},this.options.headers&&(t.headers=this.options.headers),this.request=new this.options.request(t),Object.each(n,function(t,i){e[i]=function(t){this.sync(i,t)}}),this},_throwAwaySyncEvent:function(t,e){t=t||i+this.getRequestId();var n=this,r={};return r[t]=function(t){t&&"object"==typeof t&&n.set(t),e&&e.call(n,t),n.off(r)},this.on(r)}.protect(),postProcessor:function(t){return t},preProcessor:function(t){return t},fetch:function(){return this._throwAwaySyncEvent(i+this.getRequestId(),function(){this.isNewModel=!1,this.trigger("fetch")}),this.read(),this},save:function(t,e){var n=["update","create"][+this.isNew()];if(t){var r=typeOf(t),o="object"===r||"string"===r&&e!==void 0;o&&this._set.apply(this,arguments)}return this._throwAwaySyncEvent(i+this.getRequestId(),function(){this.trigger("save"),this.trigger(n)}),this[n](),this},destroy:function(){this._throwAwaySyncEvent(i+this.getRequestId(),function(){this._attributes={},this.trigger("destroy")}),this.delete_()},isNew:function(){return this.isNewModel===void 0&&(this.isNewModel=!this.get("id")),this.isNewModel}})};"function"==typeof define&&define.amd?define("epitome-model-sync",["./epitome-model"],i):(t.Epitome||(t.Epitome={Model:{}}),t.Epitome.Model.Sync=i(t.Epitome.Model))}(this),function(t){var e=function(){var e=function(){var e=!("object"!=typeof t.localStorage||!t.localStorage.getItem),i="localStorage",n="sessionStorage",r=function(i){var n,r="epitome-"+i,o={},s="model";if(e)try{o=JSON.decode(t[i].getItem(r))||o}catch(u){e=!1}if(!e)try{n=JSON.decode(t.name),n&&"object"==typeof n&&n[r]&&(o=n[r])}catch(u){d()}var a={store:function(t){t=t||this.toJSON(),h([s,this.get("id")].join(":"),t),this.trigger("store",t)},eliminate:function(){return l([s,this.get("id")].join(":")),this.trigger("eliminate")},retrieve:function(){var t=c([s,this.get("id")].join(":"))||null;return this.trigger("retrieve",t),t}},c=function(t){return o[t]||null},h=function(n,s){if(o=e?JSON.decode(t[i].getItem(r))||o:o,o[n]=s,e)try{t[i].setItem(r,JSON.encode(o))}catch(u){}else d();return this},l=function(n){if(delete o[n],e)try{t[i].setItem(r,JSON.encode(o))}catch(s){}else d()},d=function(){var e={},i=JSON.decode(t.name);e[r]=o,t.name=JSON.encode(Object.merge(e,i))};return function(t){return t&&(s=t),new Class(Object.clone(a))}};return{localStorage:r(i),sessionStorage:r(n)}}();return e};"function"==typeof define&&define.amd?define("epitome-storage",["./epitome"],e):(t.Epitome||(t.Epitome={}),t.Epitome.Storage=e(t))}(this),function(t){var e=function(e,i){var n=["forEach","each","invoke","filter","map","some","indexOf","contains","getRandom","getLast"],r=new Class({Implements:[i],model:e,_models:[],initialize:function(t,e){return this.setOptions(e),t&&this.setUp(t),this.id=this.options.id||String.uniqueID(),this.trigger("ready")},setUp:function(t){return t=Array.from(t),Array.each(t,this.addModel.bind(this)),this.on("destroy",this.removeModel.bind(this)),this},addModel:function(t,e){var i;return"object"!==typeOf(t)||instanceOf(t,this.model)||(t=new this.model(t)),t.cid=t.cid||t.get("id")||String.uniqueID(),i=this.getModelByCID(t.cid),i&&e!==!0?this.trigger("add:error",t):(i&&e===!0&&(this._models[this._models.indexOf(t)]=t),this.listenTo(t),this._models.push(t),t.collections.include(this),this.length=this._models.length,this.trigger("add",[t,t.cid]).trigger("reset",[t,t.cid]))},modelEvent:function(){},removeModel:function(t,e){var i=this;return t=Array.from(t).slice(),Array.each(t,function(t){t.collections.erase(i),t.collections.length||delete t.fireEvent,Array.erase(i._models,t),i.length=i._models.length,e||i.trigger("remove",[t,t.cid])}),this.trigger("reset",[t])},get:function(t){return this[t]},getModelByCID:function(t){var e=null;return this.some(function(i){return i.cid===t&&(e=i)}),e},getModelById:function(t){var e=null;return this.some(function(i){return i.get("id")===t&&(e=i)}),e},getModel:function(t){return this._models[t]},toJSON:function(){var t=function(t){return t.toJSON()};return Array.map(this._models,t)},empty:function(t){return this.removeModel(this._models,t),this.trigger("empty")},sort:function(t){if(!t)return this._models.sort(),this.trigger("sort");if("function"==typeof t)return this.model.sort(t),this.trigger("sort");var e="asc",i=t.split(","),n=function(t,e){return e>t?-1:t>e?1:0};return this._models.sort(function(t,r){var o=0;return Array.some(i,function(i){i=i.trim();var s=i.split(":"),u=s[0],a=s[1]?s[1]:e,c=t.get(u),h=r.get(u),l=n(c,h),d={asc:l,desc:-l};return d[a]===void 0&&(a=e),o=d[a],0!==o}),o}),this.trigger("sort")},reverse:function(){return Array.reverse(this._models),this.trigger("sort")},find:function(e){var i=t.Slick.parse(e),n=[],r=this,o={"=":function(t,e){return t==e},"!=":function(t,e){return t!=e},"^=":function(t,e){return 0===t.indexOf(e)},"*=":function(t,e){return-1!==t.indexOf(e)},"$=":function(t,e){return t.indexOf(e)==t.length-e.length},"*":function(t){return t!==void 0}},s=function(t){return t&&o[t]?o[t]:null},u=function(t){var e=t.key,i=t.value||null,n=t.tag||null,o=s(t.operator);r=r.filter(function(t){var r,s;return n&&e?(r=t.get(n),s=r?r[e]:null):s=n?t.get(n):t.get(e),null!==s&&null!==i&&null!==o?o(s,i):null!=s})};if(i.expressions.length){var a,c,h,l,d,f,p,g,m=i.expressions,v=function(t){return t.tag=g,t};t:for(c=0;l=m[c];c++){for(a=0;d=l[a];a++){if(h=d.attributes,f=d.id,f&&(p={key:"id",value:f,operator:"="},h||(h=[]),h.push(p)),g=d.tag,g&&"*"!=g&&(h||(h=[{key:null,value:"",operator:"*"}]),h=Array.map(h,v)),!h)continue t;Array.each(h,u)}n[c]=r,r=this}}return[].combine(Array.flatten(n))},findOne:function(t){var e=this.find(t);return e.length?e[0]:null}});return Array.each(n,function(t){r.implement(t,function(){return Array.prototype[t].apply(this._models,arguments)})}),r};"function"==typeof define&&define.amd?define("epitome-collection",["./epitome-model","./epitome-events"],e):(t.Epitome||(t.Epitome={Model:{},Events:{}}),t.Epitome.Collection=e(t.Epitome.Model,t.Epitome.Events))}(this),function(t){var e=function(t){var e="no-urlRoot-set",i="fetch:";return new Class({Extends:t,options:{urlRoot:e},initialize:function(t,e){this.setupSync(),this.parent(t,e)},setupSync:function(){var t=this,e=0,n=function(){e++};return this.getRequestId=function(){return e+1},this.request=new Request.JSON({link:"chain",url:this.options.urlRoot,emulation:this.options.emulateREST,onRequest:n,onCancel:function(){this.removeEvents(i+e)},onSuccess:function(n){n=t.postProcessor&&t.postProcessor(n),t.trigger(i+e,[[n]])},onFailure:function(){t.trigger(i+"error",[this.options.method,this.options.url,this.options.data])}}),this.request.setHeader("Accept","application/json,text/plain;q=0.2,text/html;q=0.1"),this},fetch:function(t,e){return e||(e={}),this._throwAwayEvent(function(e){t?(this.empty(),Array.each(e,this.addModel.bind(this))):this.processModels(e),this.trigger("fetch",[e])}),this.request.get(e),this},processModels:function(t){var e=this;Array.each(t,function(t){var i=t.id&&e.getModelById(t.id);i?i.set(t):e.addModel(t)})},_throwAwayEvent:function(t){var e=i+this.getRequestId(),n=this,r={};if(t&&"function"==typeof t)return r[e]=function(e){t.apply(n,e),n.off(r)},this.on(r)}.protect(),postProcessor:function(t){return t}})};"function"==typeof define&&define.amd?define("epitome-collection-sync",["./epitome-collection"],e):(t.Epitome||(t.Epitome={Collection:{}}),t.Epitome.Collection.Sync=e(t.Epitome.Collection))}(this),function(t){(function(){var t={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","/":"&#x2F;"},e=RegExp("["+Object.keys(t).join("")+"]","g");String.implement({escape:function(){return(this+"").replace(e,function(e){return t[e]})}})})();var e=function(){return new Class({options:{evaluate:/<%([\s\S]+?)%>/g,normal:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g,noMatch:/.^/,escaper:/\\|'|\r|\n|\t|\u2028|\u2029/g},Implements:Options,initialize:function(t){this.setOptions(t);var e=this.escapes={"\\":"\\","'":"'",r:"\r",n:"\n",t:"	",u2028:"\u2028",u2029:"\u2029"};return Object.each(e,function(t,e){this[t]=e},e),this.matcher=RegExp([(this.options.escape||this.options.noMatch).source,(this.options.normal||this.options.noMatch).source,(this.options.evaluate||this.options.noMatch).source].join("|")+"|$","g"),this},template:function(t,e,i){var n,r=i?Object.merge(this.options,i):this.options,o=this.escapes,s=r.escaper,u=0,a="__p+='";t.replace(this.matcher,function(e,i,n,r,c){return a+=t.slice(u,c).replace(s,function(t){return"\\"+o[t]}),i&&(a+="'+\n((__t=(obj['"+i+"']))==null?'':String.escape(__t))+\n'"),n&&(a+="'+\n((__t=(obj['"+n+"']))==null?'':__t)+\n'"),r&&(a+="';\n"+r+"\n__p+='"),u=c+e.length,e}),a+="';\n",r.variable||(a="obj=obj||{};with(obj){\n"+a+"}\n"),a="var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};\n"+a+"return __p;\n";try{n=Function(r.variable||"obj",a)}catch(c){throw c.source=a,c}if(e)return n(e);var h=function(t){return n.call(this,t)};return h.source="function("+(r.variable||"obj")+"){\n"+a+"}",h}})};"function"==typeof define&&define.amd?define("epitome-template",["./epitome"],e):(t.Epitome||(t.Epitome={}),t.Epitome.Template=e(t.Epitome))}(this),function(t){var e=function(t,e,i,n){return new Class({Implements:[n],element:null,collection:null,model:null,options:{template:"",events:{}},initialize:function(t){return t&&t.collection&&(this.setCollection(t.collection),delete t.collection),t&&t.model&&(this.setModel(t.model),delete t.model),this.setOptions(t),this.options.element&&(this.setElement(this.options.element,this.options.events),delete this.options.element),this.trigger("ready")},setElement:function(t,e){return this.element&&this.detachEvents()&&this.destroy(),this.element=document.id(t),e&&this.attachEvents(e),this},setCollection:function(t){var e=this,n=function(t){return function(){e.trigger(t+":collection",arguments)}};return instanceOf(t,i)&&(this.collection=t,this.collection.on({change:n("change"),fetch:n("fetch"),add:n("add"),remove:n("remove"),sort:n("sort"),reset:n("reset"),error:n("error")})),this},setModel:function(t){var i=this,n=function(t){return function(){i.trigger(t+":model",arguments)}};return instanceOf(t,e)&&(this.model=t,this.model.on({change:n("change"),destroy:n("destroy"),empty:n("empty"),error:n("error")})),this},attachEvents:function(t){var e=this;return Object.each(t,function(t,i){e.element.addEvent(i,function(){e.trigger(t,arguments)})}),this.element.store("attachedEvents",t),this},detachEvents:function(){var t=this.element.retrieve("attachedEvents");return t&&this.element.removeEvents(t).eliminate("attachedEvents"),this},template:function(e,i){i=i||this.options.template;var n=this.Template||(this.Template=new t);return n.template(i,e)},render:function(){return this.trigger("render")},empty:function(t){return t?this.element.empty():this.element.set("html",""),this.trigger("empty")},dispose:function(){return this.element.dispose(),this.trigger("dispose")},destroy:function(){return this.element.destroy(),this.trigger("destroy")}})};"function"==typeof define&&define.amd?define("epitome-view",["./epitome-template","./epitome-model","./epitome-collection","./epitome-events"],e):(t.Epitome||(t.Epitome={Template:{},Model:{},Collection:{},Events:{}}),t.Epitome.View=e(t.Epitome.Template,t.Epitome.Model,t.Epitome.Collection,t.Epitome.Events))}(this),function(t){var e=function(t){var e,i="hashchange",n="on"+i in window,r=[window,document],o=function(t){for(var e,i={},n=/([^&=]+)=([^&]*)/g;e=n.exec(t);)i[decodeURIComponent(e[1])]=decodeURIComponent(e[2]);return i};return Element.Events.hashchange={onAdd:function(){var t=location.hash,o=function(){t!==location.hash&&(t=location.hash,r.invoke("fireEvent",i,0===t.indexOf("#")?t.substr(1):t))};n&&(window.onhashchange=o)||(e=o.periodical(100))},onRemove:function(){n&&(window.onhashchange=null)||clearInterval(e)}},new Class({Implements:[t],options:{triggerOnLoad:!0},routes:{},boundEvents:{},initialize:function(t){var e=this;this.setOptions(t),this.options.routes&&(this.routes=this.options.routes),window.addEvent(i,function(){var t,i=location.hash,n=i.split("?")[0],r=i.split("?")[1]||"",s=!0;for(t in e.routes){var u=[],a=e.normalize(t,u,!0,!1),c=a.exec(n),h=!1;if(c){s=!1,e.req=c[0];var l=c.slice(1),d={};Array.each(l,function(t,e){u[e]!==void 0&&(d[u[e].name]=t)}),e.route=t,e.param=d||{},e.query=r&&o(r),h=e.routes[t],e.trigger("before",h),h&&e.$events[h]?(e.trigger(h+":before"),e.trigger(h,Object.values(e.param))):e.trigger("error",["Route",h,"is undefined"].join(" ")),e.trigger("after",h),h&&e.trigger(h+":after");break}}s&&e.trigger("undefined")}),this.trigger("ready"),this.options.triggerOnLoad&&window.fireEvent(i)},navigate:function(t,e){location.hash===t&&e?window.fireEvent(i):location.hash=t},normalize:function(t,e,i,n){return t instanceof RegExp?t:(t=t.concat(n?"":"/?").replace(/\/\(/g,"(?:/").replace(/(\/)?(\.)?:(\w+)(?:(\(.*?\)))?(\?)?/g,function(t,i,n,r,o,s){return e.push({name:r,optional:!!s}),i=i||"",[s?"":i,"(?:",s?i:"",(n||"")+(o||n&&"([^/.]+?)"||"([^/]+?)")+")",s||""].join("")}).replace(/([\/.])/g,"\\$1").replace(/\*/g,"(.*)"),RegExp("^"+t+"$",i?"":"i"))},addRoute:function(t){return t&&t.route&&t.id&&t.events?t.id.length?this.routes[t.route]?this.trigger("error",'Route "{route}" or id "{id}" already exists, aborting'.substitute(t)):(this.routes[t.route]=t.id,this.on(this.boundEvents[t.route]=t.events),this.trigger("route:add",t)):this.trigger("error","Route id cannot be empty, aborting"):this.trigger("error","Please include route, id and events in the argument object when adding a route")},removeRoute:function(t){return t&&this.routes[t]&&this.boundEvents[t]?(this.off(this.boundEvents[t]),delete this.routes[t],delete this.boundEvents[t],this.trigger("route:remove",t)):this.trigger("error","Could not find route or route is not removable")}})};"function"==typeof define&&define.amd?define("epitome-router",["./epitome-events"],e):(t.Epitome||(t.Epitome={Events:{}}),t.Epitome.Router=e(t.Epitome.Events))}(this);
\ No newline at end of file
diff --git a/labs/architecture-examples/epitome/js/app.js b/labs/architecture-examples/epitome/js/app.js
index 2c455f05db..2bd39167c9 100644
--- a/labs/architecture-examples/epitome/js/app.js
+++ b/labs/architecture-examples/epitome/js/app.js
@@ -45,10 +45,7 @@
 				App.router.showActiveFilter();
 			};
 
-			this.addEvents({
-				'add:collection': proxy,
-				'change:collection': proxy
-			});
+			this.on('add:collection change:collection', proxy);
 		}
 	});