diff --git a/README.md b/README.md
index 3f5de5b..d1d39f7 100644
--- a/README.md
+++ b/README.md
@@ -934,6 +934,16 @@ requirement, you are probably building a "Web Page" and not a "Web
 Application". Director on the client is meant for script-heavy Web
 Applications.
 
+# Development
+
+Server/CLI tests are run via `npm test`.
+
+Browser testing relies on `gulp` so do `gulp` & open:
+
+- http://localhost:8080/test/browser/browserify-harness.html
+- http://localhost:8080/test/browser/html5-routes-harness.html
+- http://localhost:8080/test/browser/routes-harness.html
+
 # Licence
 
 (The MIT License)
diff --git a/bin/build b/bin/build
deleted file mode 100755
index 6be431b..0000000
--- a/bin/build
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env node
-
-var Codesurgeon = require('codesurgeon').Codesurgeon;
-var surgeon = new Codesurgeon();
-
-var path    = require('path');
-
-var root    = path.join(__dirname, '..');
-var lib     = path.join(root, 'lib', 'director');
-
-//
-// Distill and package the browser version.
-//
-surgeon
-  //
-  .configure({
-    package: root + '/package.json',
-    owner: 'Nodejitsu, Inc (Using Codesurgeon).',
-    noVersion: true
-  })
-  .read(
-    path.join(lib, 'browser.js')
-  )
-  //
-  // We want everything so far. specify extract with no
-  // parameters to get everything into the output buffer.
-  //
- .extract()
-  //
-  // Clear the input so far, but don't clear the output.
-  //
-  .clear('inputs')
-  //
-  // Read the `router.js` file
-  //
-  .read(
-    path.join(lib, 'router.js')
-  )
-  //
-  // The current input buffer contains stuff that we dont
-  // want in the browser build, so let's cherry pick from
-  // the buffer.
-  //
-  .extract(
-    '_every',
-    '_flatten',
-    '_asyncEverySeries',
-    'paramifyString',
-    'regifyString',
-    'terminator',
-    'QUERY_SEPARATOR',
-    'Router.prototype.configure',
-    'Router.prototype.param',
-    'Router.prototype.on',
-    'Router.prototype.path',
-    'Router.prototype.dispatch',
-    'Router.prototype.invoke',
-    'Router.prototype.traverse',
-    'Router.prototype.insert',
-    'Router.prototype.insertEx',
-    'Router.prototype.extend',
-    'Router.prototype.runlist',
-    'Router.prototype.mount'
-  )
-  //
-  // Wrap everything that is in the current buffer with a
-  // closure so that we don't get any collisions with other
-  // libraries.
-  //
-  .wrap()
-  //
-  // Write the debuggable version of the file. This file will
-  // get renamed to include the version from the package.json.
-  //
-  .write(root + '/build/director.js')
-  //
-  // Make a minified version for production use.
-  //
-  .uglify()
-  .write(root + '/build/director.min.js')
-;
diff --git a/build/director.js b/build/director.js
index fe62960..dff1999 100644
--- a/build/director.js
+++ b/build/director.js
@@ -1,725 +1 @@
-
-
-//
-// Generated on Wed Nov 05 2014 22:50:42 GMT-0500 (EST) by Nodejitsu, Inc (Using Codesurgeon).
-// Version 1.2.4
-//
-
-(function (exports) {
-
-/*
- * browser.js: Browser specific functionality for director.
- *
- * (C) 2011, Nodejitsu Inc.
- * MIT LICENSE
- *
- */
-
-var dloc = document.location;
-
-function dlocHashEmpty() {
-  // Non-IE browsers return '' when the address bar shows '#'; Director's logic
-  // assumes both mean empty.
-  return dloc.hash === '' || dloc.hash === '#';
-}
-
-var listener = {
-  mode: 'modern',
-  hash: dloc.hash,
-  history: false,
-
-  check: function () {
-    var h = dloc.hash;
-    if (h != this.hash) {
-      this.hash = h;
-      this.onHashChanged();
-    }
-  },
-
-  fire: function () {
-    if (this.mode === 'modern') {
-      this.history === true ? window.onpopstate() : window.onhashchange();
-    }
-    else {
-      this.onHashChanged();
-    }
-  },
-
-  init: function (fn, history) {
-    var self = this;
-    this.history = history;
-
-    if (!Router.listeners) {
-      Router.listeners = [];
-    }
-
-    function onchange(onChangeEvent) {
-      for (var i = 0, l = Router.listeners.length; i < l; i++) {
-        Router.listeners[i](onChangeEvent);
-      }
-    }
-
-    //note IE8 is being counted as 'modern' because it has the hashchange event
-    if ('onhashchange' in window && (document.documentMode === undefined
-      || document.documentMode > 7)) {
-      // At least for now HTML5 history is available for 'modern' browsers only
-      if (this.history === true) {
-        // There is an old bug in Chrome that causes onpopstate to fire even
-        // upon initial page load. Since the handler is run manually in init(),
-        // this would cause Chrome to run it twise. Currently the only
-        // workaround seems to be to set the handler after the initial page load
-        // http://code.google.com/p/chromium/issues/detail?id=63040
-        setTimeout(function() {
-          window.onpopstate = onchange;
-        }, 500);
-      }
-      else {
-        window.onhashchange = onchange;
-      }
-      this.mode = 'modern';
-    }
-    else {
-      //
-      // IE support, based on a concept by Erik Arvidson ...
-      //
-      var frame = document.createElement('iframe');
-      frame.id = 'state-frame';
-      frame.style.display = 'none';
-      document.body.appendChild(frame);
-      this.writeFrame('');
-
-      if ('onpropertychange' in document && 'attachEvent' in document) {
-        document.attachEvent('onpropertychange', function () {
-          if (event.propertyName === 'location') {
-            self.check();
-          }
-        });
-      }
-
-      window.setInterval(function () { self.check(); }, 50);
-
-      this.onHashChanged = onchange;
-      this.mode = 'legacy';
-    }
-
-    Router.listeners.push(fn);
-
-    return this.mode;
-  },
-
-  destroy: function (fn) {
-    if (!Router || !Router.listeners) {
-      return;
-    }
-
-    var listeners = Router.listeners;
-
-    for (var i = listeners.length - 1; i >= 0; i--) {
-      if (listeners[i] === fn) {
-        listeners.splice(i, 1);
-      }
-    }
-  },
-
-  setHash: function (s) {
-    // Mozilla always adds an entry to the history
-    if (this.mode === 'legacy') {
-      this.writeFrame(s);
-    }
-
-    if (this.history === true) {
-      window.history.pushState({}, document.title, s);
-      // Fire an onpopstate event manually since pushing does not obviously
-      // trigger the pop event.
-      this.fire();
-    } else {
-      dloc.hash = (s[0] === '/') ? s : '/' + s;
-    }
-    return this;
-  },
-
-  writeFrame: function (s) {
-    // IE support...
-    var f = document.getElementById('state-frame');
-    var d = f.contentDocument || f.contentWindow.document;
-    d.open();
-    d.write("<script>_hash = '" + s + "'; onload = parent.listener.syncHash;<script>");
-    d.close();
-  },
-
-  syncHash: function () {
-    // IE support...
-    var s = this._hash;
-    if (s != dloc.hash) {
-      dloc.hash = s;
-    }
-    return this;
-  },
-
-  onHashChanged: function () {}
-};
-
-var Router = exports.Router = function (routes) {
-  if (!(this instanceof Router)) return new Router(routes);
-
-  this.params   = {};
-  this.routes   = {};
-  this.methods  = ['on', 'once', 'after', 'before'];
-  this.scope    = [];
-  this._methods = {};
-
-  this._insert = this.insert;
-  this.insert = this.insertEx;
-
-  this.historySupport = (window.history != null ? window.history.pushState : null) != null
-
-  this.configure();
-  this.mount(routes || {});
-};
-
-Router.prototype.init = function (r) {
-  var self = this
-    , routeTo;
-  this.handler = function(onChangeEvent) {
-    var newURL = onChangeEvent && onChangeEvent.newURL || window.location.hash;
-    var url = self.history === true ? self.getPath() : newURL.replace(/.*#/, '');
-    self.dispatch('on', url.charAt(0) === '/' ? url : '/' + url);
-  };
-
-  listener.init(this.handler, this.history);
-
-  if (this.history === false) {
-    if (dlocHashEmpty() && r) {
-      dloc.hash = r;
-    } else if (!dlocHashEmpty()) {
-      self.dispatch('on', '/' + dloc.hash.replace(/^(#\/|#|\/)/, ''));
-    }
-  }
-  else {
-    if (this.convert_hash_in_init) {
-      // Use hash as route
-      routeTo = dlocHashEmpty() && r ? r : !dlocHashEmpty() ? dloc.hash.replace(/^#/, '') : null;
-      if (routeTo) {
-        window.history.replaceState({}, document.title, routeTo);
-      }
-    }
-    else {
-      // Use canonical url
-      routeTo = this.getPath();
-    }
-
-    // Router has been initialized, but due to the chrome bug it will not
-    // yet actually route HTML5 history state changes. Thus, decide if should route.
-    if (routeTo || this.run_in_init === true) {
-      this.handler();
-    }
-  }
-
-  return this;
-};
-
-Router.prototype.explode = function () {
-  var v = this.history === true ? this.getPath() : dloc.hash;
-  if (v.charAt(1) === '/') { v=v.slice(1) }
-  return v.slice(1, v.length).split("/");
-};
-
-Router.prototype.setRoute = function (i, v, val) {
-  var url = this.explode();
-
-  if (typeof i === 'number' && typeof v === 'string') {
-    url[i] = v;
-  }
-  else if (typeof val === 'string') {
-    url.splice(i, v, s);
-  }
-  else {
-    url = [i];
-  }
-
-  listener.setHash(url.join('/'));
-  return url;
-};
-
-//
-// ### function insertEx(method, path, route, parent)
-// #### @method {string} Method to insert the specific `route`.
-// #### @path {Array} Parsed path to insert the `route` at.
-// #### @route {Array|function} Route handlers to insert.
-// #### @parent {Object} **Optional** Parent "routes" to insert into.
-// insert a callback that will only occur once per the matched route.
-//
-Router.prototype.insertEx = function(method, path, route, parent) {
-  if (method === "once") {
-    method = "on";
-    route = function(route) {
-      var once = false;
-      return function() {
-        if (once) return;
-        once = true;
-        return route.apply(this, arguments);
-      };
-    }(route);
-  }
-  return this._insert(method, path, route, parent);
-};
-
-Router.prototype.getRoute = function (v) {
-  var ret = v;
-
-  if (typeof v === "number") {
-    ret = this.explode()[v];
-  }
-  else if (typeof v === "string"){
-    var h = this.explode();
-    ret = h.indexOf(v);
-  }
-  else {
-    ret = this.explode();
-  }
-
-  return ret;
-};
-
-Router.prototype.destroy = function () {
-  listener.destroy(this.handler);
-  return this;
-};
-
-Router.prototype.getPath = function () {
-  var path = window.location.pathname;
-  if (path.substr(0, 1) !== '/') {
-    path = '/' + path;
-  }
-  return path;
-};
-function _every(arr, iterator) {
-  for (var i = 0; i < arr.length; i += 1) {
-    if (iterator(arr[i], i, arr) === false) {
-      return;
-    }
-  }
-}
-
-function _flatten(arr) {
-  var flat = [];
-  for (var i = 0, n = arr.length; i < n; i++) {
-    flat = flat.concat(arr[i]);
-  }
-  return flat;
-}
-
-function _asyncEverySeries(arr, iterator, callback) {
-  if (!arr.length) {
-    return callback();
-  }
-  var completed = 0;
-  (function iterate() {
-    iterator(arr[completed], function(err) {
-      if (err || err === false) {
-        callback(err);
-        callback = function() {};
-      } else {
-        completed += 1;
-        if (completed === arr.length) {
-          callback();
-        } else {
-          iterate();
-        }
-      }
-    });
-  })();
-}
-
-function paramifyString(str, params, mod) {
-  mod = str;
-  for (var param in params) {
-    if (params.hasOwnProperty(param)) {
-      mod = params[param](str);
-      if (mod !== str) {
-        break;
-      }
-    }
-  }
-  return mod === str ? "([._a-zA-Z0-9-]+)" : mod;
-}
-
-function regifyString(str, params) {
-  var matches, last = 0, out = "";
-  while (matches = str.substr(last).match(/[^\w\d\- %@&]*\*[^\w\d\- %@&]*/)) {
-    last = matches.index + matches[0].length;
-    matches[0] = matches[0].replace(/^\*/, "([_.()!\\ %@&a-zA-Z0-9-]+)");
-    out += str.substr(0, matches.index) + matches[0];
-  }
-  str = out += str.substr(last);
-  var captures = str.match(/:([^\/]+)/ig), capture, length;
-  if (captures) {
-    length = captures.length;
-    for (var i = 0; i < length; i++) {
-      capture = captures[i];
-      if (capture.slice(0, 2) === "::") {
-        str = capture.slice(1);
-      } else {
-        str = str.replace(capture, paramifyString(capture, params));
-      }
-    }
-  }
-  return str;
-}
-
-function terminator(routes, delimiter, start, stop) {
-  var last = 0, left = 0, right = 0, start = (start || "(").toString(), stop = (stop || ")").toString(), i;
-  for (i = 0; i < routes.length; i++) {
-    var chunk = routes[i];
-    if (chunk.indexOf(start, last) > chunk.indexOf(stop, last) || ~chunk.indexOf(start, last) && !~chunk.indexOf(stop, last) || !~chunk.indexOf(start, last) && ~chunk.indexOf(stop, last)) {
-      left = chunk.indexOf(start, last);
-      right = chunk.indexOf(stop, last);
-      if (~left && !~right || !~left && ~right) {
-        var tmp = routes.slice(0, (i || 1) + 1).join(delimiter);
-        routes = [ tmp ].concat(routes.slice((i || 1) + 1));
-      }
-      last = (right > left ? right : left) + 1;
-      i = 0;
-    } else {
-      last = 0;
-    }
-  }
-  return routes;
-}
-
-var QUERY_SEPARATOR = /\?.*/;
-
-Router.prototype.configure = function(options) {
-  options = options || {};
-  for (var i = 0; i < this.methods.length; i++) {
-    this._methods[this.methods[i]] = true;
-  }
-  this.recurse = options.recurse || this.recurse || false;
-  this.async = options.async || false;
-  this.delimiter = options.delimiter || "/";
-  this.strict = typeof options.strict === "undefined" ? true : options.strict;
-  this.notfound = options.notfound;
-  this.resource = options.resource;
-  this.history = options.html5history && this.historySupport || false;
-  this.run_in_init = this.history === true && options.run_handler_in_init !== false;
-  this.convert_hash_in_init = this.history === true && options.convert_hash_in_init !== false;
-  this.every = {
-    after: options.after || null,
-    before: options.before || null,
-    on: options.on || null
-  };
-  return this;
-};
-
-Router.prototype.param = function(token, matcher) {
-  if (token[0] !== ":") {
-    token = ":" + token;
-  }
-  var compiled = new RegExp(token, "g");
-  this.params[token] = function(str) {
-    return str.replace(compiled, matcher.source || matcher);
-  };
-  return this;
-};
-
-Router.prototype.on = Router.prototype.route = function(method, path, route) {
-  var self = this;
-  if (!route && typeof path == "function") {
-    route = path;
-    path = method;
-    method = "on";
-  }
-  if (Array.isArray(path)) {
-    return path.forEach(function(p) {
-      self.on(method, p, route);
-    });
-  }
-  if (path.source) {
-    path = path.source.replace(/\\\//ig, "/");
-  }
-  if (Array.isArray(method)) {
-    return method.forEach(function(m) {
-      self.on(m.toLowerCase(), path, route);
-    });
-  }
-  path = path.split(new RegExp(this.delimiter));
-  path = terminator(path, this.delimiter);
-  this.insert(method, this.scope.concat(path), route);
-};
-
-Router.prototype.path = function(path, routesFn) {
-  var self = this, length = this.scope.length;
-  if (path.source) {
-    path = path.source.replace(/\\\//ig, "/");
-  }
-  path = path.split(new RegExp(this.delimiter));
-  path = terminator(path, this.delimiter);
-  this.scope = this.scope.concat(path);
-  routesFn.call(this, this);
-  this.scope.splice(length, path.length);
-};
-
-Router.prototype.dispatch = function(method, path, callback) {
-  var self = this, fns = this.traverse(method, path.replace(QUERY_SEPARATOR, ""), this.routes, ""), invoked = this._invoked, after;
-  this._invoked = true;
-  if (!fns || fns.length === 0) {
-    this.last = [];
-    if (typeof this.notfound === "function") {
-      this.invoke([ this.notfound ], {
-        method: method,
-        path: path
-      }, callback);
-    }
-    return false;
-  }
-  if (this.recurse === "forward") {
-    fns = fns.reverse();
-  }
-  function updateAndInvoke() {
-    self.last = fns.after;
-    self.invoke(self.runlist(fns), self, callback);
-  }
-  after = this.every && this.every.after ? [ this.every.after ].concat(this.last) : [ this.last ];
-  if (after && after.length > 0 && invoked) {
-    if (this.async) {
-      this.invoke(after, this, updateAndInvoke);
-    } else {
-      this.invoke(after, this);
-      updateAndInvoke();
-    }
-    return true;
-  }
-  updateAndInvoke();
-  return true;
-};
-
-Router.prototype.invoke = function(fns, thisArg, callback) {
-  var self = this;
-  var apply;
-  if (this.async) {
-    apply = function(fn, next) {
-      if (Array.isArray(fn)) {
-        return _asyncEverySeries(fn, apply, next);
-      } else if (typeof fn == "function") {
-        fn.apply(thisArg, (fns.captures || []).concat(next));
-      }
-    };
-    _asyncEverySeries(fns, apply, function() {
-      if (callback) {
-        callback.apply(thisArg, arguments);
-      }
-    });
-  } else {
-    apply = function(fn) {
-      if (Array.isArray(fn)) {
-        return _every(fn, apply);
-      } else if (typeof fn === "function") {
-        return fn.apply(thisArg, fns.captures || []);
-      } else if (typeof fn === "string" && self.resource) {
-        self.resource[fn].apply(thisArg, fns.captures || []);
-      }
-    };
-    _every(fns, apply);
-  }
-};
-
-Router.prototype.traverse = function(method, path, routes, regexp, filter) {
-  var fns = [], current, exact, match, next, that;
-  function filterRoutes(routes) {
-    if (!filter) {
-      return routes;
-    }
-    function deepCopy(source) {
-      var result = [];
-      for (var i = 0; i < source.length; i++) {
-        result[i] = Array.isArray(source[i]) ? deepCopy(source[i]) : source[i];
-      }
-      return result;
-    }
-    function applyFilter(fns) {
-      for (var i = fns.length - 1; i >= 0; i--) {
-        if (Array.isArray(fns[i])) {
-          applyFilter(fns[i]);
-          if (fns[i].length === 0) {
-            fns.splice(i, 1);
-          }
-        } else {
-          if (!filter(fns[i])) {
-            fns.splice(i, 1);
-          }
-        }
-      }
-    }
-    var newRoutes = deepCopy(routes);
-    newRoutes.matched = routes.matched;
-    newRoutes.captures = routes.captures;
-    newRoutes.after = routes.after.filter(filter);
-    applyFilter(newRoutes);
-    return newRoutes;
-  }
-  if (path === this.delimiter && routes[method]) {
-    next = [ [ routes.before, routes[method] ].filter(Boolean) ];
-    next.after = [ routes.after ].filter(Boolean);
-    next.matched = true;
-    next.captures = [];
-    return filterRoutes(next);
-  }
-  for (var r in routes) {
-    if (routes.hasOwnProperty(r) && (!this._methods[r] || this._methods[r] && typeof routes[r] === "object" && !Array.isArray(routes[r]))) {
-      current = exact = regexp + this.delimiter + r;
-      if (!this.strict) {
-        exact += "[" + this.delimiter + "]?";
-      }
-      match = path.match(new RegExp("^" + exact));
-      if (!match) {
-        continue;
-      }
-      if (match[0] && match[0] == path && routes[r][method]) {
-        next = [ [ routes[r].before, routes[r][method] ].filter(Boolean) ];
-        next.after = [ routes[r].after ].filter(Boolean);
-        next.matched = true;
-        next.captures = match.slice(1);
-        if (this.recurse && routes === this.routes) {
-          next.push([ routes.before, routes.on ].filter(Boolean));
-          next.after = next.after.concat([ routes.after ].filter(Boolean));
-        }
-        return filterRoutes(next);
-      }
-      next = this.traverse(method, path, routes[r], current);
-      if (next.matched) {
-        if (next.length > 0) {
-          fns = fns.concat(next);
-        }
-        if (this.recurse) {
-          fns.push([ routes[r].before, routes[r].on ].filter(Boolean));
-          next.after = next.after.concat([ routes[r].after ].filter(Boolean));
-          if (routes === this.routes) {
-            fns.push([ routes["before"], routes["on"] ].filter(Boolean));
-            next.after = next.after.concat([ routes["after"] ].filter(Boolean));
-          }
-        }
-        fns.matched = true;
-        fns.captures = next.captures;
-        fns.after = next.after;
-        return filterRoutes(fns);
-      }
-    }
-  }
-  return false;
-};
-
-Router.prototype.insert = function(method, path, route, parent) {
-  var methodType, parentType, isArray, nested, part;
-  path = path.filter(function(p) {
-    return p && p.length > 0;
-  });
-  parent = parent || this.routes;
-  part = path.shift();
-  if (/\:|\*/.test(part) && !/\\d|\\w/.test(part)) {
-    part = regifyString(part, this.params);
-  }
-  if (path.length > 0) {
-    parent[part] = parent[part] || {};
-    return this.insert(method, path, route, parent[part]);
-  }
-  if (!part && !path.length && parent === this.routes) {
-    methodType = typeof parent[method];
-    switch (methodType) {
-     case "function":
-      parent[method] = [ parent[method], route ];
-      return;
-     case "object":
-      parent[method].push(route);
-      return;
-     case "undefined":
-      parent[method] = route;
-      return;
-    }
-    return;
-  }
-  parentType = typeof parent[part];
-  isArray = Array.isArray(parent[part]);
-  if (parent[part] && !isArray && parentType == "object") {
-    methodType = typeof parent[part][method];
-    switch (methodType) {
-     case "function":
-      parent[part][method] = [ parent[part][method], route ];
-      return;
-     case "object":
-      parent[part][method].push(route);
-      return;
-     case "undefined":
-      parent[part][method] = route;
-      return;
-    }
-  } else if (parentType == "undefined") {
-    nested = {};
-    nested[method] = route;
-    parent[part] = nested;
-    return;
-  }
-  throw new Error("Invalid route context: " + parentType);
-};
-
-
-
-Router.prototype.extend = function(methods) {
-  var self = this, len = methods.length, i;
-  function extend(method) {
-    self._methods[method] = true;
-    self[method] = function() {
-      var extra = arguments.length === 1 ? [ method, "" ] : [ method ];
-      self.on.apply(self, extra.concat(Array.prototype.slice.call(arguments)));
-    };
-  }
-  for (i = 0; i < len; i++) {
-    extend(methods[i]);
-  }
-};
-
-Router.prototype.runlist = function(fns) {
-  var runlist = this.every && this.every.before ? [ this.every.before ].concat(_flatten(fns)) : _flatten(fns);
-  if (this.every && this.every.on) {
-    runlist.push(this.every.on);
-  }
-  runlist.captures = fns.captures;
-  runlist.source = fns.source;
-  return runlist;
-};
-
-Router.prototype.mount = function(routes, path) {
-  if (!routes || typeof routes !== "object" || Array.isArray(routes)) {
-    return;
-  }
-  var self = this;
-  path = path || [];
-  if (!Array.isArray(path)) {
-    path = path.split(self.delimiter);
-  }
-  function insertOrMount(route, local) {
-    var rename = route, parts = route.split(self.delimiter), routeType = typeof routes[route], isRoute = parts[0] === "" || !self._methods[parts[0]], event = isRoute ? "on" : rename;
-    if (isRoute) {
-      rename = rename.slice((rename.match(new RegExp("^" + self.delimiter)) || [ "" ])[0].length);
-      parts.shift();
-    }
-    if (isRoute && routeType === "object" && !Array.isArray(routes[route])) {
-      local = local.concat(parts);
-      self.mount(routes[route], local);
-      return;
-    }
-    if (isRoute) {
-      local = local.concat(rename.split(self.delimiter));
-      local = terminator(local, self.delimiter);
-    }
-    self.insert(event, local, routes[route]);
-  }
-  for (var route in routes) {
-    if (routes.hasOwnProperty(route)) {
-      insertOrMount(route, path.slice(0));
-    }
-  }
-};
-
-
-
-}(typeof exports === "object" ? exports : window));
\ No newline at end of file
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({},{},[]);
diff --git a/build/director.min.js b/build/director.min.js
index 2c7a627..a957008 100644
--- a/build/director.min.js
+++ b/build/director.min.js
@@ -1,7 +1 @@
-
-
-//
-// Generated on Wed Nov 05 2014 22:50:43 GMT-0500 (EST) by Nodejitsu, Inc (Using Codesurgeon).
-// Version 1.2.4
-//
-(function(a){function c(){return b.hash===""||b.hash==="#"}function f(a,b){for(var c=0;c<a.length;c+=1)if(b(a[c],c,a)===!1)return}function g(a){var b=[];for(var c=0,d=a.length;c<d;c++)b=b.concat(a[c]);return b}function h(a,b,c){if(!a.length)return c();var d=0;(function e(){b(a[d],function(b){b||b===!1?(c(b),c=function(){}):(d+=1,d===a.length?c():e())})})()}function i(a,b,c){c=a;for(var d in b)if(b.hasOwnProperty(d)){c=b[d](a);if(c!==a)break}return c===a?"([._a-zA-Z0-9-]+)":c}function j(a,b){var c,d=0,e="";while(c=a.substr(d).match(/[^\w\d\- %@&]*\*[^\w\d\- %@&]*/))d=c.index+c[0].length,c[0]=c[0].replace(/^\*/,"([_.()!\\ %@&a-zA-Z0-9-]+)"),e+=a.substr(0,c.index)+c[0];a=e+=a.substr(d);var f=a.match(/:([^\/]+)/ig),g,h;if(f){h=f.length;for(var j=0;j<h;j++)g=f[j],g.slice(0,2)==="::"?a=g.slice(1):a=a.replace(g,i(g,b))}return a}function k(a,b,c,d){var e=0,f=0,g=0,c=(c||"(").toString(),d=(d||")").toString(),h;for(h=0;h<a.length;h++){var i=a[h];if(i.indexOf(c,e)>i.indexOf(d,e)||~i.indexOf(c,e)&&!~i.indexOf(d,e)||!~i.indexOf(c,e)&&~i.indexOf(d,e)){f=i.indexOf(c,e),g=i.indexOf(d,e);if(~f&&!~g||!~f&&~g){var j=a.slice(0,(h||1)+1).join(b);a=[j].concat(a.slice((h||1)+1))}e=(g>f?g:f)+1,h=0}else e=0}return a}var b=document.location,d={mode:"modern",hash:b.hash,history:!1,check:function(){var a=b.hash;a!=this.hash&&(this.hash=a,this.onHashChanged())},fire:function(){this.mode==="modern"?this.history===!0?window.onpopstate():window.onhashchange():this.onHashChanged()},init:function(a,b){function d(a){for(var b=0,c=e.listeners.length;b<c;b++)e.listeners[b](a)}var c=this;this.history=b,e.listeners||(e.listeners=[]);if("onhashchange"in window&&(document.documentMode===undefined||document.documentMode>7))this.history===!0?setTimeout(function(){window.onpopstate=d},500):window.onhashchange=d,this.mode="modern";else{var f=document.createElement("iframe");f.id="state-frame",f.style.display="none",document.body.appendChild(f),this.writeFrame(""),"onpropertychange"in document&&"attachEvent"in document&&document.attachEvent("onpropertychange",function(){event.propertyName==="location"&&c.check()}),window.setInterval(function(){c.check()},50),this.onHashChanged=d,this.mode="legacy"}return e.listeners.push(a),this.mode},destroy:function(a){if(!e||!e.listeners)return;var b=e.listeners;for(var c=b.length-1;c>=0;c--)b[c]===a&&b.splice(c,1)},setHash:function(a){return this.mode==="legacy"&&this.writeFrame(a),this.history===!0?(window.history.pushState({},document.title,a),this.fire()):b.hash=a[0]==="/"?a:"/"+a,this},writeFrame:function(a){var b=document.getElementById("state-frame"),c=b.contentDocument||b.contentWindow.document;c.open(),c.write("<script>_hash = '"+a+"'; onload = parent.listener.syncHash;<script>"),c.close()},syncHash:function(){var a=this._hash;return a!=b.hash&&(b.hash=a),this},onHashChanged:function(){}},e=a.Router=function(a){if(this instanceof e)this.params={},this.routes={},this.methods=["on","once","after","before"],this.scope=[],this._methods={},this._insert=this.insert,this.insert=this.insertEx,this.historySupport=(window.history!=null?window.history.pushState:null)!=null,this.configure(),this.mount(a||{});else return new e(a)};e.prototype.init=function(a){var e=this,f;return this.handler=function(a){var b=a&&a.newURL||window.location.hash,c=e.history===!0?e.getPath():b.replace(/.*#/,"");e.dispatch("on",c.charAt(0)==="/"?c:"/"+c)},d.init(this.handler,this.history),this.history===!1?c()&&a?b.hash=a:c()||e.dispatch("on","/"+b.hash.replace(/^(#\/|#|\/)/,"")):(this.convert_hash_in_init?(f=c()&&a?a:c()?null:b.hash.replace(/^#/,""),f&&window.history.replaceState({},document.title,f)):f=this.getPath(),(f||this.run_in_init===!0)&&this.handler()),this},e.prototype.explode=function(){var a=this.history===!0?this.getPath():b.hash;return a.charAt(1)==="/"&&(a=a.slice(1)),a.slice(1,a.length).split("/")},e.prototype.setRoute=function(a,b,c){var e=this.explode();return typeof a=="number"&&typeof b=="string"?e[a]=b:typeof c=="string"?e.splice(a,b,s):e=[a],d.setHash(e.join("/")),e},e.prototype.insertEx=function(a,b,c,d){return a==="once"&&(a="on",c=function(a){var b=!1;return function(){if(b)return;return b=!0,a.apply(this,arguments)}}(c)),this._insert(a,b,c,d)},e.prototype.getRoute=function(a){var b=a;if(typeof a=="number")b=this.explode()[a];else if(typeof a=="string"){var c=this.explode();b=c.indexOf(a)}else b=this.explode();return b},e.prototype.destroy=function(){return d.destroy(this.handler),this},e.prototype.getPath=function(){var a=window.location.pathname;return a.substr(0,1)!=="/"&&(a="/"+a),a};var l=/\?.*/;e.prototype.configure=function(a){a=a||{};for(var b=0;b<this.methods.length;b++)this._methods[this.methods[b]]=!0;return this.recurse=a.recurse||this.recurse||!1,this.async=a.async||!1,this.delimiter=a.delimiter||"/",this.strict=typeof a.strict=="undefined"?!0:a.strict,this.notfound=a.notfound,this.resource=a.resource,this.history=a.html5history&&this.historySupport||!1,this.run_in_init=this.history===!0&&a.run_handler_in_init!==!1,this.convert_hash_in_init=this.history===!0&&a.convert_hash_in_init!==!1,this.every={after:a.after||null,before:a.before||null,on:a.on||null},this},e.prototype.param=function(a,b){a[0]!==":"&&(a=":"+a);var c=new RegExp(a,"g");return this.params[a]=function(a){return a.replace(c,b.source||b)},this},e.prototype.on=e.prototype.route=function(a,b,c){var d=this;!c&&typeof b=="function"&&(c=b,b=a,a="on");if(Array.isArray(b))return b.forEach(function(b){d.on(a,b,c)});b.source&&(b=b.source.replace(/\\\//ig,"/"));if(Array.isArray(a))return a.forEach(function(a){d.on(a.toLowerCase(),b,c)});b=b.split(new RegExp(this.delimiter)),b=k(b,this.delimiter),this.insert(a,this.scope.concat(b),c)},e.prototype.path=function(a,b){var c=this,d=this.scope.length;a.source&&(a=a.source.replace(/\\\//ig,"/")),a=a.split(new RegExp(this.delimiter)),a=k(a,this.delimiter),this.scope=this.scope.concat(a),b.call(this,this),this.scope.splice(d,a.length)},e.prototype.dispatch=function(a,b,c){function h(){d.last=e.after,d.invoke(d.runlist(e),d,c)}var d=this,e=this.traverse(a,b.replace(l,""),this.routes,""),f=this._invoked,g;return this._invoked=!0,!e||e.length===0?(this.last=[],typeof this.notfound=="function"&&this.invoke([this.notfound],{method:a,path:b},c),!1):(this.recurse==="forward"&&(e=e.reverse()),g=this.every&&this.every.after?[this.every.after].concat(this.last):[this.last],g&&g.length>0&&f?(this.async?this.invoke(g,this,h):(this.invoke(g,this),h()),!0):(h(),!0))},e.prototype.invoke=function(a,b,c){var d=this,e;this.async?(e=function(c,d){if(Array.isArray(c))return h(c,e,d);typeof c=="function"&&c.apply(b,(a.captures||[]).concat(d))},h(a,e,function(){c&&c.apply(b,arguments)})):(e=function(c){if(Array.isArray(c))return f(c,e);if(typeof c=="function")return c.apply(b,a.captures||[]);typeof c=="string"&&d.resource&&d.resource[c].apply(b,a.captures||[])},f(a,e))},e.prototype.traverse=function(a,b,c,d,e){function l(a){function b(a){var c=[];for(var d=0;d<a.length;d++)c[d]=Array.isArray(a[d])?b(a[d]):a[d];return c}function c(a){for(var b=a.length-1;b>=0;b--)Array.isArray(a[b])?(c(a[b]),a[b].length===0&&a.splice(b,1)):e(a[b])||a.splice(b,1)}if(!e)return a;var d=b(a);return d.matched=a.matched,d.captures=a.captures,d.after=a.after.filter(e),c(d),d}var f=[],g,h,i,j,k;if(b===this.delimiter&&c[a])return j=[[c.before,c[a]].filter(Boolean)],j.after=[c.after].filter(Boolean),j.matched=!0,j.captures=[],l(j);for(var m in c)if(c.hasOwnProperty(m)&&(!this._methods[m]||this._methods[m]&&typeof c[m]=="object"&&!Array.isArray(c[m]))){g=h=d+this.delimiter+m,this.strict||(h+="["+this.delimiter+"]?"),i=b.match(new RegExp("^"+h));if(!i)continue;if(i[0]&&i[0]==b&&c[m][a])return j=[[c[m].before,c[m][a]].filter(Boolean)],j.after=[c[m].after].filter(Boolean),j.matched=!0,j.captures=i.slice(1),this.recurse&&c===this.routes&&(j.push([c.before,c.on].filter(Boolean)),j.after=j.after.concat([c.after].filter(Boolean))),l(j);j=this.traverse(a,b,c[m],g);if(j.matched)return j.length>0&&(f=f.concat(j)),this.recurse&&(f.push([c[m].before,c[m].on].filter(Boolean)),j.after=j.after.concat([c[m].after].filter(Boolean)),c===this.routes&&(f.push([c.before,c.on].filter(Boolean)),j.after=j.after.concat([c.after].filter(Boolean)))),f.matched=!0,f.captures=j.captures,f.after=j.after,l(f)}return!1},e.prototype.insert=function(a,b,c,d){var e,f,g,h,i;b=b.filter(function(a){return a&&a.length>0}),d=d||this.routes,i=b.shift(),/\:|\*/.test(i)&&!/\\d|\\w/.test(i)&&(i=j(i,this.params));if(b.length>0)return d[i]=d[i]||{},this.insert(a,b,c,d[i]);if(!i&&!b.length&&d===this.routes){e=typeof d[a];switch(e){case"function":d[a]=[d[a],c];return;case"object":d[a].push(c);return;case"undefined":d[a]=c;return}return}f=typeof d[i],g=Array.isArray(d[i]);if(d[i]&&!g&&f=="object"){e=typeof d[i][a];switch(e){case"function":d[i][a]=[d[i][a],c];return;case"object":d[i][a].push(c);return;case"undefined":d[i][a]=c;return}}else if(f=="undefined"){h={},h[a]=c,d[i]=h;return}throw new Error("Invalid route context: "+f)},e.prototype.extend=function(a){function e(a){b._methods[a]=!0,b[a]=function(){var c=arguments.length===1?[a,""]:[a];b.on.apply(b,c.concat(Array.prototype.slice.call(arguments)))}}var b=this,c=a.length,d;for(d=0;d<c;d++)e(a[d])},e.prototype.runlist=function(a){var b=this.every&&this.every.before?[this.every.before].concat(g(a)):g(a);return this.every&&this.every.on&&b.push(this.every.on),b.captures=a.captures,b.source=a.source,b},e.prototype.mount=function(a,b){function d(b,d){var e=b,f=b.split(c.delimiter),g=typeof a[b],h=f[0]===""||!c._methods[f[0]],i=h?"on":e;h&&(e=e.slice((e.match(new RegExp("^"+c.delimiter))||[""])[0].length),f.shift());if(h&&g==="object"&&!Array.isArray(a[b])){d=d.concat(f),c.mount(a[b],d);return}h&&(d=d.concat(e.split(c.delimiter)),d=k(d,c.delimiter)),c.insert(i,d,a[b])}if(!a||typeof a!="object"||Array.isArray(a))return;var c=this;b=b||[],Array.isArray(b)||(b=b.split(c.delimiter));for(var e in a)a.hasOwnProperty(e)&&d(e,b.slice(0))}})(typeof exports=="object"?exports:window)
\ No newline at end of file
+!function(t){if("object"==typeof exports)module.exports=t();else if("function"==typeof define&&define.amd)define(t);else{var e;"undefined"!=typeof window?e=window:"undefined"!=typeof global?e=global:"undefined"!=typeof self&&(e=self),e.Router=t()}}(function(){return function t(e,r,n){function i(s,h){if(!r[s]){if(!e[s]){var a="function"==typeof require&&require;if(!h&&a)return a(s,!0);if(o)return o(s,!0);throw new Error("Cannot find module '"+s+"'")}var c=r[s]={exports:{}};e[s][0].call(c.exports,function(t){var r=e[s][1][t];return i(r?r:t)},c,c.exports,t,e,r,n)}return r[s].exports}for(var o="function"==typeof require&&require,s=0;s<n.length;s++)i(n[s]);return i}({1:[function(t,e){function r(){return""===i.hash||"#"===i.hash}var n=t("./router").Router,i=document.location,o={mode:"modern",hash:i.hash,history:!1,check:function(){var t=i.hash;t!=this.hash&&(this.hash=t,this.onHashChanged())},fire:function(){"modern"===this.mode?this.history===!0?window.onpopstate():window.onhashchange():this.onHashChanged()},init:function(t,e){function r(t){for(var e=0,r=h.listeners.length;r>e;e++)h.listeners[e](t)}var n=this;if(this.history=e,h.listeners||(h.listeners=[]),"onhashchange"in window&&(void 0===document.documentMode||document.documentMode>7))this.history===!0?setTimeout(function(){window.onpopstate=r},500):window.onhashchange=r,this.mode="modern";else{var i=document.createElement("iframe");i.id="state-frame",i.style.display="none",document.body.appendChild(i),this.writeFrame(""),"onpropertychange"in document&&"attachEvent"in document&&document.attachEvent("onpropertychange",function(){"location"===event.propertyName&&n.check()}),window.setInterval(function(){n.check()},50),this.onHashChanged=r,this.mode="legacy"}return h.listeners.push(t),this.mode},destroy:function(t){if(h&&h.listeners)for(var e=h.listeners,r=e.length-1;r>=0;r--)e[r]===t&&e.splice(r,1)},setHash:function(t){return"legacy"===this.mode&&this.writeFrame(t),this.history===!0?(window.history.pushState({},document.title,t),this.fire()):i.hash="/"===t[0]?t:"/"+t,this},writeFrame:function(t){var e=document.getElementById("state-frame"),r=e.contentDocument||e.contentWindow.document;r.open(),r.write("<script>_hash = '"+t+"'; onload = parent.listener.syncHash;<script>"),r.close()},syncHash:function(){var t=this._hash;return t!=i.hash&&(i.hash=t),this},onHashChanged:function(){}},h=e.exports=function(t){this.methods=["on","once","after","before"],this.historySupport=!(!window.history||!window.history.pushState),n.call(this,t)};h.prototype=Object.create(n.prototype),h.prototype.constructor=h,h.prototype.init=function(t){var e,n=this;return this.handler=function(t){var e=t&&t.newURL||window.location.hash,r=n.history===!0?n.getPath():e.replace(/.*#/,"");n.dispatch("on","/"===r.charAt(0)?r:"/"+r)},o.init(this.handler,this.history),this.history===!1?r()&&t?i.hash=t:r()||n.dispatch("on","/"+i.hash.replace(/^(#\/|#|\/)/,"")):(this.convert_hash_in_init?(e=r()&&t?t:r()?null:i.hash.replace(/^#/,""),e&&window.history.replaceState({},document.title,e)):e=this.getPath(),(e||this.run_in_init===!0)&&this.handler()),this},h.prototype.explode=function(){var t=this.history===!0?this.getPath():i.hash;return"/"===t.charAt(1)&&(t=t.slice(1)),t.slice(1,t.length).split("/")},h.prototype.setRoute=function(t,e,r){var n=this.explode();return"number"==typeof t&&"string"==typeof e?n[t]=e:"string"==typeof r?n.splice(t,e,s):n=[t],o.setHash(n.join("/")),n},h.prototype.insert=function(t,e,r,i){return"once"===t&&(t="on",r=function(t){var e=!1;return function(){return e?void 0:(e=!0,t.apply(this,arguments))}}(r)),n.prototype.insert.call(this,t,e,r,i)},h.prototype.getRoute=function(t){var e=t;if("number"==typeof t)e=this.explode()[t];else if("string"==typeof t){var r=this.explode();e=r.indexOf(t)}else e=this.explode();return e},h.prototype.destroy=function(){return o.destroy(this.handler),this},h.prototype.getPath=function(){var t=window.location.pathname;return"/"!==t.substr(0,1)&&(t="/"+t),t}},{"./router":2}],2:[function(t,e,r){function n(t){for(var e=[],r=0,n=t.length;n>r;r++)e=e.concat(t[r]);return e}function i(t,e){for(var r=0;r<t.length;r+=1)if(e(t[r],r,t)===!1)return}function o(t,e,r){if(!t.length)return r();var n=0;!function i(){e(t[n],function(e){e||e===!1?(r(e),r=function(){}):(n+=1,n===t.length?r():i())})}()}function s(t,e,r){r=t;for(var n in e)if(e.hasOwnProperty(n)&&(r=e[n](t),r!==t))break;return r===t?"([._a-zA-Z0-9-]+)":r}function h(t,e){for(var r,n=0,i="";r=t.substr(n).match(/[^\w\d\- %@&]*\*[^\w\d\- %@&]*/);)n=r.index+r[0].length,r[0]=r[0].replace(/^\*/,"([_.()!\\ %@&a-zA-Z0-9-]+)"),i+=t.substr(0,r.index)+r[0];t=i+=t.substr(n);var o,h,a=t.match(/:([^\/]+)/gi);if(a){h=a.length;for(var c=0;h>c;c++)o=a[c],t="::"===o.slice(0,2)?o.slice(1):t.replace(o,s(o,e))}return t}function a(t,e,r,n){var i,o=0,s=0,h=0,r=(r||"(").toString(),n=(n||")").toString();for(i=0;i<t.length;i++){var a=t[i];if(a.indexOf(r,o)>a.indexOf(n,o)||~a.indexOf(r,o)&&!~a.indexOf(n,o)||!~a.indexOf(r,o)&&~a.indexOf(n,o)){if(s=a.indexOf(r,o),h=a.indexOf(n,o),~s&&!~h||!~s&&~h){var c=t.slice(0,(i||1)+1).join(e);t=[c].concat(t.slice((i||1)+1))}o=(h>s?h:s)+1,i=0}else o=0}return t}var c=/\?.*/,u=r.Router=function(t){this.params={},this.routes={},this.methods||(this.methods=["on","after","before"]),this.scope=[],this._methods={},this.configure(),this.mount(t||{})};u.prototype.configure=function(t){t=t||{};for(var e=0;e<this.methods.length;e++)this._methods[this.methods[e]]=!0;return this.recurse=t.recurse||this.recurse||!1,this.async=t.async||!1,this.delimiter=t.delimiter||"/",this.strict="undefined"==typeof t.strict?!0:t.strict,this.notfound=t.notfound,this.resource=t.resource,this.history=t.html5history&&this.historySupport||!1,this.run_in_init=this.history===!0&&t.run_handler_in_init!==!1,this.convert_hash_in_init=this.history===!0&&t.convert_hash_in_init!==!1,this.every={after:t.after||null,before:t.before||null,on:t.on||null},this},u.prototype.param=function(t,e){":"!==t[0]&&(t=":"+t);var r=new RegExp(t,"g");return this.params[t]=function(t){return t.replace(r,e.source||e)},this},u.prototype.on=u.prototype.route=function(t,e,r){var n=this;return r||"function"!=typeof e||(r=e,e=t,t="on"),Array.isArray(e)?e.forEach(function(e){n.on(t,e,r)}):(e.source&&(e=e.source.replace(/\\\//gi,"/")),Array.isArray(t)?t.forEach(function(t){n.on(t.toLowerCase(),e,r)}):(e=e.split(new RegExp(this.delimiter)),e=a(e,this.delimiter),void this.insert(t,this.scope.concat(e),r)))},u.prototype.path=function(t,e){var r=this.scope.length;t.source&&(t=t.source.replace(/\\\//gi,"/")),t=t.split(new RegExp(this.delimiter)),t=a(t,this.delimiter),this.scope=this.scope.concat(t),e.call(this,this),this.scope.splice(r,t.length)},u.prototype.dispatch=function(t,e,r){function n(){o.last=s.after,o.invoke(o.runlist(s),o,r)}var i,o=this,s=this.traverse(t,e.replace(c,""),this.routes,""),h=this._invoked;return this._invoked=!0,s&&0!==s.length?("forward"===this.recurse&&(s=s.reverse()),i=this.every&&this.every.after?[this.every.after].concat(this.last):[this.last],i&&i.length>0&&h?(this.async?this.invoke(i,this,n):(this.invoke(i,this),n()),!0):(n(),!0)):(this.last=[],"function"==typeof this.notfound&&this.invoke([this.notfound],{method:t,path:e},r),!1)},u.prototype.runlist=function(t){var e=this.every&&this.every.before?[this.every.before].concat(n(t)):n(t);return this.every&&this.every.on&&e.push(this.every.on),e.captures=t.captures,e.source=t.source,e},u.prototype.invoke=function(t,e,r){var n,s=this;this.async?(n=function(r,i){return Array.isArray(r)?o(r,n,i):void("function"==typeof r&&r.apply(e,(t.captures||[]).concat(i)))},o(t,n,function(){r&&r.apply(e,arguments)})):(n=function(r){return Array.isArray(r)?i(r,n):"function"==typeof r?r.apply(e,t.captures||[]):void("string"==typeof r&&s.resource&&s.resource[r].apply(e,t.captures||[]))},i(t,n))},u.prototype.traverse=function(t,e,r,n,i){function o(t){function e(t){for(var r=[],n=0;n<t.length;n++)r[n]=Array.isArray(t[n])?e(t[n]):t[n];return r}function r(t){for(var e=t.length-1;e>=0;e--)Array.isArray(t[e])?(r(t[e]),0===t[e].length&&t.splice(e,1)):i(t[e])||t.splice(e,1)}if(!i)return t;var n=e(t);return n.matched=t.matched,n.captures=t.captures,n.after=t.after.filter(i),r(n),n}var s,h,a,c,u=[];if(e===this.delimiter&&r[t])return c=[[r.before,r[t]].filter(Boolean)],c.after=[r.after].filter(Boolean),c.matched=!0,c.captures=[],o(c);for(var f in r)if(r.hasOwnProperty(f)&&(!this._methods[f]||this._methods[f]&&"object"==typeof r[f]&&!Array.isArray(r[f]))){if(s=h=n+this.delimiter+f,this.strict||(h+="["+this.delimiter+"]?"),a=e.match(new RegExp("^"+h)),!a)continue;if(a[0]&&a[0]==e&&r[f][t])return c=[[r[f].before,r[f][t]].filter(Boolean)],c.after=[r[f].after].filter(Boolean),c.matched=!0,c.captures=a.slice(1),this.recurse&&r===this.routes&&(c.push([r.before,r.on].filter(Boolean)),c.after=c.after.concat([r.after].filter(Boolean))),o(c);if(c=this.traverse(t,e,r[f],s),c.matched)return c.length>0&&(u=u.concat(c)),this.recurse&&(u.push([r[f].before,r[f].on].filter(Boolean)),c.after=c.after.concat([r[f].after].filter(Boolean)),r===this.routes&&(u.push([r.before,r.on].filter(Boolean)),c.after=c.after.concat([r.after].filter(Boolean)))),u.matched=!0,u.captures=c.captures,u.after=c.after,o(u)}return!1},u.prototype.insert=function(t,e,r,n){var i,o,s,a,c;if(e=e.filter(function(t){return t&&t.length>0}),n=n||this.routes,c=e.shift(),/\:|\*/.test(c)&&!/\\d|\\w/.test(c)&&(c=h(c,this.params)),e.length>0)return n[c]=n[c]||{},this.insert(t,e,r,n[c]);if(c||e.length||n!==this.routes){if(o=typeof n[c],s=Array.isArray(n[c]),n[c]&&!s&&"object"==o)switch(i=typeof n[c][t]){case"function":return void(n[c][t]=[n[c][t],r]);case"object":return void n[c][t].push(r);case"undefined":return void(n[c][t]=r)}else if("undefined"==o)return a={},a[t]=r,void(n[c]=a);throw new Error("Invalid route context: "+o)}switch(i=typeof n[t]){case"function":return void(n[t]=[n[t],r]);case"object":return void n[t].push(r);case"undefined":return void(n[t]=r)}},u.prototype.extend=function(t){function e(t){n._methods[t]=!0,n[t]=function(){var e=1===arguments.length?[t,""]:[t];n.on.apply(n,e.concat(Array.prototype.slice.call(arguments)))}}var r,n=this,i=t.length;for(r=0;i>r;r++)e(t[r])},u.prototype.mount=function(t,e){function r(e,r){var i=e,o=e.split(n.delimiter),s=typeof t[e],h=""===o[0]||!n._methods[o[0]],c=h?"on":i;return h&&(i=i.slice((i.match(new RegExp("^"+n.delimiter))||[""])[0].length),o.shift()),h&&"object"===s&&!Array.isArray(t[e])?(r=r.concat(o),void n.mount(t[e],r)):(h&&(r=r.concat(i.split(n.delimiter)),r=a(r,n.delimiter)),void n.insert(c,r,t[e]))}if(t&&"object"==typeof t&&!Array.isArray(t)){var n=this;e=e||[],Array.isArray(e)||(e=e.split(n.delimiter));for(var i in t)t.hasOwnProperty(i)&&r(i,e.slice(0))}}},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000..5c6c8b7
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,31 @@
+var gulp = require('gulp')
+  , browserify = require('gulp-browserify')
+  , uglify = require('gulp-uglify')
+  , rename = require('gulp-rename')
+  , connect = require('gulp-connect')
+  ;
+
+gulp.task('default', ['watch', 'scripts', 'connect']);
+
+gulp.task('connect', function () {
+  connect.server();
+});
+
+gulp.task('scripts', function() {
+  // Single entry point to browserify
+  gulp.src('lib/director/browser.js')
+    .pipe(browserify({
+      standalone: 'Router',
+      bare: true
+    }))
+    .pipe(rename('director.js'))
+    .pipe(gulp.dest('./build/'))
+    .pipe(uglify())
+    .pipe(rename('director.min.js'))
+    .pipe(gulp.dest('./build/'));
+});
+
+// Rerun the task when a file changes
+gulp.task('watch', function() {
+  gulp.watch('lib/director/*.js', ['scripts']);
+});
diff --git a/lib/director.js b/lib/director.js
index f43ae82..745821f 100644
--- a/lib/director.js
+++ b/lib/director.js
@@ -1,6 +1,3 @@
-
-
-
 exports.Router = require('./director/router').Router;
 exports.http   = require('./director/http');
 exports.cli    = require('./director/cli');
diff --git a/lib/director/browser.js b/lib/director/browser.js
index 002d4b6..e8aa553 100644
--- a/lib/director/browser.js
+++ b/lib/director/browser.js
@@ -6,6 +6,7 @@
  *
  */
 
+var BaseRouter = require('./router').Router;
 var dloc = document.location;
 
 function dlocHashEmpty() {
@@ -150,24 +151,15 @@ var listener = {
   onHashChanged: function () {}
 };
 
-var Router = exports.Router = function (routes) {
-  if (!(this instanceof Router)) return new Router(routes);
-
-  this.params   = {};
-  this.routes   = {};
-  this.methods  = ['on', 'once', 'after', 'before'];
-  this.scope    = [];
-  this._methods = {};
-
-  this._insert = this.insert;
-  this.insert = this.insertEx;
-
-  this.historySupport = (window.history != null ? window.history.pushState : null) != null
-
-  this.configure();
-  this.mount(routes || {});
+var Router = module.exports = function (routes) {
+  this.methods = ['on', 'once', 'after', 'before'];
+  this.historySupport = !!(window.history && window.history.pushState);
+  BaseRouter.call(this, routes);
 };
 
+Router.prototype = Object.create(BaseRouter.prototype);
+Router.prototype.constructor = Router;
+
 Router.prototype.init = function (r) {
   var self = this
     , routeTo;
@@ -233,14 +225,14 @@ Router.prototype.setRoute = function (i, v, val) {
 };
 
 //
-// ### function insertEx(method, path, route, parent)
+// ### function insert(method, path, route, parent)
 // #### @method {string} Method to insert the specific `route`.
 // #### @path {Array} Parsed path to insert the `route` at.
 // #### @route {Array|function} Route handlers to insert.
 // #### @parent {Object} **Optional** Parent "routes" to insert into.
 // insert a callback that will only occur once per the matched route.
 //
-Router.prototype.insertEx = function(method, path, route, parent) {
+Router.prototype.insert = function(method, path, route, parent) {
   if (method === "once") {
     method = "on";
     route = function(route) {
@@ -252,7 +244,7 @@ Router.prototype.insertEx = function(method, path, route, parent) {
       };
     }(route);
   }
-  return this._insert(method, path, route, parent);
+  return BaseRouter.prototype.insert.call(this, method, path, route, parent);
 };
 
 Router.prototype.getRoute = function (v) {
diff --git a/lib/director/router.js b/lib/director/router.js
index c471d62..4d2b9eb 100644
--- a/lib/director/router.js
+++ b/lib/director/router.js
@@ -174,7 +174,7 @@ function terminator(routes, delimiter, start, stop) {
 var Router = exports.Router = function (routes) {
   this.params   = {};
   this.routes   = {};
-  this.methods  = ['on', 'after', 'before'];
+  this.methods || (this.methods = ['on', 'after', 'before']);
   this.scope    = [];
   this._methods = {};
 
diff --git a/package.json b/package.json
index f26199e..4caa003 100644
--- a/package.json
+++ b/package.json
@@ -22,13 +22,16 @@
     "ender"
   ],
   "devDependencies": {
-    "api-easy": "0.3.x",
-    "codesurgeon": "https://github.com/hij1nx/codesurgeon/tarball/master",
+    "api-easy": "~0.3.x",
     "colors": "~1.0.3",
+    "gulp": "~3.x",
+    "gulp-browserify": "~0.5.0",
+    "gulp-connect": "~2.2.0",
+    "gulp-rename": "~1.2.0",
+    "gulp-uglify": "~1.0.1",
     "qunitjs": "~1.9.x",
-    "request": "~2.47.0",
-    "uglify-js": "~2.4.15",
-    "vows": "0.7.x"
+    "request": "~2.49.0",
+    "vows": "~0.7.0"
   },
   "ender": "./build/ender.js",
   "browserify": "./build/director",
diff --git a/test/browser/backend/backend.js b/test/browser/backend/backend.js
deleted file mode 100644
index 67c680e..0000000
--- a/test/browser/backend/backend.js
+++ /dev/null
@@ -1,79 +0,0 @@
-var http     = require('http'),
-  fs       = require('fs'),
-  path     = require('path'),
-  director = require('../../../lib/director'),
-  index;
-
-fs.readFile(path.join(__dirname, '..', 'html5-routes-harness.html'), function (err, data) {
-  if (err) {
-    throw err;
-  }
-
-  index = data;
-});
-
-var CONTENT_TYPES = {
-  '.js'  : 'text/javascript',
-  '.css' : 'text/css'
-};
-
-var dirname = path.dirname(module.uri);
-
-// Dummy file server
-function fileServer(folder, file) {
-  var root = path.resolve(__dirname, '..');
-
-  if (folder === 'build' || folder === 'node_modules') {
-    root = path.resolve(root, '..', '..');
-  }
-
-  if (file === undefined) {
-    file = folder;
-    folder = '.';
-  }
-
-  var filepath = path.resolve(root, folder, file);
-
-  var res = this.res;
-
-  (fs.exists || path.exists)(filepath, function (exists) {
-    if (exists) {
-      fs.readFile(filepath, function (err, data) {
-        if (err) {
-          res.writeHead(404);
-          res.end();
-        }
-
-        res.writeHead(200, {'Content-Type': CONTENT_TYPES[path.extname(filepath)]});
-        res.end(data);
-      });
-    } else {
-      res.writeHead(404);
-      res.end();
-    }
-  });
-}
-
-var router = new director.http.Router({
-  '/files': {
-    '/:folder': {
-      '/(.+)': {
-        get: fileServer
-      },
-
-      get: fileServer
-    }
-  }
-});
-
-var server = http.createServer(function (req, res) {
-  router.dispatch(req, res, function (err) {
-    if (err && req.url !== '/favicon.ico') {
-      // By default just reply with the index page
-      this.res.writeHead(200, {'Content-Type': 'text/html'});
-      this.res.end(index);
-    }
-  });
-});
-
-server.listen(8080);
diff --git a/test/browser/browserify-harness.html b/test/browser/browserify-harness.html
index aecf063..9de664f 100644
--- a/test/browser/browserify-harness.html
+++ b/test/browser/browserify-harness.html
@@ -3,21 +3,20 @@
 <head>
     <meta charset="UTF-8">
     <title>Director Browserify Tests</title>
-    <link rel="stylesheet" href="../../node_modules/qunitjs/qunit/qunit.css">
+    <link rel="stylesheet" href="/node_modules/qunitjs/qunit/qunit.css">
 </head>
 <body>
-    <p>To run these tests first generate a Browserify bundle for director by running the command <kbd>browserify -r ../director -o test/browser/browserified-bundle.js</kbd> in the repo's root directory.</p>
+    <p>To run these tests first run <kbd>gulp</kbd>.</p>
 
     <div id="qunit">
     <div id="qunit-fixture"></div>
 
-    <script src="browserified-bundle.js"></script>
+    <script src="/build/director.js"></script>
     <script>
         var HTML5TEST = false;
-        var RouterAlias = require('/').Router;
     </script>
 
-    <script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
+    <script src="/node_modules/qunitjs/qunit/qunit.js"></script>
     <script src="helpers/api.js"></script>
     <script src="routes-test.js"></script>
 </body>
diff --git a/test/browser/helpers/api.js b/test/browser/helpers/api.js
index d784700..372b944 100644
--- a/test/browser/helpers/api.js
+++ b/test/browser/helpers/api.js
@@ -19,9 +19,7 @@ module("Director.js", {
 var shared;
 
 function createTest(name, config, use, test, initialRoute) {
-  // We rename to `RouterAlias` for the browserify tests, since we want to be
-  // sure that no code is depending on `window.Router` being available.
-  var Router = window.Router || window.RouterAlias;
+  var Router = window.Router;
 
   if (typeof use === 'function') {
     test = use;
diff --git a/test/browser/html5-routes-harness.html b/test/browser/html5-routes-harness.html
index eaf8ffc..6683532 100644
--- a/test/browser/html5-routes-harness.html
+++ b/test/browser/html5-routes-harness.html
@@ -3,10 +3,10 @@
 <head>
     <meta charset="UTF-8">
     <title>Director HTML5 Tests</title>
-    <link rel="stylesheet" href="/files/node_modules/qunitjs/qunit/qunit.css">
+    <link rel="stylesheet" href="/node_modules/qunitjs/qunit/qunit.css">
 </head>
 <body>
-    <p>Note: in order to execute HTML5 mode test this file needs to be served with provided nodejs backend. Start the server from <kbd>director/test/browser/backend</kbd> and go to <kbd>http://localhost:8080/</kbd> to launch the tests.</p>
+    <p>Note: in order to execute HTML5 mode test this file needs to be served with provided nodejs backend. Start the server with <kbd>gulp</kbd> and go to <kbd>http://localhost:8080/</kbd> to launch the tests.</p>
 
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
@@ -15,9 +15,9 @@
         var HTML5TEST = true;
     </script>
 
-    <script src="/files/node_modules/qunitjs/qunit/qunit.js"></script>
-    <script src="/files/build/director.js"></script>
-    <script src="/files/helpers/api.js"></script>
-    <script src="/files/html5-routes-test.js"></script>
+    <script src="/node_modules/qunitjs/qunit/qunit.js"></script>
+    <script src="/build/director.js"></script>
+    <script src="helpers/api.js"></script>
+    <script src="html5-routes-test.js"></script>
 </body>
 </html>
diff --git a/test/browser/routes-harness.html b/test/browser/routes-harness.html
index c97c826..363c0ce 100644
--- a/test/browser/routes-harness.html
+++ b/test/browser/routes-harness.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>Director Tests</title>
-    <link rel="stylesheet" href="../../node_modules/qunitjs/qunit/qunit.css">
+    <link rel="stylesheet" href="/node_modules/qunitjs/qunit/qunit.css">
 </head>
 <body>
     <div id="qunit"></div>
@@ -13,8 +13,8 @@
         var HTML5TEST = false;
     </script>
 
-    <script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
-    <script src="../../build/director.js"></script>
+    <script src="/node_modules/qunitjs/qunit/qunit.js"></script>
+    <script src="/build/director.js"></script>
     <script src="helpers/api.js"></script>
     <script src="routes-test.js"></script>
 </body>
diff --git a/test/browser/routes-test.js b/test/browser/routes-test.js
index 93831c2..de3315e 100644
--- a/test/browser/routes-test.js
+++ b/test/browser/routes-test.js
@@ -698,7 +698,7 @@ createTest('changing the hash twice should call each route once', {
 test('fire the correct route when initializing the router', function(){
   window.location.hash = 'initial';
   var fired = [];
-  var router = new (window.Router || window.RouterAlias)({
+  var router = new window.Router({
     '/initial': function(){
       fired.push('/initial');
     },
@@ -727,7 +727,7 @@ test('do not combine hash if convert_hash_in_init is false', function(){
     fired.push('*');
   };
 
-  var router = new (window.Router || window.RouterAlias)(routes);
+  var router = new window.Router(routes);
 
   router.configure({
     html5history: true,