diff --git a/dist/commonjs/router/handler-info.js b/dist/commonjs/router/handler-info.js
index 105c057d..a7641696 100644
--- a/dist/commonjs/router/handler-info.js
+++ b/dist/commonjs/router/handler-info.js
@@ -3,6 +3,7 @@ var bind = require("./utils").bind;
 var merge = require("./utils").merge;
 var serialize = require("./utils").serialize;
 var promiseLabel = require("./utils").promiseLabel;
+var applyHook = require("./utils").applyHook;
 var Promise = require("rsvp/promise")["default"];
 
 function HandlerInfo(_props) {
@@ -89,14 +90,13 @@ HandlerInfo.prototype = {
     }
     args.push(payload);
 
-    var handler = this.handler;
-    var result = handler[hookName] && handler[hookName].apply(handler, args);
+    var result = applyHook(this.handler, hookName, args);
 
     if (result && result.isTransition) {
       result = null;
     }
 
-    return Promise.resolve(result, null, this.promiseLabel("Resolve value returned from one of the model hooks"));
+    return Promise.resolve(result, this.promiseLabel("Resolve value returned from one of the model hooks"));
   },
 
   // overridden by subclasses
diff --git a/dist/commonjs/router/handler-info/unresolved-handler-info-by-param.js b/dist/commonjs/router/handler-info/unresolved-handler-info-by-param.js
index 5437a026..aec960b5 100644
--- a/dist/commonjs/router/handler-info/unresolved-handler-info-by-param.js
+++ b/dist/commonjs/router/handler-info/unresolved-handler-info-by-param.js
@@ -1,5 +1,6 @@
 "use strict";
 var HandlerInfo = require("../handler-info")["default"];
+var resolveHook = require("router/utils").resolveHook;
 var merge = require("router/utils").merge;
 var subclass = require("router/utils").subclass;
 var promiseLabel = require("router/utils").promiseLabel;
@@ -18,8 +19,9 @@ var UnresolvedHandlerInfoByParam = subclass (HandlerInfo, {
       fullParams.queryParams = payload.queryParams;
     }
 
-    var hookName = typeof this.handler.deserialize === 'function' ?
-                   'deserialize' : 'model';
+    var handler = this.handler;
+    var hookName = resolveHook(handler, 'deserialize') ||
+                   resolveHook(handler, 'model');
 
     return this.runSharedModelHook(payload, hookName, [fullParams]);
   }
diff --git a/dist/commonjs/router/router.js b/dist/commonjs/router/router.js
index ca58eb2b..205f16e0 100644
--- a/dist/commonjs/router/router.js
+++ b/dist/commonjs/router/router.js
@@ -10,6 +10,7 @@ var serialize = require("./utils").serialize;
 var extractQueryParams = require("./utils").extractQueryParams;
 var getChangelist = require("./utils").getChangelist;
 var promiseLabel = require("./utils").promiseLabel;
+var callHook = require("./utils").callHook;
 var TransitionState = require("./transition-state")["default"];
 var logAbort = require("./transition").logAbort;
 var Transition = require("./transition").Transition;
@@ -153,11 +154,9 @@ Router.prototype = {
   */
   reset: function() {
     if (this.state) {
-      forEach(this.state.handlerInfos, function(handlerInfo) {
+      forEach(this.state.handlerInfos.slice().reverse(), function(handlerInfo) {
         var handler = handlerInfo.handler;
-        if (handler.exit) {
-          handler.exit();
-        }
+        callHook(handler, 'exit');
       });
     }
 
@@ -221,7 +220,7 @@ Router.prototype = {
   },
 
   intermediateTransitionTo: function(name) {
-    doTransition(this, arguments, true);
+    return doTransition(this, arguments, true);
   },
 
   refresh: function(pivotHandler) {
@@ -441,8 +440,9 @@ function setupContexts(router, newState, transition) {
   forEach(partition.exited, function(handlerInfo) {
     var handler = handlerInfo.handler;
     delete handler.context;
-    if (handler.reset) { handler.reset(true, transition); }
-    if (handler.exit) { handler.exit(transition); }
+
+    callHook(handler, 'reset', true, transition);
+    callHook(handler, 'exit', transition);
   });
 
   var oldState = router.oldState = router.state;
@@ -452,7 +452,7 @@ function setupContexts(router, newState, transition) {
   try {
     forEach(partition.reset, function(handlerInfo) {
       var handler = handlerInfo.handler;
-      if (handler.reset) { handler.reset(false, transition); }
+      callHook(handler, 'reset', false, transition);
     });
 
     forEach(partition.updatedContext, function(handlerInfo) {
@@ -483,15 +483,15 @@ function handlerEnteredOrUpdated(currentHandlerInfos, handlerInfo, enter, transi
   var handler = handlerInfo.handler,
       context = handlerInfo.context;
 
-  if (enter && handler.enter) { handler.enter(transition); }
+  callHook(handler, 'enter', transition);
   if (transition && transition.isAborted) {
     throw new TransitionAborted();
   }
 
   handler.context = context;
-  if (handler.contextDidChange) { handler.contextDidChange(); }
+  callHook(handler, 'contextDidChange');
 
-  if (handler.setup) { handler.setup(context, transition); }
+  callHook(handler, 'setup', context, transition);
   if (transition && transition.isAborted) {
     throw new TransitionAborted();
   }
@@ -554,7 +554,7 @@ function partitionHandlers(oldState, newState) {
         unchanged: []
       };
 
-  var handlerChanged, contextChanged, i, l;
+  var handlerChanged, contextChanged = false, i, l;
 
   for (i=0, l=newHandlers.length; i<l; i++) {
     var oldHandler = oldHandlers[i], newHandler = newHandlers[i];
@@ -772,9 +772,10 @@ function notifyExistingHandlers(router, newState, newTransition) {
   var oldHandlers = router.state.handlerInfos,
       changing = [],
       leavingIndex = null,
-      leaving, leavingChecker, i, oldHandler, newHandler;
+      leaving, leavingChecker, i, oldHandlerLen, oldHandler, newHandler;
 
-  for (i = 0; i < oldHandlers.length; i++) {
+  oldHandlerLen = oldHandlers.length;
+  for (i = 0; i < oldHandlerLen; i++) {
     oldHandler = oldHandlers[i];
     newHandler = newState.handlerInfos[i];
 
@@ -789,9 +790,9 @@ function notifyExistingHandlers(router, newState, newTransition) {
   }
 
   if (leavingIndex !== null) {
-    leaving = oldHandlers.slice(leavingIndex, oldHandlers.length);
+    leaving = oldHandlers.slice(leavingIndex, oldHandlerLen);
     leavingChecker = function(name) {
-      for (var h = 0; h < leaving.length; h++) {
+      for (var h = 0, len = leaving.length; h < len; h++) {
         if (leaving[h].name === name) {
           return true;
         }
diff --git a/dist/commonjs/router/transition-intent/named-transition-intent.js b/dist/commonjs/router/transition-intent/named-transition-intent.js
index 9384205a..49109fcd 100644
--- a/dist/commonjs/router/transition-intent/named-transition-intent.js
+++ b/dist/commonjs/router/transition-intent/named-transition-intent.js
@@ -34,7 +34,7 @@ exports["default"] = subclass(TransitionIntent, {
 
   applyToHandlers: function(oldState, handlers, getHandler, targetRouteName, isIntermediate, checkingIfActive) {
 
-    var i;
+    var i, len;
     var newState = new TransitionState();
     var objects = this.contexts.slice(0);
 
@@ -42,7 +42,7 @@ exports["default"] = subclass(TransitionIntent, {
 
     // Pivot handlers are provided for refresh transitions
     if (this.pivotHandler) {
-      for (i = 0; i < handlers.length; ++i) {
+      for (i = 0, len = handlers.length; i < len; ++i) {
         if (getHandler(handlers[i].handler) === this.pivotHandler) {
           invalidateIndex = i;
           break;
diff --git a/dist/commonjs/router/transition-state.js b/dist/commonjs/router/transition-state.js
index 1b39e9b0..66a3480e 100644
--- a/dist/commonjs/router/transition-state.js
+++ b/dist/commonjs/router/transition-state.js
@@ -2,6 +2,7 @@
 var ResolvedHandlerInfo = require("./handler-info").ResolvedHandlerInfo;
 var forEach = require("./utils").forEach;
 var promiseLabel = require("./utils").promiseLabel;
+var callHook = require("./utils").callHook;
 var Promise = require("rsvp/promise")["default"];
 
 function TransitionState(other) {
@@ -46,13 +47,13 @@ TransitionState.prototype = {
     .then(resolveOneHandlerInfo, null, this.promiseLabel('Resolve handler'))['catch'](handleError, this.promiseLabel('Handle error'));
 
     function innerShouldContinue() {
-      return Promise.resolve(shouldContinue(), promiseLabel("Check if should continue"))['catch'](function(reason) {
+      return Promise.resolve(shouldContinue(), currentState.promiseLabel("Check if should continue"))['catch'](function(reason) {
         // We distinguish between errors that occurred
         // during resolution (e.g. beforeModel/model/afterModel),
         // and aborts due to a rejecting promise from shouldContinue().
         wasAborted = true;
         return Promise.reject(reason);
-      }, promiseLabel("Handle abort"));
+      }, currentState.promiseLabel("Handle abort"));
     }
 
     function handleError(error) {
@@ -82,14 +83,12 @@ TransitionState.prototype = {
         // routes don't re-run the model hooks for this
         // already-resolved route.
         var handler = resolvedHandlerInfo.handler;
-        if (handler && handler.redirect) {
-          handler.redirect(resolvedHandlerInfo.context, payload);
-        }
+        callHook(handler, 'redirect', resolvedHandlerInfo.context, payload);
       }
 
       // Proceed after ensuring that the redirect hook
       // didn't abort this transition by transitioning elsewhere.
-      return innerShouldContinue().then(resolveOneHandlerInfo, null, promiseLabel('Resolve handler'));
+      return innerShouldContinue().then(resolveOneHandlerInfo, null, currentState.promiseLabel('Resolve handler'));
     }
 
     function resolveOneHandlerInfo() {
@@ -105,7 +104,7 @@ TransitionState.prototype = {
       var handlerInfo = currentState.handlerInfos[payload.resolveIndex];
 
       return handlerInfo.resolve(innerShouldContinue, payload)
-                        .then(proceed, null, promiseLabel('Proceed'));
+                        .then(proceed, null, currentState.promiseLabel('Proceed'));
     }
   }
 };
diff --git a/dist/commonjs/router/transition.js b/dist/commonjs/router/transition.js
index bfd1ab48..495ea1a9 100644
--- a/dist/commonjs/router/transition.js
+++ b/dist/commonjs/router/transition.js
@@ -36,7 +36,7 @@ function Transition(router, intent, state, error) {
 
     var len = state.handlerInfos.length;
     if (len) {
-      this.targetName = state.handlerInfos[state.handlerInfos.length-1].name;
+      this.targetName = state.handlerInfos[len-1].name;
     }
 
     for (var i = 0; i < len; ++i) {
diff --git a/dist/commonjs/router/utils.js b/dist/commonjs/router/utils.js
index c1e98023..7a534d3c 100644
--- a/dist/commonjs/router/utils.js
+++ b/dist/commonjs/router/utils.js
@@ -187,7 +187,29 @@ exports.promiseLabel = promiseLabel;function subclass(parentConstructor, proto)
   return C;
 }
 
-exports.subclass = subclass;exports.merge = merge;
+exports.subclass = subclass;function resolveHook(obj, hookName) {
+  if (!obj) { return; }
+  var underscored = "_" + hookName;
+  return obj[underscored] && underscored ||
+         obj[hookName] && hookName;
+}
+
+function callHook(obj, hookName) {
+  var args = slice.call(arguments, 2);
+  return applyHook(obj, hookName, args);
+}
+
+function applyHook(obj, _hookName, args) {
+  var hookName = resolveHook(obj, _hookName);
+  if (hookName) {
+    return obj[hookName].apply(obj, args);
+  }
+}
+
+exports.merge = merge;
 exports.slice = slice;
 exports.isParam = isParam;
-exports.coerceQueryParamsToString = coerceQueryParamsToString;
\ No newline at end of file
+exports.coerceQueryParamsToString = coerceQueryParamsToString;
+exports.callHook = callHook;
+exports.resolveHook = resolveHook;
+exports.applyHook = applyHook;
\ No newline at end of file
diff --git a/dist/router.amd.js b/dist/router.amd.js
index 7418cbdb..5008bc39 100644
--- a/dist/router.amd.js
+++ b/dist/router.amd.js
@@ -6,6 +6,7 @@ define("router/handler-info",
     var merge = __dependency1__.merge;
     var serialize = __dependency1__.serialize;
     var promiseLabel = __dependency1__.promiseLabel;
+    var applyHook = __dependency1__.applyHook;
     var Promise = __dependency2__["default"];
 
     function HandlerInfo(_props) {
@@ -92,14 +93,13 @@ define("router/handler-info",
         }
         args.push(payload);
 
-        var handler = this.handler;
-        var result = handler[hookName] && handler[hookName].apply(handler, args);
+        var result = applyHook(this.handler, hookName, args);
 
         if (result && result.isTransition) {
           result = null;
         }
 
-        return Promise.resolve(result, null, this.promiseLabel("Resolve value returned from one of the model hooks"));
+        return Promise.resolve(result, this.promiseLabel("Resolve value returned from one of the model hooks"));
       },
 
       // overridden by subclasses
@@ -296,6 +296,7 @@ define("router/handler-info/unresolved-handler-info-by-param",
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var HandlerInfo = __dependency1__["default"];
+    var resolveHook = __dependency2__.resolveHook;
     var merge = __dependency2__.merge;
     var subclass = __dependency2__.subclass;
     var promiseLabel = __dependency2__.promiseLabel;
@@ -314,8 +315,9 @@ define("router/handler-info/unresolved-handler-info-by-param",
           fullParams.queryParams = payload.queryParams;
         }
 
-        var hookName = typeof this.handler.deserialize === 'function' ?
-                       'deserialize' : 'model';
+        var handler = this.handler;
+        var hookName = resolveHook(handler, 'deserialize') ||
+                       resolveHook(handler, 'model');
 
         return this.runSharedModelHook(payload, hookName, [fullParams]);
       }
@@ -338,6 +340,7 @@ define("router/router",
     var extractQueryParams = __dependency3__.extractQueryParams;
     var getChangelist = __dependency3__.getChangelist;
     var promiseLabel = __dependency3__.promiseLabel;
+    var callHook = __dependency3__.callHook;
     var TransitionState = __dependency4__["default"];
     var logAbort = __dependency5__.logAbort;
     var Transition = __dependency5__.Transition;
@@ -481,11 +484,9 @@ define("router/router",
       */
       reset: function() {
         if (this.state) {
-          forEach(this.state.handlerInfos, function(handlerInfo) {
+          forEach(this.state.handlerInfos.slice().reverse(), function(handlerInfo) {
             var handler = handlerInfo.handler;
-            if (handler.exit) {
-              handler.exit();
-            }
+            callHook(handler, 'exit');
           });
         }
 
@@ -549,7 +550,7 @@ define("router/router",
       },
 
       intermediateTransitionTo: function(name) {
-        doTransition(this, arguments, true);
+        return doTransition(this, arguments, true);
       },
 
       refresh: function(pivotHandler) {
@@ -769,8 +770,9 @@ define("router/router",
       forEach(partition.exited, function(handlerInfo) {
         var handler = handlerInfo.handler;
         delete handler.context;
-        if (handler.reset) { handler.reset(true, transition); }
-        if (handler.exit) { handler.exit(transition); }
+
+        callHook(handler, 'reset', true, transition);
+        callHook(handler, 'exit', transition);
       });
 
       var oldState = router.oldState = router.state;
@@ -780,7 +782,7 @@ define("router/router",
       try {
         forEach(partition.reset, function(handlerInfo) {
           var handler = handlerInfo.handler;
-          if (handler.reset) { handler.reset(false, transition); }
+          callHook(handler, 'reset', false, transition);
         });
 
         forEach(partition.updatedContext, function(handlerInfo) {
@@ -811,15 +813,15 @@ define("router/router",
       var handler = handlerInfo.handler,
           context = handlerInfo.context;
 
-      if (enter && handler.enter) { handler.enter(transition); }
+      callHook(handler, 'enter', transition);
       if (transition && transition.isAborted) {
         throw new TransitionAborted();
       }
 
       handler.context = context;
-      if (handler.contextDidChange) { handler.contextDidChange(); }
+      callHook(handler, 'contextDidChange');
 
-      if (handler.setup) { handler.setup(context, transition); }
+      callHook(handler, 'setup', context, transition);
       if (transition && transition.isAborted) {
         throw new TransitionAborted();
       }
@@ -882,7 +884,7 @@ define("router/router",
             unchanged: []
           };
 
-      var handlerChanged, contextChanged, i, l;
+      var handlerChanged, contextChanged = false, i, l;
 
       for (i=0, l=newHandlers.length; i<l; i++) {
         var oldHandler = oldHandlers[i], newHandler = newHandlers[i];
@@ -1100,9 +1102,10 @@ define("router/router",
       var oldHandlers = router.state.handlerInfos,
           changing = [],
           leavingIndex = null,
-          leaving, leavingChecker, i, oldHandler, newHandler;
+          leaving, leavingChecker, i, oldHandlerLen, oldHandler, newHandler;
 
-      for (i = 0; i < oldHandlers.length; i++) {
+      oldHandlerLen = oldHandlers.length;
+      for (i = 0; i < oldHandlerLen; i++) {
         oldHandler = oldHandlers[i];
         newHandler = newState.handlerInfos[i];
 
@@ -1117,9 +1120,9 @@ define("router/router",
       }
 
       if (leavingIndex !== null) {
-        leaving = oldHandlers.slice(leavingIndex, oldHandlers.length);
+        leaving = oldHandlers.slice(leavingIndex, oldHandlerLen);
         leavingChecker = function(name) {
-          for (var h = 0; h < leaving.length; h++) {
+          for (var h = 0, len = leaving.length; h < len; h++) {
             if (leaving[h].name === name) {
               return true;
             }
@@ -1198,7 +1201,7 @@ define("router/transition-intent/named-transition-intent",
 
       applyToHandlers: function(oldState, handlers, getHandler, targetRouteName, isIntermediate, checkingIfActive) {
 
-        var i;
+        var i, len;
         var newState = new TransitionState();
         var objects = this.contexts.slice(0);
 
@@ -1206,7 +1209,7 @@ define("router/transition-intent/named-transition-intent",
 
         // Pivot handlers are provided for refresh transitions
         if (this.pivotHandler) {
-          for (i = 0; i < handlers.length; ++i) {
+          for (i = 0, len = handlers.length; i < len; ++i) {
             if (getHandler(handlers[i].handler) === this.pivotHandler) {
               invalidateIndex = i;
               break;
@@ -1437,6 +1440,7 @@ define("router/transition-state",
     var ResolvedHandlerInfo = __dependency1__.ResolvedHandlerInfo;
     var forEach = __dependency2__.forEach;
     var promiseLabel = __dependency2__.promiseLabel;
+    var callHook = __dependency2__.callHook;
     var Promise = __dependency3__["default"];
 
     function TransitionState(other) {
@@ -1481,13 +1485,13 @@ define("router/transition-state",
         .then(resolveOneHandlerInfo, null, this.promiseLabel('Resolve handler'))['catch'](handleError, this.promiseLabel('Handle error'));
 
         function innerShouldContinue() {
-          return Promise.resolve(shouldContinue(), promiseLabel("Check if should continue"))['catch'](function(reason) {
+          return Promise.resolve(shouldContinue(), currentState.promiseLabel("Check if should continue"))['catch'](function(reason) {
             // We distinguish between errors that occurred
             // during resolution (e.g. beforeModel/model/afterModel),
             // and aborts due to a rejecting promise from shouldContinue().
             wasAborted = true;
             return Promise.reject(reason);
-          }, promiseLabel("Handle abort"));
+          }, currentState.promiseLabel("Handle abort"));
         }
 
         function handleError(error) {
@@ -1517,14 +1521,12 @@ define("router/transition-state",
             // routes don't re-run the model hooks for this
             // already-resolved route.
             var handler = resolvedHandlerInfo.handler;
-            if (handler && handler.redirect) {
-              handler.redirect(resolvedHandlerInfo.context, payload);
-            }
+            callHook(handler, 'redirect', resolvedHandlerInfo.context, payload);
           }
 
           // Proceed after ensuring that the redirect hook
           // didn't abort this transition by transitioning elsewhere.
-          return innerShouldContinue().then(resolveOneHandlerInfo, null, promiseLabel('Resolve handler'));
+          return innerShouldContinue().then(resolveOneHandlerInfo, null, currentState.promiseLabel('Resolve handler'));
         }
 
         function resolveOneHandlerInfo() {
@@ -1540,7 +1542,7 @@ define("router/transition-state",
           var handlerInfo = currentState.handlerInfos[payload.resolveIndex];
 
           return handlerInfo.resolve(innerShouldContinue, payload)
-                            .then(proceed, null, promiseLabel('Proceed'));
+                            .then(proceed, null, currentState.promiseLabel('Proceed'));
         }
       }
     };
@@ -1588,7 +1590,7 @@ define("router/transition",
 
         var len = state.handlerInfos.length;
         if (len) {
-          this.targetName = state.handlerInfos[state.handlerInfos.length-1].name;
+          this.targetName = state.handlerInfos[len-1].name;
         }
 
         for (var i = 0; i < len; ++i) {
@@ -2013,10 +2015,32 @@ define("router/utils",
       return C;
     }
 
-    __exports__.subclass = subclass;__exports__.merge = merge;
+    __exports__.subclass = subclass;function resolveHook(obj, hookName) {
+      if (!obj) { return; }
+      var underscored = "_" + hookName;
+      return obj[underscored] && underscored ||
+             obj[hookName] && hookName;
+    }
+
+    function callHook(obj, hookName) {
+      var args = slice.call(arguments, 2);
+      return applyHook(obj, hookName, args);
+    }
+
+    function applyHook(obj, _hookName, args) {
+      var hookName = resolveHook(obj, _hookName);
+      if (hookName) {
+        return obj[hookName].apply(obj, args);
+      }
+    }
+
+    __exports__.merge = merge;
     __exports__.slice = slice;
     __exports__.isParam = isParam;
     __exports__.coerceQueryParamsToString = coerceQueryParamsToString;
+    __exports__.callHook = callHook;
+    __exports__.resolveHook = resolveHook;
+    __exports__.applyHook = applyHook;
   });
 define("router",
   ["./router/router","exports"],
diff --git a/dist/router.js b/dist/router.js
index 3ea26219..a2dea01e 100644
--- a/dist/router.js
+++ b/dist/router.js
@@ -60,6 +60,7 @@ define("router/handler-info",
     var merge = __dependency1__.merge;
     var serialize = __dependency1__.serialize;
     var promiseLabel = __dependency1__.promiseLabel;
+    var applyHook = __dependency1__.applyHook;
     var Promise = __dependency2__["default"];
 
     function HandlerInfo(_props) {
@@ -146,14 +147,13 @@ define("router/handler-info",
         }
         args.push(payload);
 
-        var handler = this.handler;
-        var result = handler[hookName] && handler[hookName].apply(handler, args);
+        var result = applyHook(this.handler, hookName, args);
 
         if (result && result.isTransition) {
           result = null;
         }
 
-        return Promise.resolve(result, null, this.promiseLabel("Resolve value returned from one of the model hooks"));
+        return Promise.resolve(result, this.promiseLabel("Resolve value returned from one of the model hooks"));
       },
 
       // overridden by subclasses
@@ -350,6 +350,7 @@ define("router/handler-info/unresolved-handler-info-by-param",
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var HandlerInfo = __dependency1__["default"];
+    var resolveHook = __dependency2__.resolveHook;
     var merge = __dependency2__.merge;
     var subclass = __dependency2__.subclass;
     var promiseLabel = __dependency2__.promiseLabel;
@@ -368,8 +369,9 @@ define("router/handler-info/unresolved-handler-info-by-param",
           fullParams.queryParams = payload.queryParams;
         }
 
-        var hookName = typeof this.handler.deserialize === 'function' ?
-                       'deserialize' : 'model';
+        var handler = this.handler;
+        var hookName = resolveHook(handler, 'deserialize') ||
+                       resolveHook(handler, 'model');
 
         return this.runSharedModelHook(payload, hookName, [fullParams]);
       }
@@ -392,6 +394,7 @@ define("router/router",
     var extractQueryParams = __dependency3__.extractQueryParams;
     var getChangelist = __dependency3__.getChangelist;
     var promiseLabel = __dependency3__.promiseLabel;
+    var callHook = __dependency3__.callHook;
     var TransitionState = __dependency4__["default"];
     var logAbort = __dependency5__.logAbort;
     var Transition = __dependency5__.Transition;
@@ -535,11 +538,9 @@ define("router/router",
       */
       reset: function() {
         if (this.state) {
-          forEach(this.state.handlerInfos, function(handlerInfo) {
+          forEach(this.state.handlerInfos.slice().reverse(), function(handlerInfo) {
             var handler = handlerInfo.handler;
-            if (handler.exit) {
-              handler.exit();
-            }
+            callHook(handler, 'exit');
           });
         }
 
@@ -603,7 +604,7 @@ define("router/router",
       },
 
       intermediateTransitionTo: function(name) {
-        doTransition(this, arguments, true);
+        return doTransition(this, arguments, true);
       },
 
       refresh: function(pivotHandler) {
@@ -823,8 +824,9 @@ define("router/router",
       forEach(partition.exited, function(handlerInfo) {
         var handler = handlerInfo.handler;
         delete handler.context;
-        if (handler.reset) { handler.reset(true, transition); }
-        if (handler.exit) { handler.exit(transition); }
+
+        callHook(handler, 'reset', true, transition);
+        callHook(handler, 'exit', transition);
       });
 
       var oldState = router.oldState = router.state;
@@ -834,7 +836,7 @@ define("router/router",
       try {
         forEach(partition.reset, function(handlerInfo) {
           var handler = handlerInfo.handler;
-          if (handler.reset) { handler.reset(false, transition); }
+          callHook(handler, 'reset', false, transition);
         });
 
         forEach(partition.updatedContext, function(handlerInfo) {
@@ -865,15 +867,15 @@ define("router/router",
       var handler = handlerInfo.handler,
           context = handlerInfo.context;
 
-      if (enter && handler.enter) { handler.enter(transition); }
+      callHook(handler, 'enter', transition);
       if (transition && transition.isAborted) {
         throw new TransitionAborted();
       }
 
       handler.context = context;
-      if (handler.contextDidChange) { handler.contextDidChange(); }
+      callHook(handler, 'contextDidChange');
 
-      if (handler.setup) { handler.setup(context, transition); }
+      callHook(handler, 'setup', context, transition);
       if (transition && transition.isAborted) {
         throw new TransitionAborted();
       }
@@ -936,7 +938,7 @@ define("router/router",
             unchanged: []
           };
 
-      var handlerChanged, contextChanged, i, l;
+      var handlerChanged, contextChanged = false, i, l;
 
       for (i=0, l=newHandlers.length; i<l; i++) {
         var oldHandler = oldHandlers[i], newHandler = newHandlers[i];
@@ -1154,9 +1156,10 @@ define("router/router",
       var oldHandlers = router.state.handlerInfos,
           changing = [],
           leavingIndex = null,
-          leaving, leavingChecker, i, oldHandler, newHandler;
+          leaving, leavingChecker, i, oldHandlerLen, oldHandler, newHandler;
 
-      for (i = 0; i < oldHandlers.length; i++) {
+      oldHandlerLen = oldHandlers.length;
+      for (i = 0; i < oldHandlerLen; i++) {
         oldHandler = oldHandlers[i];
         newHandler = newState.handlerInfos[i];
 
@@ -1171,9 +1174,9 @@ define("router/router",
       }
 
       if (leavingIndex !== null) {
-        leaving = oldHandlers.slice(leavingIndex, oldHandlers.length);
+        leaving = oldHandlers.slice(leavingIndex, oldHandlerLen);
         leavingChecker = function(name) {
-          for (var h = 0; h < leaving.length; h++) {
+          for (var h = 0, len = leaving.length; h < len; h++) {
             if (leaving[h].name === name) {
               return true;
             }
@@ -1252,7 +1255,7 @@ define("router/transition-intent/named-transition-intent",
 
       applyToHandlers: function(oldState, handlers, getHandler, targetRouteName, isIntermediate, checkingIfActive) {
 
-        var i;
+        var i, len;
         var newState = new TransitionState();
         var objects = this.contexts.slice(0);
 
@@ -1260,7 +1263,7 @@ define("router/transition-intent/named-transition-intent",
 
         // Pivot handlers are provided for refresh transitions
         if (this.pivotHandler) {
-          for (i = 0; i < handlers.length; ++i) {
+          for (i = 0, len = handlers.length; i < len; ++i) {
             if (getHandler(handlers[i].handler) === this.pivotHandler) {
               invalidateIndex = i;
               break;
@@ -1491,6 +1494,7 @@ define("router/transition-state",
     var ResolvedHandlerInfo = __dependency1__.ResolvedHandlerInfo;
     var forEach = __dependency2__.forEach;
     var promiseLabel = __dependency2__.promiseLabel;
+    var callHook = __dependency2__.callHook;
     var Promise = __dependency3__["default"];
 
     function TransitionState(other) {
@@ -1535,13 +1539,13 @@ define("router/transition-state",
         .then(resolveOneHandlerInfo, null, this.promiseLabel('Resolve handler'))['catch'](handleError, this.promiseLabel('Handle error'));
 
         function innerShouldContinue() {
-          return Promise.resolve(shouldContinue(), promiseLabel("Check if should continue"))['catch'](function(reason) {
+          return Promise.resolve(shouldContinue(), currentState.promiseLabel("Check if should continue"))['catch'](function(reason) {
             // We distinguish between errors that occurred
             // during resolution (e.g. beforeModel/model/afterModel),
             // and aborts due to a rejecting promise from shouldContinue().
             wasAborted = true;
             return Promise.reject(reason);
-          }, promiseLabel("Handle abort"));
+          }, currentState.promiseLabel("Handle abort"));
         }
 
         function handleError(error) {
@@ -1571,14 +1575,12 @@ define("router/transition-state",
             // routes don't re-run the model hooks for this
             // already-resolved route.
             var handler = resolvedHandlerInfo.handler;
-            if (handler && handler.redirect) {
-              handler.redirect(resolvedHandlerInfo.context, payload);
-            }
+            callHook(handler, 'redirect', resolvedHandlerInfo.context, payload);
           }
 
           // Proceed after ensuring that the redirect hook
           // didn't abort this transition by transitioning elsewhere.
-          return innerShouldContinue().then(resolveOneHandlerInfo, null, promiseLabel('Resolve handler'));
+          return innerShouldContinue().then(resolveOneHandlerInfo, null, currentState.promiseLabel('Resolve handler'));
         }
 
         function resolveOneHandlerInfo() {
@@ -1594,7 +1596,7 @@ define("router/transition-state",
           var handlerInfo = currentState.handlerInfos[payload.resolveIndex];
 
           return handlerInfo.resolve(innerShouldContinue, payload)
-                            .then(proceed, null, promiseLabel('Proceed'));
+                            .then(proceed, null, currentState.promiseLabel('Proceed'));
         }
       }
     };
@@ -1642,7 +1644,7 @@ define("router/transition",
 
         var len = state.handlerInfos.length;
         if (len) {
-          this.targetName = state.handlerInfos[state.handlerInfos.length-1].name;
+          this.targetName = state.handlerInfos[len-1].name;
         }
 
         for (var i = 0; i < len; ++i) {
@@ -2067,10 +2069,32 @@ define("router/utils",
       return C;
     }
 
-    __exports__.subclass = subclass;__exports__.merge = merge;
+    __exports__.subclass = subclass;function resolveHook(obj, hookName) {
+      if (!obj) { return; }
+      var underscored = "_" + hookName;
+      return obj[underscored] && underscored ||
+             obj[hookName] && hookName;
+    }
+
+    function callHook(obj, hookName) {
+      var args = slice.call(arguments, 2);
+      return applyHook(obj, hookName, args);
+    }
+
+    function applyHook(obj, _hookName, args) {
+      var hookName = resolveHook(obj, _hookName);
+      if (hookName) {
+        return obj[hookName].apply(obj, args);
+      }
+    }
+
+    __exports__.merge = merge;
     __exports__.slice = slice;
     __exports__.isParam = isParam;
     __exports__.coerceQueryParamsToString = coerceQueryParamsToString;
+    __exports__.callHook = callHook;
+    __exports__.resolveHook = resolveHook;
+    __exports__.applyHook = applyHook;
   });
 define("router",
   ["./router/router","exports"],
diff --git a/dist/router.min.js b/dist/router.min.js
index 2fe9aedd..99fba16b 100644
--- a/dist/router.min.js
+++ b/dist/router.min.js
@@ -1 +1 @@
-(function(e,r,t){var n,a,i,s;(function(){var e={},r={};n=function(r,t,n){e[r]={deps:t,callback:n}};s=i=a=function(t){if(r[t]){return r[t]}r[t]={};if(!e[t]){throw new Error("Could not find module "+t)}var n=e[t],i=n.deps,s=n.callback,o=[],l;for(var u=0,h=i.length;u<h;u++){if(i[u]==="exports"){o.push(l={})}else{o.push(a(d(i[u])))}}var f=s.apply(this,o);return r[t]=l||f;function d(e){if(e.charAt(0)!=="."){return e}var r=e.split("/");var n=t.split("/").slice(0,-1);for(var a=0,i=r.length;a<i;a++){var s=r[a];if(s===".."){n.pop()}else if(s==="."){continue}else{n.push(s)}}return n.join("/")}}})();n("router/handler-info",["./utils","rsvp/promise","exports"],function(e,r,t){"use strict";var n=e.bind;var a=e.merge;var i=e.serialize;var s=e.promiseLabel;var o=r["default"];function l(e){var r=e||{};a(this,r);this.initialize(r)}l.prototype={name:null,handler:null,params:null,context:null,factory:null,initialize:function(){},log:function(e,r){if(e.log){e.log(this.name+": "+r)}},promiseLabel:function(e){return s("'"+this.name+"' "+e)},getUnresolved:function(){return this},serialize:function(){return this.params||{}},resolve:function(e,r){var t=n(this,this.checkForAbort,e),a=n(this,this.runBeforeModelHook,r),i=n(this,this.getModel,r),s=n(this,this.runAfterModelHook,r),l=n(this,this.becomeResolved,r);return o.resolve(undefined,this.promiseLabel("Start handler")).then(t,null,this.promiseLabel("Check for abort")).then(a,null,this.promiseLabel("Before model")).then(t,null,this.promiseLabel("Check if aborted during 'beforeModel' hook")).then(i,null,this.promiseLabel("Model")).then(t,null,this.promiseLabel("Check if aborted in 'model' hook")).then(s,null,this.promiseLabel("After model")).then(t,null,this.promiseLabel("Check if aborted in 'afterModel' hook")).then(l,null,this.promiseLabel("Become resolved"))},runBeforeModelHook:function(e){if(e.trigger){e.trigger(true,"willResolveModel",e,this.handler)}return this.runSharedModelHook(e,"beforeModel",[])},runAfterModelHook:function(e,r){var t=this.name;this.stashResolvedModel(e,r);return this.runSharedModelHook(e,"afterModel",[r]).then(function(){return e.resolvedModels[t]},null,this.promiseLabel("Ignore fulfillment value and return model value"))},runSharedModelHook:function(e,r,t){this.log(e,"calling "+r+" hook");if(this.queryParams){t.push(this.queryParams)}t.push(e);var n=this.handler;var a=n[r]&&n[r].apply(n,t);if(a&&a.isTransition){a=null}return o.resolve(a,null,this.promiseLabel("Resolve value returned from one of the model hooks"))},getModel:null,checkForAbort:function(e,r){return o.resolve(e(),this.promiseLabel("Check for abort")).then(function(){return r},null,this.promiseLabel("Ignore fulfillment value and continue"))},stashResolvedModel:function(e,r){e.resolvedModels=e.resolvedModels||{};e.resolvedModels[this.name]=r},becomeResolved:function(e,r){var t=this.serialize(r);if(e){this.stashResolvedModel(e,r);e.params=e.params||{};e.params[this.name]=t}return this.factory("resolved",{context:r,name:this.name,handler:this.handler,params:t})},shouldSupercede:function(e){if(!e){return true}var r=e.context===this.context;return e.name!==this.name||this.hasOwnProperty("context")&&!r||this.hasOwnProperty("params")&&!u(this.params,e.params)}};function u(e,r){if(!e^!r){return false}if(!e){return true}for(var t in e){if(e.hasOwnProperty(t)&&e[t]!==r[t]){return false}}return true}t["default"]=l});n("router/handler-info/factory",["router/handler-info/resolved-handler-info","router/handler-info/unresolved-handler-info-by-object","router/handler-info/unresolved-handler-info-by-param","exports"],function(e,r,t,n){"use strict";var a=e["default"];var i=r["default"];var s=t["default"];o.klasses={resolved:a,param:s,object:i};function o(e,r){var t=o.klasses[e],n=new t(r||{});n.factory=o;return n}n["default"]=o});n("router/handler-info/resolved-handler-info",["../handler-info","router/utils","rsvp/promise","exports"],function(e,r,t,n){"use strict";var a=e["default"];var i=r.subclass;var s=r.promiseLabel;var o=t["default"];var l=i(a,{resolve:function(e,r){if(r&&r.resolvedModels){r.resolvedModels[this.name]=this.context}return o.resolve(this,this.promiseLabel("Resolve"))},getUnresolved:function(){return this.factory("param",{name:this.name,handler:this.handler,params:this.params})},isResolved:true});n["default"]=l});n("router/handler-info/unresolved-handler-info-by-object",["../handler-info","router/utils","rsvp/promise","exports"],function(e,r,t,n){"use strict";var a=e["default"];var i=r.merge;var s=r.subclass;var o=r.promiseLabel;var l=r.isParam;var u=t["default"];var h=s(a,{getModel:function(e){this.log(e,this.name+": resolving provided model");return u.resolve(this.context)},initialize:function(e){this.names=e.names||[];this.context=e.context},serialize:function(e){var r=e||this.context,t=this.names,n=this.handler;var a={};if(l(r)){a[t[0]]=r;return a}if(n.serialize){return n.serialize(r,t)}if(t.length!==1){return}var i=t[0];if(/_id$/.test(i)){a[i]=r.id}else{a[i]=r}return a}});n["default"]=h});n("router/handler-info/unresolved-handler-info-by-param",["../handler-info","router/utils","exports"],function(e,r,t){"use strict";var n=e["default"];var a=r.merge;var i=r.subclass;var s=r.promiseLabel;var o=i(n,{initialize:function(e){this.params=e.params||{}},getModel:function(e){var r=this.params;if(e&&e.queryParams){r={};a(r,this.params);r.queryParams=e.queryParams}var t=typeof this.handler.deserialize==="function"?"deserialize":"model";return this.runSharedModelHook(e,t,[r])}});t["default"]=o});n("router/router",["route-recognizer","rsvp/promise","./utils","./transition-state","./transition","./transition-intent/named-transition-intent","./transition-intent/url-transition-intent","./handler-info","exports"],function(e,r,t,n,a,i,s,o,l){"use strict";var u=e["default"];var h=r["default"];var f=t.trigger;var d=t.log;var c=t.slice;var v=t.forEach;var m=t.merge;var p=t.serialize;var g=t.extractQueryParams;var y=t.getChangelist;var b=t.promiseLabel;var I=n["default"];var x=a.logAbort;var w=a.Transition;var P=a.TransitionAborted;var T=i["default"];var q=s["default"];var H=o.ResolvedHandlerInfo;var L=Array.prototype.pop;function R(){this.recognizer=new u;this.reset()}R.prototype={map:function(e){this.recognizer.delegate=this.delegate;this.recognizer.map(e,function(e,r){for(var t=r.length-1,n=true;t>=0&&n;--t){var a=r[t];e.add(r,{as:a.handler});n=a.path==="/"||a.path===""||a.handler.slice(-6)===".index"}})},hasRoute:function(e){return this.recognizer.hasRoute(e)},queryParamsTransition:function(e,r,t,n){var a=this;A(this,n,e);if(!r&&this.activeTransition){return this.activeTransition}else{var i=new w(this);i.queryParamsOnly=true;t.queryParams=j(this,n.handlerInfos,n.queryParams,i);i.promise=i.promise.then(function(e){k(i,t,true);if(a.didTransition){a.didTransition(a.currentHandlerInfos)}return e},null,b("Transition complete"));return i}},transitionByIntent:function(e,r){var t=!!this.activeTransition;var n=t?this.activeTransition.state:this.state;var a;var i=this;try{var s=e.applyToState(n,this.recognizer,this.getHandler,r);var o=y(n.queryParams,s.queryParams);if(O(s.handlerInfos,n.handlerInfos)){if(o){a=this.queryParamsTransition(o,t,n,s);if(a){return a}}return new w(this)}if(r){z(this,s);return}a=new w(this,e,s);if(this.activeTransition){this.activeTransition.abort()}this.activeTransition=a;a.promise=a.promise.then(function(e){return S(a,e.state)},null,b("Settle transition promise when transition is finalized"));if(!t){U(this,s,a)}A(this,s,o);return a}catch(l){return new w(this,e,null,l)}},reset:function(){if(this.state){v(this.state.handlerInfos,function(e){var r=e.handler;if(r.exit){r.exit()}})}this.state=new I;this.currentHandlerInfos=null},activeTransition:null,handleURL:function(e){var r=c.call(arguments);if(e.charAt(0)!=="/"){r[0]="/"+e}return E(this,r).method(null)},updateURL:function(){throw new Error("updateURL is not implemented")},replaceURL:function(e){this.updateURL(e)},transitionTo:function(e){return E(this,arguments)},intermediateTransitionTo:function(e){E(this,arguments,true)},refresh:function(e){var r=this.activeTransition?this.activeTransition.state:this.state;var t=r.handlerInfos;var n={};for(var a=0,i=t.length;a<i;++a){var s=t[a];n[s.name]=s.params||{}}d(this,"Starting a refresh transition");var o=new T({name:t[t.length-1].name,pivotHandler:e||t[0].handler,contexts:[],queryParams:this._changedQueryParams||r.queryParams||{}});return this.transitionByIntent(o,false)},replaceWith:function(e){return E(this,arguments).method("replace")},generate:function(e){var r=g(c.call(arguments,1)),t=r[0],n=r[1];var a=new T({name:e,contexts:t});var i=a.applyToState(this.state,this.recognizer,this.getHandler);var s={};for(var o=0,l=i.handlerInfos.length;o<l;++o){var u=i.handlerInfos[o];var h=u.serialize();m(s,h)}s.queryParams=n;return this.recognizer.generate(e,s)},applyIntent:function(e,r){var t=new T({name:e,contexts:r});var n=this.activeTransition&&this.activeTransition.state||this.state;return t.applyToState(n,this.recognizer,this.getHandler)},isActiveIntent:function(e,r,t){var n=this.state.handlerInfos,a=false,i,s,o,l,u,h;if(!n.length){return false}var f=n[n.length-1].name;var d=this.recognizer.handlersFor(f);var c=0;for(h=d.length;c<h;++c){o=n[c];if(o.name===e){break}}if(c===d.length){return false}var v=new I;v.handlerInfos=n.slice(0,c+1);d=d.slice(0,c+1);var p=new T({name:f,contexts:r});var g=p.applyToHandlers(v,d,this.getHandler,f,true,true);var b=O(g.handlerInfos,v.handlerInfos);if(!t||!b){return b}var x={};m(x,t);var w=this.state.queryParams;for(var P in w){if(w.hasOwnProperty(P)&&x.hasOwnProperty(P)){x[P]=w[P]}}return b&&!y(x,t)},isActive:function(e){var r=g(c.call(arguments,1));return this.isActiveIntent(e,r[0],r[1])},trigger:function(e){var r=c.call(arguments);f(this,this.currentHandlerInfos,false,r)},log:null,_willChangeContextEvent:"willChangeContext",_triggerWillChangeContext:function(e,r){f(this,e,true,[this._willChangeContextEvent,r])},_triggerWillLeave:function(e,r,t){f(this,e,true,["willLeave",r,t])}};function A(e,r,t){if(t){e._changedQueryParams=t.all;f(e,r.handlerInfos,true,["queryParamsDidChange",t.changed,t.all,t.removed]);e._changedQueryParams=null}}function z(e,r,t){var n=C(e.state,r);v(n.exited,function(e){var r=e.handler;delete r.context;if(r.reset){r.reset(true,t)}if(r.exit){r.exit(t)}});var a=e.oldState=e.state;e.state=r;var i=e.currentHandlerInfos=n.unchanged.slice();try{v(n.reset,function(e){var r=e.handler;if(r.reset){r.reset(false,t)}});v(n.updatedContext,function(e){return M(i,e,false,t)});v(n.entered,function(e){return M(i,e,true,t)})}catch(s){e.state=a;e.currentHandlerInfos=a.handlerInfos;throw s}e.state.queryParams=j(e,i,r.queryParams,t)}function M(e,r,t,n){var a=r.handler,i=r.context;if(t&&a.enter){a.enter(n)}if(n&&n.isAborted){throw new P}a.context=i;if(a.contextDidChange){a.contextDidChange()}if(a.setup){a.setup(i,n)}if(n&&n.isAborted){throw new P}e.push(r);return true}function C(e,r){var t=e.handlerInfos;var n=r.handlerInfos;var a={updatedContext:[],exited:[],entered:[],unchanged:[]};var i,s,o,l;for(o=0,l=n.length;o<l;o++){var u=t[o],h=n[o];if(!u||u.handler!==h.handler){i=true}if(i){a.entered.push(h);if(u){a.exited.unshift(u)}}else if(s||u.context!==h.context){s=true;a.updatedContext.push(h)}else{a.unchanged.push(u)}}for(o=n.length,l=t.length;o<l;o++){a.exited.unshift(t[o])}a.reset=a.updatedContext.slice();a.reset.reverse();return a}function k(e,r,t){var n=e.urlMethod;if(!n){return}var a=e.router,i=r.handlerInfos,s=i[i.length-1].name,o={};for(var l=i.length-1;l>=0;--l){var u=i[l];m(o,u.params);if(u.handler.inaccessibleByURL){n=null}}if(n){o.queryParams=e._visibleQueryParams||r.queryParams;var h=a.recognizer.generate(s,o);if(n==="replace"){a.replaceURL(h)}else{a.updateURL(h)}}}function S(e,r){try{d(e.router,e.sequence,"Resolved all models on destination route; finalizing transition.");var t=e.router,n=r.handlerInfos,a=e.sequence;z(t,r,e);if(e.isAborted){t.state.handlerInfos=t.currentHandlerInfos;return h.reject(x(e))}k(e,r,e.intent.url);e.isActive=false;t.activeTransition=null;f(t,t.currentHandlerInfos,true,["didTransition"]);if(t.didTransition){t.didTransition(t.currentHandlerInfos)}d(t,e.sequence,"TRANSITION COMPLETE.");return n[n.length-1].handler}catch(i){if(!(i instanceof P)){var s=e.state.handlerInfos;e.trigger(true,"error",i,e,s[s.length-1].handler);e.abort()}throw i}}function E(e,r,t){var n=r[0]||"/";var a=r[r.length-1];var i={};if(a&&a.hasOwnProperty("queryParams")){i=L.call(r).queryParams}var s;if(r.length===0){d(e,"Updating query params");var o=e.state.handlerInfos;s=new T({name:o[o.length-1].name,contexts:[],queryParams:i})}else if(n.charAt(0)==="/"){d(e,"Attempting URL transition to "+n);s=new q({url:n})}else{d(e,"Attempting transition to "+n);s=new T({name:r[0],contexts:c.call(r,1),queryParams:i})}return e.transitionByIntent(s,t)}function O(e,r){if(e.length!==r.length){return false}for(var t=0,n=e.length;t<n;++t){if(e[t]!==r[t]){return false}}return true}function j(e,r,t,n){for(var a in t){if(t.hasOwnProperty(a)&&t[a]===null){delete t[a]}}var i=[];f(e,r,true,["finalizeQueryParamChange",t,i,n]);if(n){n._visibleQueryParams={}}var s={};for(var o=0,l=i.length;o<l;++o){var u=i[o];s[u.key]=u.value;if(n&&u.visible!==false){n._visibleQueryParams[u.key]=u.value}}return s}function U(e,r,t){var n=e.state.handlerInfos,a=[],i=null,s,o,l,u,h;for(l=0;l<n.length;l++){u=n[l];h=r.handlerInfos[l];if(!h||u.name!==h.name){i=l;break}if(!h.isResolved){a.push(u)}}if(i!==null){s=n.slice(i,n.length);o=function(e){for(var r=0;r<s.length;r++){if(s[r].name===e){return true}}return false};e._triggerWillLeave(s,t,o)}if(a.length>0){e._triggerWillChangeContext(a,t)}f(e,n,true,["willTransition",t])}l["default"]=R});n("router/transition-intent",["./utils","exports"],function(e,r){"use strict";var t=e.merge;function n(e){this.initialize(e);this.data=this.data||{}}n.prototype={initialize:null,applyToState:null};r["default"]=n});n("router/transition-intent/named-transition-intent",["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],function(e,r,t,n,a){"use strict";var i=e["default"];var s=r["default"];var o=t["default"];var l=n.isParam;var u=n.extractQueryParams;var h=n.merge;var f=n.subclass;a["default"]=f(i,{name:null,pivotHandler:null,contexts:null,queryParams:null,initialize:function(e){this.name=e.name;this.pivotHandler=e.pivotHandler;this.contexts=e.contexts||[];this.queryParams=e.queryParams},applyToState:function(e,r,t,n){var a=u([this.name].concat(this.contexts)),i=a[0],s=a[1],o=r.handlersFor(i[0]);var l=o[o.length-1].handler;return this.applyToHandlers(e,o,t,l,n)},applyToHandlers:function(e,r,t,n,a,i){var o;var l=new s;var u=this.contexts.slice(0);var f=r.length;if(this.pivotHandler){for(o=0;o<r.length;++o){if(t(r[o].handler)===this.pivotHandler){f=o;break}}}var d=!this.pivotHandler;for(o=r.length-1;o>=0;--o){var c=r[o];var v=c.handler;var m=t(v);var p=e.handlerInfos[o];var g=null;if(c.names.length>0){if(o>=f){g=this.createParamHandlerInfo(v,m,c.names,u,p)}else{g=this.getHandlerInfoForDynamicSegment(v,m,c.names,u,p,n,o)}}else{g=this.createParamHandlerInfo(v,m,c.names,u,p)}if(i){g=g.becomeResolved(null,g.context);var y=p&&p.context;if(c.names.length>0&&g.context===y){g.params=p&&p.params}g.context=y}var b=p;if(o>=f||g.shouldSupercede(p)){f=Math.min(o,f);b=g}if(a&&!i){b=b.becomeResolved(null,b.context)}l.handlerInfos.unshift(b)}if(u.length>0){throw new Error("More context objects were passed than there are dynamic segments for the route: "+n)}if(!a){this.invalidateChildren(l.handlerInfos,f)}h(l.queryParams,this.queryParams||{});return l},invalidateChildren:function(e,r){for(var t=r,n=e.length;t<n;++t){var a=e[t];e[t]=e[t].getUnresolved()}},getHandlerInfoForDynamicSegment:function(e,r,t,n,a,i,s){var u=t.length;var h;if(n.length>0){h=n[n.length-1];if(l(h)){return this.createParamHandlerInfo(e,r,t,n,a)}else{n.pop()}}else if(a&&a.name===e){return a}else{if(this.preTransitionState){var f=this.preTransitionState.handlerInfos[s];h=f&&f.context}else{return a}}return o("object",{name:e,handler:r,context:h,names:t})},createParamHandlerInfo:function(e,r,t,n,a){var i={};var s=t.length;while(s--){var u=a&&e===a.name&&a.params||{};var h=n[n.length-1];var f=t[s];if(l(h)){i[f]=""+n.pop()}else{if(u.hasOwnProperty(f)){i[f]=u[f]}else{throw new Error("You didn't provide enough string/numeric parameters to satisfy all of the dynamic segments for route "+e)}}}return o("param",{name:e,handler:r,params:i})}})});n("router/transition-intent/url-transition-intent",["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],function(e,r,t,n,a){"use strict";var i=e["default"];var s=r["default"];var o=t["default"];var l=n.oCreate;var u=n.merge;var h=n.subclass;a["default"]=h(i,{url:null,initialize:function(e){this.url=e.url},applyToState:function(e,r,t){var n=new s;var a=r.recognize(this.url),i={},l,h;if(!a){throw new f(this.url)}var d=false;for(l=0,h=a.length;l<h;++l){var c=a[l];var v=c.handler;var m=t(v);if(m.inaccessibleByURL){throw new f(this.url)}var p=o("param",{name:v,handler:m,params:c.params});var g=e.handlerInfos[l];if(d||p.shouldSupercede(g)){d=true;n.handlerInfos[l]=p}else{n.handlerInfos[l]=g}}u(n.queryParams,a.queryParams);return n}});function f(e){this.message=e||"UnrecognizedURLError";this.name="UnrecognizedURLError"}});n("router/transition-state",["./handler-info","./utils","rsvp/promise","exports"],function(e,r,t,n){"use strict";var a=e.ResolvedHandlerInfo;var i=r.forEach;var s=r.promiseLabel;var o=t["default"];function l(e){this.handlerInfos=[];this.queryParams={};this.params={}}l.prototype={handlerInfos:null,queryParams:null,params:null,promiseLabel:function(e){var r="";i(this.handlerInfos,function(e){if(r!==""){r+="."}r+=e.name});return s("'"+r+"': "+e)},resolve:function(e,r){var t=this;var n=this.params;i(this.handlerInfos,function(e){n[e.name]=e.params||{}});r=r||{};r.resolveIndex=0;var a=this;var l=false;return o.resolve(null,this.promiseLabel("Start transition")).then(d,null,this.promiseLabel("Resolve handler"))["catch"](h,this.promiseLabel("Handle error"));function u(){return o.resolve(e(),s("Check if should continue"))["catch"](function(e){l=true;return o.reject(e)},s("Handle abort"))}function h(e){var t=a.handlerInfos;var n=r.resolveIndex>=t.length?t.length-1:r.resolveIndex;return o.reject({error:e,handlerWithError:a.handlerInfos[n].handler,wasAborted:l,state:a})}function f(e){var t=a.handlerInfos[r.resolveIndex].isResolved;a.handlerInfos[r.resolveIndex++]=e;if(!t){var n=e.handler;if(n&&n.redirect){n.redirect(e.context,r)}}return u().then(d,null,s("Resolve handler"))}function d(){if(r.resolveIndex===a.handlerInfos.length){return{error:null,state:a}}var e=a.handlerInfos[r.resolveIndex];return e.resolve(u,r).then(f,null,s("Proceed"))}}};n["default"]=l});n("router/transition",["rsvp/promise","./handler-info","./utils","exports"],function(e,r,t,n){"use strict";var a=e["default"];var i=r.ResolvedHandlerInfo;var s=t.trigger;var o=t.slice;var l=t.log;var u=t.promiseLabel;function h(e,r,t,n){var i=this;this.state=t||e.state;this.intent=r;this.router=e;this.data=this.intent&&this.intent.data||{};this.resolvedModels={};this.queryParams={};if(n){this.promise=a.reject(n);return}if(t){this.params=t.params;this.queryParams=t.queryParams;this.handlerInfos=t.handlerInfos;var s=t.handlerInfos.length;if(s){this.targetName=t.handlerInfos[t.handlerInfos.length-1].name}for(var o=0;o<s;++o){var l=t.handlerInfos[o];if(!l.isResolved){break}this.pivotHandler=l.handler}this.sequence=h.currentSequence++;this.promise=t.resolve(d,this)["catch"](function(e){if(e.wasAborted||i.isAborted){return a.reject(f(i))}else{i.trigger("error",e.error,i,e.handlerWithError);i.abort();return a.reject(e.error)}},u("Handle Abort"))}else{this.promise=a.resolve(this.state);this.params={}}function d(){if(i.isAborted){return a.reject(undefined,u("Transition aborted - reject"))}}}h.currentSequence=0;h.prototype={targetName:null,urlMethod:"update",intent:null,params:null,pivotHandler:null,resolveIndex:0,handlerInfos:null,resolvedModels:null,isActive:true,state:null,queryParamsOnly:false,isTransition:true,isExiting:function(e){var r=this.handlerInfos;for(var t=0,n=r.length;t<n;++t){var a=r[t];if(a.name===e||a.handler===e){return false}}return true},promise:null,data:null,then:function(e,r){return this.promise.then(e,r)},abort:function(){if(this.isAborted){return this}l(this.router,this.sequence,this.targetName+": transition was aborted");this.intent.preTransitionState=this.router.state;this.isAborted=true;this.isActive=false;this.router.activeTransition=null;return this},retry:function(){this.abort();return this.router.transitionByIntent(this.intent,false)},method:function(e){this.urlMethod=e;return this},trigger:function(e){var r=o.call(arguments);if(typeof e==="boolean"){r.shift()}else{e=false}s(this.router,this.state.handlerInfos.slice(0,this.resolveIndex+1),e,r)},followRedirects:function(){var e=this.router;return this.promise["catch"](function(r){if(e.activeTransition){return e.activeTransition.followRedirects()}return a.reject(r)})},toString:function(){return"Transition (sequence "+this.sequence+")"},log:function(e){l(this.router,this.sequence,e)}};h.prototype.send=h.prototype.trigger;function f(e){l(e.router,e.sequence,"detected abort.");return new d}function d(e){this.message=e||"TransitionAborted";this.name="TransitionAborted"}n.Transition=h;n.logAbort=f;n.TransitionAborted=d});n("router/utils",["exports"],function(e){"use strict";var r=Array.prototype.slice;var t;if(!Array.isArray){t=function(e){return Object.prototype.toString.call(e)==="[object Array]"}}else{t=Array.isArray}var n=t;e.isArray=n;function a(e,r){for(var t in r){if(r.hasOwnProperty(t)){e[t]=r[t]}}}var i=Object.create||function(e){function r(){}r.prototype=e;return new r};e.oCreate=i;function s(e){var t=e&&e.length,n,a;if(t&&t>0&&e[t-1]&&e[t-1].hasOwnProperty("queryParams")){a=e[t-1].queryParams;n=r.call(e,0,t-1);return[n,a]}else{return[e,null]}}e.extractQueryParams=s;function o(e){for(var r in e){if(typeof e[r]==="number"){e[r]=""+e[r]}else if(n(e[r])){for(var t=0,a=e[r].length;t<a;t++){e[r][t]=""+e[r][t]}}}}function l(e,r,t){if(!e.log){return}if(arguments.length===3){e.log("Transition #"+r+": "+t)}else{t=r;e.log(t)}}e.log=l;function u(e,t){var n=arguments;return function(a){var i=r.call(n,2);i.push(a);return t.apply(e,i)}}e.bind=u;function h(e){return typeof e==="string"||e instanceof String||typeof e==="number"||e instanceof Number}function f(e,r){for(var t=0,n=e.length;t<n&&false!==r(e[t]);t++){}}e.forEach=f;function d(e,r,t,n){if(e.triggerEvent){e.triggerEvent(r,t,n);return}var a=n.shift();if(!r){if(t){return}throw new Error("Could not trigger event '"+a+"'. There are no active handlers")}var i=false;for(var s=r.length-1;s>=0;s--){var o=r[s],l=o.handler;if(l.events&&l.events[a]){if(l.events[a].apply(l,n)===true){i=true}else{return}}}if(!i&&!t){throw new Error("Nothing handled the event '"+a+"'.")}}e.trigger=d;function c(e,r){var t;var i={all:{},changed:{},removed:{}};a(i.all,r);var s=false;o(e);o(r);for(t in e){if(e.hasOwnProperty(t)){if(!r.hasOwnProperty(t)){s=true;i.removed[t]=e[t]}}}for(t in r){if(r.hasOwnProperty(t)){if(n(e[t])&&n(r[t])){if(e[t].length!==r[t].length){i.changed[t]=r[t];s=true}else{for(var l=0,u=e[t].length;l<u;l++){if(e[t][l]!==r[t][l]){i.changed[t]=r[t];s=true}}}}else{if(e[t]!==r[t]){i.changed[t]=r[t];s=true}}}}return s&&i}e.getChangelist=c;function v(e){return"Router: "+e}e.promiseLabel=v;function m(e,r){function t(r){e.call(this,r||{})}t.prototype=i(e.prototype);a(t.prototype,r);return t}e.subclass=m;e.merge=a;e.slice=r;e.isParam=h;e.coerceQueryParamsToString=o});n("router",["./router/router","exports"],function(e,r){"use strict";var t=e["default"];r["default"]=t});n("route-recognizer",[],function(){return{"default":t}});n("rsvp",[],function(){return r});n("rsvp/promise",[],function(){return{"default":r.Promise}});window.Router=a("router")})(window,window.RSVP,window.RouteRecognizer);
\ No newline at end of file
+(function(e,r,t){var n,a,i,s;(function(){var e={},r={};n=function(r,t,n){e[r]={deps:t,callback:n}};s=i=a=function(t){if(r[t]){return r[t]}r[t]={};if(!e[t]){throw new Error("Could not find module "+t)}var n=e[t],i=n.deps,s=n.callback,o=[],l;for(var u=0,h=i.length;u<h;u++){if(i[u]==="exports"){o.push(l={})}else{o.push(a(d(i[u])))}}var f=s.apply(this,o);return r[t]=l||f;function d(e){if(e.charAt(0)!=="."){return e}var r=e.split("/");var n=t.split("/").slice(0,-1);for(var a=0,i=r.length;a<i;a++){var s=r[a];if(s===".."){n.pop()}else if(s==="."){continue}else{n.push(s)}}return n.join("/")}}})();n("router/handler-info",["./utils","rsvp/promise","exports"],function(e,r,t){"use strict";var n=e.bind;var a=e.merge;var i=e.serialize;var s=e.promiseLabel;var o=e.applyHook;var l=r["default"];function u(e){var r=e||{};a(this,r);this.initialize(r)}u.prototype={name:null,handler:null,params:null,context:null,factory:null,initialize:function(){},log:function(e,r){if(e.log){e.log(this.name+": "+r)}},promiseLabel:function(e){return s("'"+this.name+"' "+e)},getUnresolved:function(){return this},serialize:function(){return this.params||{}},resolve:function(e,r){var t=n(this,this.checkForAbort,e),a=n(this,this.runBeforeModelHook,r),i=n(this,this.getModel,r),s=n(this,this.runAfterModelHook,r),o=n(this,this.becomeResolved,r);return l.resolve(undefined,this.promiseLabel("Start handler")).then(t,null,this.promiseLabel("Check for abort")).then(a,null,this.promiseLabel("Before model")).then(t,null,this.promiseLabel("Check if aborted during 'beforeModel' hook")).then(i,null,this.promiseLabel("Model")).then(t,null,this.promiseLabel("Check if aborted in 'model' hook")).then(s,null,this.promiseLabel("After model")).then(t,null,this.promiseLabel("Check if aborted in 'afterModel' hook")).then(o,null,this.promiseLabel("Become resolved"))},runBeforeModelHook:function(e){if(e.trigger){e.trigger(true,"willResolveModel",e,this.handler)}return this.runSharedModelHook(e,"beforeModel",[])},runAfterModelHook:function(e,r){var t=this.name;this.stashResolvedModel(e,r);return this.runSharedModelHook(e,"afterModel",[r]).then(function(){return e.resolvedModels[t]},null,this.promiseLabel("Ignore fulfillment value and return model value"))},runSharedModelHook:function(e,r,t){this.log(e,"calling "+r+" hook");if(this.queryParams){t.push(this.queryParams)}t.push(e);var n=o(this.handler,r,t);if(n&&n.isTransition){n=null}return l.resolve(n,this.promiseLabel("Resolve value returned from one of the model hooks"))},getModel:null,checkForAbort:function(e,r){return l.resolve(e(),this.promiseLabel("Check for abort")).then(function(){return r},null,this.promiseLabel("Ignore fulfillment value and continue"))},stashResolvedModel:function(e,r){e.resolvedModels=e.resolvedModels||{};e.resolvedModels[this.name]=r},becomeResolved:function(e,r){var t=this.serialize(r);if(e){this.stashResolvedModel(e,r);e.params=e.params||{};e.params[this.name]=t}return this.factory("resolved",{context:r,name:this.name,handler:this.handler,params:t})},shouldSupercede:function(e){if(!e){return true}var r=e.context===this.context;return e.name!==this.name||this.hasOwnProperty("context")&&!r||this.hasOwnProperty("params")&&!h(this.params,e.params)}};function h(e,r){if(!e^!r){return false}if(!e){return true}for(var t in e){if(e.hasOwnProperty(t)&&e[t]!==r[t]){return false}}return true}t["default"]=u});n("router/handler-info/factory",["router/handler-info/resolved-handler-info","router/handler-info/unresolved-handler-info-by-object","router/handler-info/unresolved-handler-info-by-param","exports"],function(e,r,t,n){"use strict";var a=e["default"];var i=r["default"];var s=t["default"];o.klasses={resolved:a,param:s,object:i};function o(e,r){var t=o.klasses[e],n=new t(r||{});n.factory=o;return n}n["default"]=o});n("router/handler-info/resolved-handler-info",["../handler-info","router/utils","rsvp/promise","exports"],function(e,r,t,n){"use strict";var a=e["default"];var i=r.subclass;var s=r.promiseLabel;var o=t["default"];var l=i(a,{resolve:function(e,r){if(r&&r.resolvedModels){r.resolvedModels[this.name]=this.context}return o.resolve(this,this.promiseLabel("Resolve"))},getUnresolved:function(){return this.factory("param",{name:this.name,handler:this.handler,params:this.params})},isResolved:true});n["default"]=l});n("router/handler-info/unresolved-handler-info-by-object",["../handler-info","router/utils","rsvp/promise","exports"],function(e,r,t,n){"use strict";var a=e["default"];var i=r.merge;var s=r.subclass;var o=r.promiseLabel;var l=r.isParam;var u=t["default"];var h=s(a,{getModel:function(e){this.log(e,this.name+": resolving provided model");return u.resolve(this.context)},initialize:function(e){this.names=e.names||[];this.context=e.context},serialize:function(e){var r=e||this.context,t=this.names,n=this.handler;var a={};if(l(r)){a[t[0]]=r;return a}if(n.serialize){return n.serialize(r,t)}if(t.length!==1){return}var i=t[0];if(/_id$/.test(i)){a[i]=r.id}else{a[i]=r}return a}});n["default"]=h});n("router/handler-info/unresolved-handler-info-by-param",["../handler-info","router/utils","exports"],function(e,r,t){"use strict";var n=e["default"];var a=r.resolveHook;var i=r.merge;var s=r.subclass;var o=r.promiseLabel;var l=s(n,{initialize:function(e){this.params=e.params||{}},getModel:function(e){var r=this.params;if(e&&e.queryParams){r={};i(r,this.params);r.queryParams=e.queryParams}var t=this.handler;var n=a(t,"deserialize")||a(t,"model");return this.runSharedModelHook(e,n,[r])}});t["default"]=l});n("router/router",["route-recognizer","rsvp/promise","./utils","./transition-state","./transition","./transition-intent/named-transition-intent","./transition-intent/url-transition-intent","./handler-info","exports"],function(e,r,t,n,a,i,s,o,l){"use strict";var u=e["default"];var h=r["default"];var f=t.trigger;var d=t.log;var c=t.slice;var v=t.forEach;var m=t.merge;var p=t.serialize;var g=t.extractQueryParams;var y=t.getChangelist;var b=t.promiseLabel;var I=t.callHook;var x=n["default"];var w=a.logAbort;var P=a.Transition;var T=a.TransitionAborted;var q=i["default"];var H=s["default"];var L=o.ResolvedHandlerInfo;var R=Array.prototype.pop;function A(){this.recognizer=new u;this.reset()}A.prototype={map:function(e){this.recognizer.delegate=this.delegate;this.recognizer.map(e,function(e,r){for(var t=r.length-1,n=true;t>=0&&n;--t){var a=r[t];e.add(r,{as:a.handler});n=a.path==="/"||a.path===""||a.handler.slice(-6)===".index"}})},hasRoute:function(e){return this.recognizer.hasRoute(e)},queryParamsTransition:function(e,r,t,n){var a=this;k(this,n,e);if(!r&&this.activeTransition){return this.activeTransition}else{var i=new P(this);i.queryParamsOnly=true;t.queryParams=U(this,n.handlerInfos,n.queryParams,i);i.promise=i.promise.then(function(e){S(i,t,true);if(a.didTransition){a.didTransition(a.currentHandlerInfos)}return e},null,b("Transition complete"));return i}},transitionByIntent:function(e,r){var t=!!this.activeTransition;var n=t?this.activeTransition.state:this.state;var a;var i=this;try{var s=e.applyToState(n,this.recognizer,this.getHandler,r);var o=y(n.queryParams,s.queryParams);if(j(s.handlerInfos,n.handlerInfos)){if(o){a=this.queryParamsTransition(o,t,n,s);if(a){return a}}return new P(this)}if(r){z(this,s);return}a=new P(this,e,s);if(this.activeTransition){this.activeTransition.abort()}this.activeTransition=a;a.promise=a.promise.then(function(e){return E(a,e.state)},null,b("Settle transition promise when transition is finalized"));if(!t){_(this,s,a)}k(this,s,o);return a}catch(l){return new P(this,e,null,l)}},reset:function(){if(this.state){v(this.state.handlerInfos.slice().reverse(),function(e){var r=e.handler;I(r,"exit")})}this.state=new x;this.currentHandlerInfos=null},activeTransition:null,handleURL:function(e){var r=c.call(arguments);if(e.charAt(0)!=="/"){r[0]="/"+e}return O(this,r).method(null)},updateURL:function(){throw new Error("updateURL is not implemented")},replaceURL:function(e){this.updateURL(e)},transitionTo:function(e){return O(this,arguments)},intermediateTransitionTo:function(e){return O(this,arguments,true)},refresh:function(e){var r=this.activeTransition?this.activeTransition.state:this.state;var t=r.handlerInfos;var n={};for(var a=0,i=t.length;a<i;++a){var s=t[a];n[s.name]=s.params||{}}d(this,"Starting a refresh transition");var o=new q({name:t[t.length-1].name,pivotHandler:e||t[0].handler,contexts:[],queryParams:this._changedQueryParams||r.queryParams||{}});return this.transitionByIntent(o,false)},replaceWith:function(e){return O(this,arguments).method("replace")},generate:function(e){var r=g(c.call(arguments,1)),t=r[0],n=r[1];var a=new q({name:e,contexts:t});var i=a.applyToState(this.state,this.recognizer,this.getHandler);var s={};for(var o=0,l=i.handlerInfos.length;o<l;++o){var u=i.handlerInfos[o];var h=u.serialize();m(s,h)}s.queryParams=n;return this.recognizer.generate(e,s)},applyIntent:function(e,r){var t=new q({name:e,contexts:r});var n=this.activeTransition&&this.activeTransition.state||this.state;return t.applyToState(n,this.recognizer,this.getHandler)},isActiveIntent:function(e,r,t){var n=this.state.handlerInfos,a=false,i,s,o,l,u,h;if(!n.length){return false}var f=n[n.length-1].name;var d=this.recognizer.handlersFor(f);var c=0;for(h=d.length;c<h;++c){o=n[c];if(o.name===e){break}}if(c===d.length){return false}var v=new x;v.handlerInfos=n.slice(0,c+1);d=d.slice(0,c+1);var p=new q({name:f,contexts:r});var g=p.applyToHandlers(v,d,this.getHandler,f,true,true);var b=j(g.handlerInfos,v.handlerInfos);if(!t||!b){return b}var I={};m(I,t);var w=this.state.queryParams;for(var P in w){if(w.hasOwnProperty(P)&&I.hasOwnProperty(P)){I[P]=w[P]}}return b&&!y(I,t)},isActive:function(e){var r=g(c.call(arguments,1));return this.isActiveIntent(e,r[0],r[1])},trigger:function(e){var r=c.call(arguments);f(this,this.currentHandlerInfos,false,r)},log:null,_willChangeContextEvent:"willChangeContext",_triggerWillChangeContext:function(e,r){f(this,e,true,[this._willChangeContextEvent,r])},_triggerWillLeave:function(e,r,t){f(this,e,true,["willLeave",r,t])}};function k(e,r,t){if(t){e._changedQueryParams=t.all;f(e,r.handlerInfos,true,["queryParamsDidChange",t.changed,t.all,t.removed]);e._changedQueryParams=null}}function z(e,r,t){var n=C(e.state,r);v(n.exited,function(e){var r=e.handler;delete r.context;I(r,"reset",true,t);I(r,"exit",t)});var a=e.oldState=e.state;e.state=r;var i=e.currentHandlerInfos=n.unchanged.slice();try{v(n.reset,function(e){var r=e.handler;I(r,"reset",false,t)});v(n.updatedContext,function(e){return M(i,e,false,t)});v(n.entered,function(e){return M(i,e,true,t)})}catch(s){e.state=a;e.currentHandlerInfos=a.handlerInfos;throw s}e.state.queryParams=U(e,i,r.queryParams,t)}function M(e,r,t,n){var a=r.handler,i=r.context;I(a,"enter",n);if(n&&n.isAborted){throw new T}a.context=i;I(a,"contextDidChange");I(a,"setup",i,n);if(n&&n.isAborted){throw new T}e.push(r);return true}function C(e,r){var t=e.handlerInfos;var n=r.handlerInfos;var a={updatedContext:[],exited:[],entered:[],unchanged:[]};var i,s=false,o,l;for(o=0,l=n.length;o<l;o++){var u=t[o],h=n[o];if(!u||u.handler!==h.handler){i=true}if(i){a.entered.push(h);if(u){a.exited.unshift(u)}}else if(s||u.context!==h.context){s=true;a.updatedContext.push(h)}else{a.unchanged.push(u)}}for(o=n.length,l=t.length;o<l;o++){a.exited.unshift(t[o])}a.reset=a.updatedContext.slice();a.reset.reverse();return a}function S(e,r,t){var n=e.urlMethod;if(!n){return}var a=e.router,i=r.handlerInfos,s=i[i.length-1].name,o={};for(var l=i.length-1;l>=0;--l){var u=i[l];m(o,u.params);if(u.handler.inaccessibleByURL){n=null}}if(n){o.queryParams=e._visibleQueryParams||r.queryParams;var h=a.recognizer.generate(s,o);if(n==="replace"){a.replaceURL(h)}else{a.updateURL(h)}}}function E(e,r){try{d(e.router,e.sequence,"Resolved all models on destination route; finalizing transition.");var t=e.router,n=r.handlerInfos,a=e.sequence;z(t,r,e);if(e.isAborted){t.state.handlerInfos=t.currentHandlerInfos;return h.reject(w(e))}S(e,r,e.intent.url);e.isActive=false;t.activeTransition=null;f(t,t.currentHandlerInfos,true,["didTransition"]);if(t.didTransition){t.didTransition(t.currentHandlerInfos)}d(t,e.sequence,"TRANSITION COMPLETE.");return n[n.length-1].handler}catch(i){if(!(i instanceof T)){var s=e.state.handlerInfos;e.trigger(true,"error",i,e,s[s.length-1].handler);e.abort()}throw i}}function O(e,r,t){var n=r[0]||"/";var a=r[r.length-1];var i={};if(a&&a.hasOwnProperty("queryParams")){i=R.call(r).queryParams}var s;if(r.length===0){d(e,"Updating query params");var o=e.state.handlerInfos;s=new q({name:o[o.length-1].name,contexts:[],queryParams:i})}else if(n.charAt(0)==="/"){d(e,"Attempting URL transition to "+n);s=new H({url:n})}else{d(e,"Attempting transition to "+n);s=new q({name:r[0],contexts:c.call(r,1),queryParams:i})}return e.transitionByIntent(s,t)}function j(e,r){if(e.length!==r.length){return false}for(var t=0,n=e.length;t<n;++t){if(e[t]!==r[t]){return false}}return true}function U(e,r,t,n){for(var a in t){if(t.hasOwnProperty(a)&&t[a]===null){delete t[a]}}var i=[];f(e,r,true,["finalizeQueryParamChange",t,i,n]);if(n){n._visibleQueryParams={}}var s={};for(var o=0,l=i.length;o<l;++o){var u=i[o];s[u.key]=u.value;if(n&&u.visible!==false){n._visibleQueryParams[u.key]=u.value}}return s}function _(e,r,t){var n=e.state.handlerInfos,a=[],i=null,s,o,l,u,h,d;u=n.length;for(l=0;l<u;l++){h=n[l];d=r.handlerInfos[l];if(!d||h.name!==d.name){i=l;break}if(!d.isResolved){a.push(h)}}if(i!==null){s=n.slice(i,u);o=function(e){for(var r=0,t=s.length;r<t;r++){if(s[r].name===e){return true}}return false};e._triggerWillLeave(s,t,o)}if(a.length>0){e._triggerWillChangeContext(a,t)}f(e,n,true,["willTransition",t])}l["default"]=A});n("router/transition-intent",["./utils","exports"],function(e,r){"use strict";var t=e.merge;function n(e){this.initialize(e);this.data=this.data||{}}n.prototype={initialize:null,applyToState:null};r["default"]=n});n("router/transition-intent/named-transition-intent",["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],function(e,r,t,n,a){"use strict";var i=e["default"];var s=r["default"];var o=t["default"];var l=n.isParam;var u=n.extractQueryParams;var h=n.merge;var f=n.subclass;a["default"]=f(i,{name:null,pivotHandler:null,contexts:null,queryParams:null,initialize:function(e){this.name=e.name;this.pivotHandler=e.pivotHandler;this.contexts=e.contexts||[];this.queryParams=e.queryParams},applyToState:function(e,r,t,n){var a=u([this.name].concat(this.contexts)),i=a[0],s=a[1],o=r.handlersFor(i[0]);var l=o[o.length-1].handler;return this.applyToHandlers(e,o,t,l,n)},applyToHandlers:function(e,r,t,n,a,i){var o,l;var u=new s;var f=this.contexts.slice(0);var d=r.length;if(this.pivotHandler){for(o=0,l=r.length;o<l;++o){if(t(r[o].handler)===this.pivotHandler){d=o;break}}}var c=!this.pivotHandler;for(o=r.length-1;o>=0;--o){var v=r[o];var m=v.handler;var p=t(m);var g=e.handlerInfos[o];var y=null;if(v.names.length>0){if(o>=d){y=this.createParamHandlerInfo(m,p,v.names,f,g)}else{y=this.getHandlerInfoForDynamicSegment(m,p,v.names,f,g,n,o)}}else{y=this.createParamHandlerInfo(m,p,v.names,f,g)}if(i){y=y.becomeResolved(null,y.context);var b=g&&g.context;if(v.names.length>0&&y.context===b){y.params=g&&g.params}y.context=b}var I=g;if(o>=d||y.shouldSupercede(g)){d=Math.min(o,d);I=y}if(a&&!i){I=I.becomeResolved(null,I.context)}u.handlerInfos.unshift(I)}if(f.length>0){throw new Error("More context objects were passed than there are dynamic segments for the route: "+n)}if(!a){this.invalidateChildren(u.handlerInfos,d)}h(u.queryParams,this.queryParams||{});return u},invalidateChildren:function(e,r){for(var t=r,n=e.length;t<n;++t){var a=e[t];e[t]=e[t].getUnresolved()}},getHandlerInfoForDynamicSegment:function(e,r,t,n,a,i,s){var u=t.length;var h;if(n.length>0){h=n[n.length-1];if(l(h)){return this.createParamHandlerInfo(e,r,t,n,a)}else{n.pop()}}else if(a&&a.name===e){return a}else{if(this.preTransitionState){var f=this.preTransitionState.handlerInfos[s];h=f&&f.context}else{return a}}return o("object",{name:e,handler:r,context:h,names:t})},createParamHandlerInfo:function(e,r,t,n,a){var i={};var s=t.length;while(s--){var u=a&&e===a.name&&a.params||{};var h=n[n.length-1];var f=t[s];if(l(h)){i[f]=""+n.pop()}else{if(u.hasOwnProperty(f)){i[f]=u[f]}else{throw new Error("You didn't provide enough string/numeric parameters to satisfy all of the dynamic segments for route "+e)}}}return o("param",{name:e,handler:r,params:i})}})});n("router/transition-intent/url-transition-intent",["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],function(e,r,t,n,a){"use strict";var i=e["default"];var s=r["default"];var o=t["default"];var l=n.oCreate;var u=n.merge;var h=n.subclass;a["default"]=h(i,{url:null,initialize:function(e){this.url=e.url},applyToState:function(e,r,t){var n=new s;var a=r.recognize(this.url),i={},l,h;if(!a){throw new f(this.url)}var d=false;for(l=0,h=a.length;l<h;++l){var c=a[l];var v=c.handler;var m=t(v);if(m.inaccessibleByURL){throw new f(this.url)}var p=o("param",{name:v,handler:m,params:c.params});var g=e.handlerInfos[l];if(d||p.shouldSupercede(g)){d=true;n.handlerInfos[l]=p}else{n.handlerInfos[l]=g}}u(n.queryParams,a.queryParams);return n}});function f(e){this.message=e||"UnrecognizedURLError";this.name="UnrecognizedURLError"}});n("router/transition-state",["./handler-info","./utils","rsvp/promise","exports"],function(e,r,t,n){"use strict";var a=e.ResolvedHandlerInfo;var i=r.forEach;var s=r.promiseLabel;var o=r.callHook;var l=t["default"];function u(e){this.handlerInfos=[];this.queryParams={};this.params={}}u.prototype={handlerInfos:null,queryParams:null,params:null,promiseLabel:function(e){var r="";i(this.handlerInfos,function(e){if(r!==""){r+="."}r+=e.name});return s("'"+r+"': "+e)},resolve:function(e,r){var t=this;var n=this.params;i(this.handlerInfos,function(e){n[e.name]=e.params||{}});r=r||{};r.resolveIndex=0;var a=this;var s=false;return l.resolve(null,this.promiseLabel("Start transition")).then(d,null,this.promiseLabel("Resolve handler"))["catch"](h,this.promiseLabel("Handle error"));function u(){return l.resolve(e(),a.promiseLabel("Check if should continue"))["catch"](function(e){s=true;return l.reject(e)},a.promiseLabel("Handle abort"))}function h(e){var t=a.handlerInfos;var n=r.resolveIndex>=t.length?t.length-1:r.resolveIndex;return l.reject({error:e,handlerWithError:a.handlerInfos[n].handler,wasAborted:s,state:a})}function f(e){var t=a.handlerInfos[r.resolveIndex].isResolved;a.handlerInfos[r.resolveIndex++]=e;if(!t){var n=e.handler;o(n,"redirect",e.context,r)}return u().then(d,null,a.promiseLabel("Resolve handler"))}function d(){if(r.resolveIndex===a.handlerInfos.length){return{error:null,state:a}}var e=a.handlerInfos[r.resolveIndex];return e.resolve(u,r).then(f,null,a.promiseLabel("Proceed"))}}};n["default"]=u});n("router/transition",["rsvp/promise","./handler-info","./utils","exports"],function(e,r,t,n){"use strict";var a=e["default"];var i=r.ResolvedHandlerInfo;var s=t.trigger;var o=t.slice;var l=t.log;var u=t.promiseLabel;function h(e,r,t,n){var i=this;this.state=t||e.state;this.intent=r;this.router=e;this.data=this.intent&&this.intent.data||{};this.resolvedModels={};this.queryParams={};if(n){this.promise=a.reject(n);return}if(t){this.params=t.params;this.queryParams=t.queryParams;this.handlerInfos=t.handlerInfos;var s=t.handlerInfos.length;if(s){this.targetName=t.handlerInfos[s-1].name}for(var o=0;o<s;++o){var l=t.handlerInfos[o];if(!l.isResolved){break}this.pivotHandler=l.handler}this.sequence=h.currentSequence++;this.promise=t.resolve(d,this)["catch"](function(e){if(e.wasAborted||i.isAborted){return a.reject(f(i))}else{i.trigger("error",e.error,i,e.handlerWithError);i.abort();return a.reject(e.error)}},u("Handle Abort"))}else{this.promise=a.resolve(this.state);this.params={}}function d(){if(i.isAborted){return a.reject(undefined,u("Transition aborted - reject"))}}}h.currentSequence=0;h.prototype={targetName:null,urlMethod:"update",intent:null,params:null,pivotHandler:null,resolveIndex:0,handlerInfos:null,resolvedModels:null,isActive:true,state:null,queryParamsOnly:false,isTransition:true,isExiting:function(e){var r=this.handlerInfos;for(var t=0,n=r.length;t<n;++t){var a=r[t];if(a.name===e||a.handler===e){return false}}return true},promise:null,data:null,then:function(e,r){return this.promise.then(e,r)},abort:function(){if(this.isAborted){return this}l(this.router,this.sequence,this.targetName+": transition was aborted");this.intent.preTransitionState=this.router.state;this.isAborted=true;this.isActive=false;this.router.activeTransition=null;return this},retry:function(){this.abort();return this.router.transitionByIntent(this.intent,false)},method:function(e){this.urlMethod=e;return this},trigger:function(e){var r=o.call(arguments);if(typeof e==="boolean"){r.shift()}else{e=false}s(this.router,this.state.handlerInfos.slice(0,this.resolveIndex+1),e,r)},followRedirects:function(){var e=this.router;return this.promise["catch"](function(r){if(e.activeTransition){return e.activeTransition.followRedirects()}return a.reject(r)})},toString:function(){return"Transition (sequence "+this.sequence+")"},log:function(e){l(this.router,this.sequence,e)}};h.prototype.send=h.prototype.trigger;function f(e){l(e.router,e.sequence,"detected abort.");return new d}function d(e){this.message=e||"TransitionAborted";this.name="TransitionAborted"}n.Transition=h;n.logAbort=f;n.TransitionAborted=d});n("router/utils",["exports"],function(e){"use strict";var r=Array.prototype.slice;var t;if(!Array.isArray){t=function(e){return Object.prototype.toString.call(e)==="[object Array]"}}else{t=Array.isArray}var n=t;e.isArray=n;function a(e,r){for(var t in r){if(r.hasOwnProperty(t)){e[t]=r[t]}}}var i=Object.create||function(e){function r(){}r.prototype=e;return new r};e.oCreate=i;function s(e){var t=e&&e.length,n,a;if(t&&t>0&&e[t-1]&&e[t-1].hasOwnProperty("queryParams")){a=e[t-1].queryParams;n=r.call(e,0,t-1);return[n,a]}else{return[e,null]}}e.extractQueryParams=s;function o(e){for(var r in e){if(typeof e[r]==="number"){e[r]=""+e[r]}else if(n(e[r])){for(var t=0,a=e[r].length;t<a;t++){e[r][t]=""+e[r][t]}}}}function l(e,r,t){if(!e.log){return}if(arguments.length===3){e.log("Transition #"+r+": "+t)}else{t=r;e.log(t)}}e.log=l;function u(e,t){var n=arguments;return function(a){var i=r.call(n,2);i.push(a);return t.apply(e,i)}}e.bind=u;function h(e){return typeof e==="string"||e instanceof String||typeof e==="number"||e instanceof Number}function f(e,r){for(var t=0,n=e.length;t<n&&false!==r(e[t]);t++){}}e.forEach=f;function d(e,r,t,n){if(e.triggerEvent){e.triggerEvent(r,t,n);return}var a=n.shift();if(!r){if(t){return}throw new Error("Could not trigger event '"+a+"'. There are no active handlers")}var i=false;for(var s=r.length-1;s>=0;s--){var o=r[s],l=o.handler;if(l.events&&l.events[a]){if(l.events[a].apply(l,n)===true){i=true}else{return}}}if(!i&&!t){throw new Error("Nothing handled the event '"+a+"'.")}}e.trigger=d;function c(e,r){var t;var i={all:{},changed:{},removed:{}};a(i.all,r);var s=false;o(e);o(r);for(t in e){if(e.hasOwnProperty(t)){if(!r.hasOwnProperty(t)){s=true;i.removed[t]=e[t]}}}for(t in r){if(r.hasOwnProperty(t)){if(n(e[t])&&n(r[t])){if(e[t].length!==r[t].length){i.changed[t]=r[t];s=true}else{for(var l=0,u=e[t].length;l<u;l++){if(e[t][l]!==r[t][l]){i.changed[t]=r[t];s=true}}}}else{if(e[t]!==r[t]){i.changed[t]=r[t];s=true}}}}return s&&i}e.getChangelist=c;function v(e){return"Router: "+e}e.promiseLabel=v;function m(e,r){function t(r){e.call(this,r||{})}t.prototype=i(e.prototype);a(t.prototype,r);return t}e.subclass=m;function p(e,r){if(!e){return}var t="_"+r;return e[t]&&t||e[r]&&r}function g(e,t){var n=r.call(arguments,2);return y(e,t,n)}function y(e,r,t){var n=p(e,r);if(n){return e[n].apply(e,t)}}e.merge=a;e.slice=r;e.isParam=h;e.coerceQueryParamsToString=o;e.callHook=g;e.resolveHook=p;e.applyHook=y});n("router",["./router/router","exports"],function(e,r){"use strict";var t=e["default"];r["default"]=t});n("route-recognizer",[],function(){return{"default":t}});n("rsvp",[],function(){return r});n("rsvp/promise",[],function(){return{"default":r.Promise}});window.Router=a("router")})(window,window.RSVP,window.RouteRecognizer);
\ No newline at end of file
diff --git a/lib/router/handler-info.js b/lib/router/handler-info.js
index 1a1ce87c..98193246 100644
--- a/lib/router/handler-info.js
+++ b/lib/router/handler-info.js
@@ -1,4 +1,4 @@
-import { bind, merge, serialize, promiseLabel } from './utils';
+import { bind, merge, serialize, promiseLabel, applyHook } from './utils';
 import Promise from 'rsvp/promise';
 
 function HandlerInfo(_props) {
@@ -85,8 +85,7 @@ HandlerInfo.prototype = {
     }
     args.push(payload);
 
-    var handler = this.handler;
-    var result = handler[hookName] && handler[hookName].apply(handler, args);
+    var result = applyHook(this.handler, hookName, args);
 
     if (result && result.isTransition) {
       result = null;
diff --git a/lib/router/handler-info/unresolved-handler-info-by-param.js b/lib/router/handler-info/unresolved-handler-info-by-param.js
index 004255f3..a5182518 100644
--- a/lib/router/handler-info/unresolved-handler-info-by-param.js
+++ b/lib/router/handler-info/unresolved-handler-info-by-param.js
@@ -1,5 +1,5 @@
 import HandlerInfo from '../handler-info';
-import { merge, subclass, promiseLabel } from 'router/utils';
+import { resolveHook, merge, subclass, promiseLabel } from 'router/utils';
 
 // Generated by URL transitions and non-dynamic route segments in named Transitions.
 var UnresolvedHandlerInfoByParam = subclass (HandlerInfo, {
@@ -15,8 +15,9 @@ var UnresolvedHandlerInfoByParam = subclass (HandlerInfo, {
       fullParams.queryParams = payload.queryParams;
     }
 
-    var hookName = typeof this.handler.deserialize === 'function' ?
-                   'deserialize' : 'model';
+    var handler = this.handler;
+    var hookName = resolveHook(handler, 'deserialize') ||
+                   resolveHook(handler, 'model');
 
     return this.runSharedModelHook(payload, hookName, [fullParams]);
   }
diff --git a/lib/router/router.js b/lib/router/router.js
index 58e668ab..78012997 100644
--- a/lib/router/router.js
+++ b/lib/router/router.js
@@ -1,6 +1,6 @@
 import RouteRecognizer from 'route-recognizer';
 import Promise from 'rsvp/promise';
-import { trigger, log, slice, forEach, merge, serialize, extractQueryParams, getChangelist, promiseLabel } from './utils';
+import { trigger, log, slice, forEach, merge, serialize, extractQueryParams, getChangelist, promiseLabel, callHook } from './utils';
 import TransitionState from './transition-state';
 import { logAbort, Transition, TransitionAborted } from './transition';
 import NamedTransitionIntent from './transition-intent/named-transition-intent';
@@ -144,9 +144,7 @@ Router.prototype = {
     if (this.state) {
       forEach(this.state.handlerInfos.slice().reverse(), function(handlerInfo) {
         var handler = handlerInfo.handler;
-        if (handler.exit) {
-          handler.exit();
-        }
+        callHook(handler, 'exit');
       });
     }
 
@@ -430,8 +428,9 @@ function setupContexts(router, newState, transition) {
   forEach(partition.exited, function(handlerInfo) {
     var handler = handlerInfo.handler;
     delete handler.context;
-    if (handler.reset) { handler.reset(true, transition); }
-    if (handler.exit) { handler.exit(transition); }
+
+    callHook(handler, 'reset', true, transition);
+    callHook(handler, 'exit', transition);
   });
 
   var oldState = router.oldState = router.state;
@@ -441,7 +440,7 @@ function setupContexts(router, newState, transition) {
   try {
     forEach(partition.reset, function(handlerInfo) {
       var handler = handlerInfo.handler;
-      if (handler.reset) { handler.reset(false, transition); }
+      callHook(handler, 'reset', false, transition);
     });
 
     forEach(partition.updatedContext, function(handlerInfo) {
@@ -472,15 +471,15 @@ function handlerEnteredOrUpdated(currentHandlerInfos, handlerInfo, enter, transi
   var handler = handlerInfo.handler,
       context = handlerInfo.context;
 
-  if (enter && handler.enter) { handler.enter(transition); }
+  callHook(handler, 'enter', transition);
   if (transition && transition.isAborted) {
     throw new TransitionAborted();
   }
 
   handler.context = context;
-  if (handler.contextDidChange) { handler.contextDidChange(); }
+  callHook(handler, 'contextDidChange');
 
-  if (handler.setup) { handler.setup(context, transition); }
+  callHook(handler, 'setup', context, transition);
   if (transition && transition.isAborted) {
     throw new TransitionAborted();
   }
diff --git a/lib/router/transition-state.js b/lib/router/transition-state.js
index 82bee96f..6aef122d 100644
--- a/lib/router/transition-state.js
+++ b/lib/router/transition-state.js
@@ -1,5 +1,5 @@
 import { ResolvedHandlerInfo } from './handler-info';
-import { forEach, promiseLabel } from './utils';
+import { forEach, promiseLabel, callHook } from './utils';
 import Promise from 'rsvp/promise';
 
 function TransitionState(other) {
@@ -80,9 +80,7 @@ TransitionState.prototype = {
         // routes don't re-run the model hooks for this
         // already-resolved route.
         var handler = resolvedHandlerInfo.handler;
-        if (handler && handler.redirect) {
-          handler.redirect(resolvedHandlerInfo.context, payload);
-        }
+        callHook(handler, 'redirect', resolvedHandlerInfo.context, payload);
       }
 
       // Proceed after ensuring that the redirect hook
diff --git a/lib/router/utils.js b/lib/router/utils.js
index d06825f2..1d20b6e3 100644
--- a/lib/router/utils.js
+++ b/lib/router/utils.js
@@ -186,4 +186,23 @@ export function subclass(parentConstructor, proto) {
   return C;
 }
 
-export { merge, slice, isParam, coerceQueryParamsToString };
+function resolveHook(obj, hookName) {
+  if (!obj) { return; }
+  var underscored = "_" + hookName;
+  return obj[underscored] && underscored ||
+         obj[hookName] && hookName;
+}
+
+function callHook(obj, hookName) {
+  var args = slice.call(arguments, 2);
+  return applyHook(obj, hookName, args);
+}
+
+function applyHook(obj, _hookName, args) {
+  var hookName = resolveHook(obj, _hookName);
+  if (hookName) {
+    return obj[hookName].apply(obj, args);
+  }
+}
+
+export { merge, slice, isParam, coerceQueryParamsToString, callHook, resolveHook, applyHook };
diff --git a/test/tests/utils_test.js b/test/tests/utils_test.js
index 9ca2f877..eea866e3 100644
--- a/test/tests/utils_test.js
+++ b/test/tests/utils_test.js
@@ -1,4 +1,4 @@
-import { getChangelist } from 'router/utils';
+import { getChangelist, callHook } from 'router/utils';
 
 module("utils");
 
@@ -19,3 +19,30 @@ test("getChangelist", function() {
   result = getChangelist({ foo: '123', bar: '456'}, { foo: '456'});
   deepEqual(result, { all: { foo: '456' }, changed: { foo: '456' }, removed: { bar: '456' } });
 });
+
+test("callHook invokes optional methods, preferring underscored versions", function() {
+  expect(8);
+
+  var obj = {
+    a: function(a, b, c) {
+      equal(a, 1);
+      equal(b, 2);
+      equal(c, 3);
+      equal(this, obj);
+      ok(true);
+      return "A";
+    },
+    _b: function() {
+      ok(true);
+      return "B";
+    },
+    b: function() {
+      ok(false, "b shouldn't be called");
+    }
+  };
+
+  equal("A", callHook(obj, 'a', 1, 2, 3));
+  equal("B", callHook(obj, 'b'));
+  callHook(null, "wat");
+});
+