diff --git a/dist/switcheroo.amd.js b/dist/switcheroo.amd.js
new file mode 100644
index 0000000..ed51a0e
--- /dev/null
+++ b/dist/switcheroo.amd.js
@@ -0,0 +1,284 @@
+define('switcheroo', ['react'], function (React) { 'use strict';
+
+var React__default = 'default' in React ? React['default'] : React;
+
+function currentPath(location) {
+  var path = decodeURI(window.location[location].slice(1).split('?')[0]);
+  if (path.charAt(0) !== '/') {
+    return '/' + path;
+  } else {
+    return path;
+  }
+}
+
+function removeTrailingSlash(path) {
+  if (path === '/') {
+    return path;
+  } else {
+    return path.slice(-1) !== '/' ? path : path.slice(0, -1);
+  }
+}
+
+function replaceDynamicSegments(path) {
+  return path.replace(/\/:[^\/]+/g, '/([^/]+)');
+}
+
+function getDynamicSegmentNames(path) {
+  var dynamicSegementNames = path.match(/:[^\/]+/g) || [];
+  return dynamicSegementNames.map(function (name) {
+    return name.substr(1);
+  });
+}
+
+function formatPathRegex(basePath, path) {
+  return replaceDynamicSegments(removeTrailingSlash(basePath + path) + '/?');
+}
+
+function createRegexFromPaths(paths) {
+  return new RegExp('^(' + paths.join('|') + ')$');
+}
+
+function getSwitch(path, _ref) {
+  var children = _ref.children;
+  var basePath = _ref.basePath;
+
+  var consistentPath = removeTrailingSlash(path);
+  var switches = [].concat(children || []);
+  return switches.filter(function (child) {
+    var childPaths = [].concat(child.props.path).map(function (childPath) {
+      return formatPathRegex(basePath, childPath);
+    });
+    var regex = createRegexFromPaths(childPaths);
+    return regex.test(consistentPath);
+  })[0] || null;
+}
+
+function getDynamicSegments(path, basePath, swtch) {
+  var dynamicValues = {};
+  var consistentPath = removeTrailingSlash(path);
+  if (swtch) {
+    [].concat(swtch.props.path).forEach(function (childPath) {
+      var dynamicSegments = getDynamicSegmentNames(basePath + childPath);
+      var regexStr = formatPathRegex(basePath, childPath);
+      var matches = consistentPath.match(new RegExp('^' + regexStr + '$'));
+      if (matches) {
+        matches.shift();
+        dynamicSegments.forEach(function (segment, index) {
+          dynamicValues[segment] = matches[index];
+        });
+      }
+    });
+  }
+  return dynamicValues;
+}
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+  return typeof obj;
+} : function (obj) {
+  return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+};
+
+var classCallCheck = function (instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+};
+
+var createClass = function () {
+  function defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  return function (Constructor, protoProps, staticProps) {
+    if (protoProps) defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) defineProperties(Constructor, staticProps);
+    return Constructor;
+  };
+}();
+
+var _extends = Object.assign || function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  return target;
+};
+
+var inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+};
+
+var possibleConstructorReturn = function (self, call) {
+  if (!self) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return call && (typeof call === "object" || typeof call === "function") ? call : self;
+};
+
+var Switcher = function (_Component) {
+  inherits(Switcher, _Component);
+
+  function Switcher(props) {
+    classCallCheck(this, Switcher);
+
+    var _this = possibleConstructorReturn(this, Object.getPrototypeOf(Switcher).call(this, props));
+
+    _initialiseProps.call(_this);
+
+    var currPath = currentPath(props.location);
+    var switchElement = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, switchElement);
+    _this.state = {
+      visibleSwitch: switchElement,
+      dynamicValues: dynamicValues
+    };
+    return _this;
+  }
+
+  createClass(Switcher, [{
+    key: 'componentDidMount',
+    value: function componentDidMount() {
+      if (this.props.load) {
+        window.addEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.addEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.addEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'componentWillReceiveProps',
+    value: function componentWillReceiveProps(nextProps) {
+      this.handleSwitchChange(nextProps);
+    }
+  }, {
+    key: 'shouldComponentUpdate',
+    value: function shouldComponentUpdate(nextProps) {
+      return !nextProps.preventUpdate();
+    }
+  }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      if (this.props.load) {
+        window.removeEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.removeEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.removeEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _this2 = this;
+
+      var _ref = this.state.visibleSwitch || {};
+
+      var props = _ref.props;
+
+      var visibleSwitch = this.state.visibleSwitch && React__default.cloneElement(this.state.visibleSwitch, _extends({}, props, this.props.mapDynamicSegments(this.state.dynamicValues)));
+
+      if (this.props.renderSwitch) {
+        return this.props.renderSwitch(visibleSwitch, this.state.dynamicValues);
+      }
+
+      if (this.props.wrapper) {
+        var _ret = function () {
+          var passedProps = _extends({}, _this2.props);
+          Object.keys(Switcher.propTypes).forEach(function (k) {
+            return delete passedProps[k];
+          });
+          return {
+            v: React__default.createElement(_this2.props.wrapper, passedProps, visibleSwitch)
+          };
+        }();
+
+        if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+      } else {
+        return visibleSwitch;
+      }
+    }
+  }]);
+  return Switcher;
+}(React.Component);
+
+Switcher.displayName = 'Switcher';
+Switcher.propTypes = {
+  children: React.PropTypes.oneOfType([React.PropTypes.arrayOf(React.PropTypes.node), React.PropTypes.node]),
+  pushState: React.PropTypes.bool,
+  hashChange: React.PropTypes.bool,
+  load: React.PropTypes.bool,
+  onChange: React.PropTypes.func,
+  wrapper: React.PropTypes.any,
+  location: React.PropTypes.string,
+  basePath: React.PropTypes.string,
+  preventUpdate: React.PropTypes.func,
+  mapDynamicSegments: React.PropTypes.func,
+  renderSwitch: React.PropTypes.func
+};
+Switcher.defaultProps = {
+  pushState: false,
+  hashChange: true,
+  load: true,
+  location: 'hash',
+  basePath: '',
+  preventUpdate: function preventUpdate() {
+    return false;
+  },
+  mapDynamicSegments: function mapDynamicSegments(values) {
+    return values;
+  }
+};
+
+var _initialiseProps = function _initialiseProps() {
+  var _this3 = this;
+
+  this.handleSwitchChange = function (props) {
+    var currPath = currentPath(props.location);
+    var visibleSwitch = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, visibleSwitch);
+
+    if (typeof props.onChange === 'function') {
+      props.onChange(!!visibleSwitch, currPath, dynamicValues);
+    }
+
+    _this3.setState({ visibleSwitch: visibleSwitch, dynamicValues: dynamicValues });
+  };
+
+  this.handleRouteChange = function (ev) {
+    _this3.handleSwitchChange(_this3.props);
+  };
+};
+
+return Switcher;
+
+});
\ No newline at end of file
diff --git a/dist/switcheroo.browser.js b/dist/switcheroo.browser.js
new file mode 100644
index 0000000..aedbcb6
--- /dev/null
+++ b/dist/switcheroo.browser.js
@@ -0,0 +1,285 @@
+var switcheroo = (function (React) {
+'use strict';
+
+var React__default = 'default' in React ? React['default'] : React;
+
+function currentPath(location) {
+  var path = decodeURI(window.location[location].slice(1).split('?')[0]);
+  if (path.charAt(0) !== '/') {
+    return '/' + path;
+  } else {
+    return path;
+  }
+}
+
+function removeTrailingSlash(path) {
+  if (path === '/') {
+    return path;
+  } else {
+    return path.slice(-1) !== '/' ? path : path.slice(0, -1);
+  }
+}
+
+function replaceDynamicSegments(path) {
+  return path.replace(/\/:[^\/]+/g, '/([^/]+)');
+}
+
+function getDynamicSegmentNames(path) {
+  var dynamicSegementNames = path.match(/:[^\/]+/g) || [];
+  return dynamicSegementNames.map(function (name) {
+    return name.substr(1);
+  });
+}
+
+function formatPathRegex(basePath, path) {
+  return replaceDynamicSegments(removeTrailingSlash(basePath + path) + '/?');
+}
+
+function createRegexFromPaths(paths) {
+  return new RegExp('^(' + paths.join('|') + ')$');
+}
+
+function getSwitch(path, _ref) {
+  var children = _ref.children;
+  var basePath = _ref.basePath;
+
+  var consistentPath = removeTrailingSlash(path);
+  var switches = [].concat(children || []);
+  return switches.filter(function (child) {
+    var childPaths = [].concat(child.props.path).map(function (childPath) {
+      return formatPathRegex(basePath, childPath);
+    });
+    var regex = createRegexFromPaths(childPaths);
+    return regex.test(consistentPath);
+  })[0] || null;
+}
+
+function getDynamicSegments(path, basePath, swtch) {
+  var dynamicValues = {};
+  var consistentPath = removeTrailingSlash(path);
+  if (swtch) {
+    [].concat(swtch.props.path).forEach(function (childPath) {
+      var dynamicSegments = getDynamicSegmentNames(basePath + childPath);
+      var regexStr = formatPathRegex(basePath, childPath);
+      var matches = consistentPath.match(new RegExp('^' + regexStr + '$'));
+      if (matches) {
+        matches.shift();
+        dynamicSegments.forEach(function (segment, index) {
+          dynamicValues[segment] = matches[index];
+        });
+      }
+    });
+  }
+  return dynamicValues;
+}
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+  return typeof obj;
+} : function (obj) {
+  return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+};
+
+var classCallCheck = function (instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+};
+
+var createClass = function () {
+  function defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  return function (Constructor, protoProps, staticProps) {
+    if (protoProps) defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) defineProperties(Constructor, staticProps);
+    return Constructor;
+  };
+}();
+
+var _extends = Object.assign || function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  return target;
+};
+
+var inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+};
+
+var possibleConstructorReturn = function (self, call) {
+  if (!self) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return call && (typeof call === "object" || typeof call === "function") ? call : self;
+};
+
+var Switcher = function (_Component) {
+  inherits(Switcher, _Component);
+
+  function Switcher(props) {
+    classCallCheck(this, Switcher);
+
+    var _this = possibleConstructorReturn(this, Object.getPrototypeOf(Switcher).call(this, props));
+
+    _initialiseProps.call(_this);
+
+    var currPath = currentPath(props.location);
+    var switchElement = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, switchElement);
+    _this.state = {
+      visibleSwitch: switchElement,
+      dynamicValues: dynamicValues
+    };
+    return _this;
+  }
+
+  createClass(Switcher, [{
+    key: 'componentDidMount',
+    value: function componentDidMount() {
+      if (this.props.load) {
+        window.addEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.addEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.addEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'componentWillReceiveProps',
+    value: function componentWillReceiveProps(nextProps) {
+      this.handleSwitchChange(nextProps);
+    }
+  }, {
+    key: 'shouldComponentUpdate',
+    value: function shouldComponentUpdate(nextProps) {
+      return !nextProps.preventUpdate();
+    }
+  }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      if (this.props.load) {
+        window.removeEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.removeEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.removeEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _this2 = this;
+
+      var _ref = this.state.visibleSwitch || {};
+
+      var props = _ref.props;
+
+      var visibleSwitch = this.state.visibleSwitch && React__default.cloneElement(this.state.visibleSwitch, _extends({}, props, this.props.mapDynamicSegments(this.state.dynamicValues)));
+
+      if (this.props.renderSwitch) {
+        return this.props.renderSwitch(visibleSwitch, this.state.dynamicValues);
+      }
+
+      if (this.props.wrapper) {
+        var _ret = function () {
+          var passedProps = _extends({}, _this2.props);
+          Object.keys(Switcher.propTypes).forEach(function (k) {
+            return delete passedProps[k];
+          });
+          return {
+            v: React__default.createElement(_this2.props.wrapper, passedProps, visibleSwitch)
+          };
+        }();
+
+        if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+      } else {
+        return visibleSwitch;
+      }
+    }
+  }]);
+  return Switcher;
+}(React.Component);
+
+Switcher.displayName = 'Switcher';
+Switcher.propTypes = {
+  children: React.PropTypes.oneOfType([React.PropTypes.arrayOf(React.PropTypes.node), React.PropTypes.node]),
+  pushState: React.PropTypes.bool,
+  hashChange: React.PropTypes.bool,
+  load: React.PropTypes.bool,
+  onChange: React.PropTypes.func,
+  wrapper: React.PropTypes.any,
+  location: React.PropTypes.string,
+  basePath: React.PropTypes.string,
+  preventUpdate: React.PropTypes.func,
+  mapDynamicSegments: React.PropTypes.func,
+  renderSwitch: React.PropTypes.func
+};
+Switcher.defaultProps = {
+  pushState: false,
+  hashChange: true,
+  load: true,
+  location: 'hash',
+  basePath: '',
+  preventUpdate: function preventUpdate() {
+    return false;
+  },
+  mapDynamicSegments: function mapDynamicSegments(values) {
+    return values;
+  }
+};
+
+var _initialiseProps = function _initialiseProps() {
+  var _this3 = this;
+
+  this.handleSwitchChange = function (props) {
+    var currPath = currentPath(props.location);
+    var visibleSwitch = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, visibleSwitch);
+
+    if (typeof props.onChange === 'function') {
+      props.onChange(!!visibleSwitch, currPath, dynamicValues);
+    }
+
+    _this3.setState({ visibleSwitch: visibleSwitch, dynamicValues: dynamicValues });
+  };
+
+  this.handleRouteChange = function (ev) {
+    _this3.handleSwitchChange(_this3.props);
+  };
+};
+
+return Switcher;
+
+}(React));
\ No newline at end of file
diff --git a/dist/switcheroo.browser.min.js b/dist/switcheroo.browser.min.js
new file mode 100644
index 0000000..59c354c
--- /dev/null
+++ b/dist/switcheroo.browser.min.js
@@ -0,0 +1 @@
+var switcheroo=function(e){"use strict";function t(e){var t=decodeURI(window.location[e].slice(1).split("?")[0]);return"/"!==t.charAt(0)?"/"+t:t}function n(e){return"/"===e?e:"/"!==e.slice(-1)?e:e.slice(0,-1)}function o(e){return e.replace(/\/:[^\/]+/g,"/([^/]+)")}function r(e){var t=e.match(/:[^\/]+/g)||[];return t.map(function(e){return e.substr(1)})}function a(e,t){return o(n(e+t)+"/?")}function i(e){return new RegExp("^("+e.join("|")+")$")}function s(e,t){var o=t.children,r=t.basePath,s=n(e),p=[].concat(o||[]);return p.filter(function(e){var t=[].concat(e.props.path).map(function(e){return a(r,e)}),n=i(t);return n.test(s)})[0]||null}function p(e,t,o){var i={},s=n(e);return o&&[].concat(o.props.path).forEach(function(e){var n=r(t+e),o=a(t,e),p=s.match(new RegExp("^"+o+"$"));p&&(p.shift(),n.forEach(function(e,t){i[e]=p[t]}))}),i}var c="default"in e?e.default:e,u="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},h=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),f=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},d=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)},y=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t},v=function(e){function n(e){h(this,n);var o=y(this,Object.getPrototypeOf(n).call(this,e));w.call(o);var r=t(e.location),a=s(r,e),i=p(r,e.basePath,a);return o.state={visibleSwitch:a,dynamicValues:i},o}return d(n,e),l(n,[{key:"componentDidMount",value:function(){this.props.load&&window.addEventListener("load",this.handleRouteChange),this.props.pushState&&window.addEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.addEventListener("hashchange",this.handleRouteChange)}},{key:"componentWillReceiveProps",value:function(e){this.handleSwitchChange(e)}},{key:"shouldComponentUpdate",value:function(e){return!e.preventUpdate()}},{key:"componentWillUnmount",value:function(){this.props.load&&window.removeEventListener("load",this.handleRouteChange),this.props.pushState&&window.removeEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.removeEventListener("hashchange",this.handleRouteChange)}},{key:"render",value:function(){var e=this,t=this.state.visibleSwitch||{},o=t.props,r=this.state.visibleSwitch&&c.cloneElement(this.state.visibleSwitch,f({},o,this.props.mapDynamicSegments(this.state.dynamicValues)));if(this.props.renderSwitch)return this.props.renderSwitch(r,this.state.dynamicValues);if(!this.props.wrapper)return r;var a=function(){var t=f({},e.props);return Object.keys(n.propTypes).forEach(function(e){return delete t[e]}),{v:c.createElement(e.props.wrapper,t,r)}}();return"object"===("undefined"==typeof a?"undefined":u(a))?a.v:void 0}}]),n}(e.Component);v.displayName="Switcher",v.propTypes={children:e.PropTypes.oneOfType([e.PropTypes.arrayOf(e.PropTypes.node),e.PropTypes.node]),pushState:e.PropTypes.bool,hashChange:e.PropTypes.bool,load:e.PropTypes.bool,onChange:e.PropTypes.func,wrapper:e.PropTypes.any,location:e.PropTypes.string,basePath:e.PropTypes.string,preventUpdate:e.PropTypes.func,mapDynamicSegments:e.PropTypes.func,renderSwitch:e.PropTypes.func},v.defaultProps={pushState:!1,hashChange:!0,load:!0,location:"hash",basePath:"",preventUpdate:function(){return!1},mapDynamicSegments:function(e){return e}};var w=function(){var e=this;this.handleSwitchChange=function(n){var o=t(n.location),r=s(o,n),a=p(o,n.basePath,r);"function"==typeof n.onChange&&n.onChange(!!r,o,a),e.setState({visibleSwitch:r,dynamicValues:a})},this.handleRouteChange=function(t){e.handleSwitchChange(e.props)}};return v}(React);
diff --git a/dist/switcheroo.cjs.js b/dist/switcheroo.cjs.js
new file mode 100644
index 0000000..8676542
--- /dev/null
+++ b/dist/switcheroo.cjs.js
@@ -0,0 +1,285 @@
+'use strict';
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var React = require('react');
+var React__default = _interopDefault(React);
+
+function currentPath(location) {
+  var path = decodeURI(window.location[location].slice(1).split('?')[0]);
+  if (path.charAt(0) !== '/') {
+    return '/' + path;
+  } else {
+    return path;
+  }
+}
+
+function removeTrailingSlash(path) {
+  if (path === '/') {
+    return path;
+  } else {
+    return path.slice(-1) !== '/' ? path : path.slice(0, -1);
+  }
+}
+
+function replaceDynamicSegments(path) {
+  return path.replace(/\/:[^\/]+/g, '/([^/]+)');
+}
+
+function getDynamicSegmentNames(path) {
+  var dynamicSegementNames = path.match(/:[^\/]+/g) || [];
+  return dynamicSegementNames.map(function (name) {
+    return name.substr(1);
+  });
+}
+
+function formatPathRegex(basePath, path) {
+  return replaceDynamicSegments(removeTrailingSlash(basePath + path) + '/?');
+}
+
+function createRegexFromPaths(paths) {
+  return new RegExp('^(' + paths.join('|') + ')$');
+}
+
+function getSwitch(path, _ref) {
+  var children = _ref.children;
+  var basePath = _ref.basePath;
+
+  var consistentPath = removeTrailingSlash(path);
+  var switches = [].concat(children || []);
+  return switches.filter(function (child) {
+    var childPaths = [].concat(child.props.path).map(function (childPath) {
+      return formatPathRegex(basePath, childPath);
+    });
+    var regex = createRegexFromPaths(childPaths);
+    return regex.test(consistentPath);
+  })[0] || null;
+}
+
+function getDynamicSegments(path, basePath, swtch) {
+  var dynamicValues = {};
+  var consistentPath = removeTrailingSlash(path);
+  if (swtch) {
+    [].concat(swtch.props.path).forEach(function (childPath) {
+      var dynamicSegments = getDynamicSegmentNames(basePath + childPath);
+      var regexStr = formatPathRegex(basePath, childPath);
+      var matches = consistentPath.match(new RegExp('^' + regexStr + '$'));
+      if (matches) {
+        matches.shift();
+        dynamicSegments.forEach(function (segment, index) {
+          dynamicValues[segment] = matches[index];
+        });
+      }
+    });
+  }
+  return dynamicValues;
+}
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+  return typeof obj;
+} : function (obj) {
+  return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+};
+
+var classCallCheck = function (instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+};
+
+var createClass = function () {
+  function defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  return function (Constructor, protoProps, staticProps) {
+    if (protoProps) defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) defineProperties(Constructor, staticProps);
+    return Constructor;
+  };
+}();
+
+var _extends = Object.assign || function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  return target;
+};
+
+var inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+};
+
+var possibleConstructorReturn = function (self, call) {
+  if (!self) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return call && (typeof call === "object" || typeof call === "function") ? call : self;
+};
+
+var Switcher = function (_Component) {
+  inherits(Switcher, _Component);
+
+  function Switcher(props) {
+    classCallCheck(this, Switcher);
+
+    var _this = possibleConstructorReturn(this, Object.getPrototypeOf(Switcher).call(this, props));
+
+    _initialiseProps.call(_this);
+
+    var currPath = currentPath(props.location);
+    var switchElement = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, switchElement);
+    _this.state = {
+      visibleSwitch: switchElement,
+      dynamicValues: dynamicValues
+    };
+    return _this;
+  }
+
+  createClass(Switcher, [{
+    key: 'componentDidMount',
+    value: function componentDidMount() {
+      if (this.props.load) {
+        window.addEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.addEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.addEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'componentWillReceiveProps',
+    value: function componentWillReceiveProps(nextProps) {
+      this.handleSwitchChange(nextProps);
+    }
+  }, {
+    key: 'shouldComponentUpdate',
+    value: function shouldComponentUpdate(nextProps) {
+      return !nextProps.preventUpdate();
+    }
+  }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      if (this.props.load) {
+        window.removeEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.removeEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.removeEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _this2 = this;
+
+      var _ref = this.state.visibleSwitch || {};
+
+      var props = _ref.props;
+
+      var visibleSwitch = this.state.visibleSwitch && React__default.cloneElement(this.state.visibleSwitch, _extends({}, props, this.props.mapDynamicSegments(this.state.dynamicValues)));
+
+      if (this.props.renderSwitch) {
+        return this.props.renderSwitch(visibleSwitch, this.state.dynamicValues);
+      }
+
+      if (this.props.wrapper) {
+        var _ret = function () {
+          var passedProps = _extends({}, _this2.props);
+          Object.keys(Switcher.propTypes).forEach(function (k) {
+            return delete passedProps[k];
+          });
+          return {
+            v: React__default.createElement(_this2.props.wrapper, passedProps, visibleSwitch)
+          };
+        }();
+
+        if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+      } else {
+        return visibleSwitch;
+      }
+    }
+  }]);
+  return Switcher;
+}(React.Component);
+
+Switcher.displayName = 'Switcher';
+Switcher.propTypes = {
+  children: React.PropTypes.oneOfType([React.PropTypes.arrayOf(React.PropTypes.node), React.PropTypes.node]),
+  pushState: React.PropTypes.bool,
+  hashChange: React.PropTypes.bool,
+  load: React.PropTypes.bool,
+  onChange: React.PropTypes.func,
+  wrapper: React.PropTypes.any,
+  location: React.PropTypes.string,
+  basePath: React.PropTypes.string,
+  preventUpdate: React.PropTypes.func,
+  mapDynamicSegments: React.PropTypes.func,
+  renderSwitch: React.PropTypes.func
+};
+Switcher.defaultProps = {
+  pushState: false,
+  hashChange: true,
+  load: true,
+  location: 'hash',
+  basePath: '',
+  preventUpdate: function preventUpdate() {
+    return false;
+  },
+  mapDynamicSegments: function mapDynamicSegments(values) {
+    return values;
+  }
+};
+
+var _initialiseProps = function _initialiseProps() {
+  var _this3 = this;
+
+  this.handleSwitchChange = function (props) {
+    var currPath = currentPath(props.location);
+    var visibleSwitch = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, visibleSwitch);
+
+    if (typeof props.onChange === 'function') {
+      props.onChange(!!visibleSwitch, currPath, dynamicValues);
+    }
+
+    _this3.setState({ visibleSwitch: visibleSwitch, dynamicValues: dynamicValues });
+  };
+
+  this.handleRouteChange = function (ev) {
+    _this3.handleSwitchChange(_this3.props);
+  };
+};
+
+module.exports = Switcher;
\ No newline at end of file
diff --git a/dist/switcheroo.es-modules.js b/dist/switcheroo.es-modules.js
new file mode 100644
index 0000000..737f379
--- /dev/null
+++ b/dist/switcheroo.es-modules.js
@@ -0,0 +1,280 @@
+import React, { Component, PropTypes } from 'react';
+
+function currentPath(location) {
+  var path = decodeURI(window.location[location].slice(1).split('?')[0]);
+  if (path.charAt(0) !== '/') {
+    return '/' + path;
+  } else {
+    return path;
+  }
+}
+
+function removeTrailingSlash(path) {
+  if (path === '/') {
+    return path;
+  } else {
+    return path.slice(-1) !== '/' ? path : path.slice(0, -1);
+  }
+}
+
+function replaceDynamicSegments(path) {
+  return path.replace(/\/:[^\/]+/g, '/([^/]+)');
+}
+
+function getDynamicSegmentNames(path) {
+  var dynamicSegementNames = path.match(/:[^\/]+/g) || [];
+  return dynamicSegementNames.map(function (name) {
+    return name.substr(1);
+  });
+}
+
+function formatPathRegex(basePath, path) {
+  return replaceDynamicSegments(removeTrailingSlash(basePath + path) + '/?');
+}
+
+function createRegexFromPaths(paths) {
+  return new RegExp('^(' + paths.join('|') + ')$');
+}
+
+function getSwitch(path, _ref) {
+  var children = _ref.children;
+  var basePath = _ref.basePath;
+
+  var consistentPath = removeTrailingSlash(path);
+  var switches = [].concat(children || []);
+  return switches.filter(function (child) {
+    var childPaths = [].concat(child.props.path).map(function (childPath) {
+      return formatPathRegex(basePath, childPath);
+    });
+    var regex = createRegexFromPaths(childPaths);
+    return regex.test(consistentPath);
+  })[0] || null;
+}
+
+function getDynamicSegments(path, basePath, swtch) {
+  var dynamicValues = {};
+  var consistentPath = removeTrailingSlash(path);
+  if (swtch) {
+    [].concat(swtch.props.path).forEach(function (childPath) {
+      var dynamicSegments = getDynamicSegmentNames(basePath + childPath);
+      var regexStr = formatPathRegex(basePath, childPath);
+      var matches = consistentPath.match(new RegExp('^' + regexStr + '$'));
+      if (matches) {
+        matches.shift();
+        dynamicSegments.forEach(function (segment, index) {
+          dynamicValues[segment] = matches[index];
+        });
+      }
+    });
+  }
+  return dynamicValues;
+}
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+  return typeof obj;
+} : function (obj) {
+  return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+};
+
+var classCallCheck = function (instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+};
+
+var createClass = function () {
+  function defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  return function (Constructor, protoProps, staticProps) {
+    if (protoProps) defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) defineProperties(Constructor, staticProps);
+    return Constructor;
+  };
+}();
+
+var _extends = Object.assign || function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  return target;
+};
+
+var inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+};
+
+var possibleConstructorReturn = function (self, call) {
+  if (!self) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return call && (typeof call === "object" || typeof call === "function") ? call : self;
+};
+
+var Switcher = function (_Component) {
+  inherits(Switcher, _Component);
+
+  function Switcher(props) {
+    classCallCheck(this, Switcher);
+
+    var _this = possibleConstructorReturn(this, Object.getPrototypeOf(Switcher).call(this, props));
+
+    _initialiseProps.call(_this);
+
+    var currPath = currentPath(props.location);
+    var switchElement = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, switchElement);
+    _this.state = {
+      visibleSwitch: switchElement,
+      dynamicValues: dynamicValues
+    };
+    return _this;
+  }
+
+  createClass(Switcher, [{
+    key: 'componentDidMount',
+    value: function componentDidMount() {
+      if (this.props.load) {
+        window.addEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.addEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.addEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'componentWillReceiveProps',
+    value: function componentWillReceiveProps(nextProps) {
+      this.handleSwitchChange(nextProps);
+    }
+  }, {
+    key: 'shouldComponentUpdate',
+    value: function shouldComponentUpdate(nextProps) {
+      return !nextProps.preventUpdate();
+    }
+  }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      if (this.props.load) {
+        window.removeEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.removeEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.removeEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _this2 = this;
+
+      var _ref = this.state.visibleSwitch || {};
+
+      var props = _ref.props;
+
+      var visibleSwitch = this.state.visibleSwitch && React__default.cloneElement(this.state.visibleSwitch, _extends({}, props, this.props.mapDynamicSegments(this.state.dynamicValues)));
+
+      if (this.props.renderSwitch) {
+        return this.props.renderSwitch(visibleSwitch, this.state.dynamicValues);
+      }
+
+      if (this.props.wrapper) {
+        var _ret = function () {
+          var passedProps = _extends({}, _this2.props);
+          Object.keys(Switcher.propTypes).forEach(function (k) {
+            return delete passedProps[k];
+          });
+          return {
+            v: React__default.createElement(_this2.props.wrapper, passedProps, visibleSwitch)
+          };
+        }();
+
+        if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+      } else {
+        return visibleSwitch;
+      }
+    }
+  }]);
+  return Switcher;
+}(React.Component);
+
+Switcher.displayName = 'Switcher';
+Switcher.propTypes = {
+  children: React.PropTypes.oneOfType([React.PropTypes.arrayOf(React.PropTypes.node), React.PropTypes.node]),
+  pushState: React.PropTypes.bool,
+  hashChange: React.PropTypes.bool,
+  load: React.PropTypes.bool,
+  onChange: React.PropTypes.func,
+  wrapper: React.PropTypes.any,
+  location: React.PropTypes.string,
+  basePath: React.PropTypes.string,
+  preventUpdate: React.PropTypes.func,
+  mapDynamicSegments: React.PropTypes.func,
+  renderSwitch: React.PropTypes.func
+};
+Switcher.defaultProps = {
+  pushState: false,
+  hashChange: true,
+  load: true,
+  location: 'hash',
+  basePath: '',
+  preventUpdate: function preventUpdate() {
+    return false;
+  },
+  mapDynamicSegments: function mapDynamicSegments(values) {
+    return values;
+  }
+};
+
+var _initialiseProps = function _initialiseProps() {
+  var _this3 = this;
+
+  this.handleSwitchChange = function (props) {
+    var currPath = currentPath(props.location);
+    var visibleSwitch = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, visibleSwitch);
+
+    if (typeof props.onChange === 'function') {
+      props.onChange(!!visibleSwitch, currPath, dynamicValues);
+    }
+
+    _this3.setState({ visibleSwitch: visibleSwitch, dynamicValues: dynamicValues });
+  };
+
+  this.handleRouteChange = function (ev) {
+    _this3.handleSwitchChange(_this3.props);
+  };
+};
+
+export default Switcher;
\ No newline at end of file
diff --git a/dist/switcheroo.min.js b/dist/switcheroo.min.js
deleted file mode 100644
index 30efae2..0000000
--- a/dist/switcheroo.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define(["react"],t):"object"==typeof exports?exports.switcheroo=t(require("react")):e.switcheroo=t(e.React)}(this,function(e){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return e[o].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function o(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},c=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},p=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),u=n(2),h=o(u),l=n(1),f=function(e){function t(e){r(this,t);var n=a(this,Object.getPrototypeOf(t).call(this,e));d.call(n);var o=(0,l.currentPath)(e.location),i=(0,l.getSwitch)(o,e),s=(0,l.getDynamicSegments)(o,e.basePath,i);return n.state={visibleSwitch:i,dynamicValues:s},n}return i(t,e),p(t,[{key:"componentDidMount",value:function(){this.props.load&&window.addEventListener("load",this.handleRouteChange),this.props.pushState&&window.addEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.addEventListener("hashchange",this.handleRouteChange)}},{key:"componentWillReceiveProps",value:function(e){this.handleSwitchChange(e)}},{key:"shouldComponentUpdate",value:function(e){return!e.preventUpdate()}},{key:"componentWillUnmount",value:function(){this.props.load&&window.removeEventListener("load",this.handleRouteChange),this.props.pushState&&window.removeEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.removeEventListener("hashchange",this.handleRouteChange)}},{key:"render",value:function(){var e=this,n=this.state.visibleSwitch||{},o=n.props,r=this.state.visibleSwitch&&h["default"].cloneElement(this.state.visibleSwitch,c({},o,this.props.mapDynamicSegments(this.state.dynamicValues)));if(this.props.renderSwitch)return this.props.renderSwitch(r,this.state.dynamicValues);if(!this.props.wrapper)return r;var a=function(){var n=c({},e.props);return Object.keys(t.propTypes).forEach(function(e){return delete n[e]}),{v:h["default"].createElement(e.props.wrapper,n,r)}}();return"object"===("undefined"==typeof a?"undefined":s(a))?a.v:void 0}}]),t}(u.Component);f.displayName="Switcher",f.propTypes={children:u.PropTypes.oneOfType([u.PropTypes.arrayOf(u.PropTypes.node),u.PropTypes.node]),pushState:u.PropTypes.bool,hashChange:u.PropTypes.bool,load:u.PropTypes.bool,onChange:u.PropTypes.func,wrapper:u.PropTypes.any,location:u.PropTypes.string,basePath:u.PropTypes.string,preventUpdate:u.PropTypes.func,mapDynamicSegments:u.PropTypes.func,renderSwitch:u.PropTypes.func},f.defaultProps={pushState:!1,hashChange:!0,load:!0,location:"hash",basePath:"",preventUpdate:function(){return!1},mapDynamicSegments:function(e){return e}};var d=function(){var e=this;this.handleSwitchChange=function(t){var n=(0,l.currentPath)(t.location),o=(0,l.getSwitch)(n,t),r=(0,l.getDynamicSegments)(n,t.basePath,o);"function"==typeof t.onChange&&t.onChange(!!o,n,r),e.setState({visibleSwitch:o,dynamicValues:r})},this.handleRouteChange=function(t){e.handleSwitchChange(e.props)}};t["default"]=f},function(e,t){"use strict";function n(e){var t=decodeURI(window.location[e].slice(1).split("?")[0]);return"/"!==t.charAt(0)?"/"+t:t}function o(e){return"/"===e?e:"/"!==e.slice(-1)?e:e.slice(0,-1)}function r(e){return e.replace(/\/:[^\/]+/g,"/([^/]+)")}function a(e){var t=e.match(/:[^\/]+/g)||[];return t.map(function(e){return e.substr(1)})}function i(e,t){return r(o(e+t)+"/?")}function s(e){return new RegExp("^("+e.join("|")+")$")}function c(e,t){var n=t.children,r=t.basePath,a=o(e),c=[].concat(n||[]);return c.filter(function(e){var t=[].concat(e.props.path).map(function(e){return i(r,e)}),n=s(t);return n.test(a)})[0]||null}function p(e,t,n){var r={},s=o(e);return n&&[].concat(n.props.path).forEach(function(e){var n=a(t+e),o=i(t,e),c=s.match(new RegExp("^"+o+"$"));c&&(c.shift(),n.forEach(function(e,t){r[e]=c[t]}))}),r}Object.defineProperty(t,"__esModule",{value:!0}),t.currentPath=n,t.removeTrailingSlash=o,t.replaceDynamicSegments=r,t.getDynamicSegmentNames=a,t.formatPathRegex=i,t.createRegexFromPaths=s,t.getSwitch=c,t.getDynamicSegments=p},function(t,n){t.exports=e}])});
\ No newline at end of file
diff --git a/dist/switcheroo.umd.js b/dist/switcheroo.umd.js
new file mode 100644
index 0000000..dd45025
--- /dev/null
+++ b/dist/switcheroo.umd.js
@@ -0,0 +1,288 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('react')) :
+  typeof define === 'function' && define.amd ? define('switcheroo', ['react'], factory) :
+  (global.switcheroo = factory(global.React));
+}(this, (function (React) { 'use strict';
+
+var React__default = 'default' in React ? React['default'] : React;
+
+function currentPath(location) {
+  var path = decodeURI(window.location[location].slice(1).split('?')[0]);
+  if (path.charAt(0) !== '/') {
+    return '/' + path;
+  } else {
+    return path;
+  }
+}
+
+function removeTrailingSlash(path) {
+  if (path === '/') {
+    return path;
+  } else {
+    return path.slice(-1) !== '/' ? path : path.slice(0, -1);
+  }
+}
+
+function replaceDynamicSegments(path) {
+  return path.replace(/\/:[^\/]+/g, '/([^/]+)');
+}
+
+function getDynamicSegmentNames(path) {
+  var dynamicSegementNames = path.match(/:[^\/]+/g) || [];
+  return dynamicSegementNames.map(function (name) {
+    return name.substr(1);
+  });
+}
+
+function formatPathRegex(basePath, path) {
+  return replaceDynamicSegments(removeTrailingSlash(basePath + path) + '/?');
+}
+
+function createRegexFromPaths(paths) {
+  return new RegExp('^(' + paths.join('|') + ')$');
+}
+
+function getSwitch(path, _ref) {
+  var children = _ref.children;
+  var basePath = _ref.basePath;
+
+  var consistentPath = removeTrailingSlash(path);
+  var switches = [].concat(children || []);
+  return switches.filter(function (child) {
+    var childPaths = [].concat(child.props.path).map(function (childPath) {
+      return formatPathRegex(basePath, childPath);
+    });
+    var regex = createRegexFromPaths(childPaths);
+    return regex.test(consistentPath);
+  })[0] || null;
+}
+
+function getDynamicSegments(path, basePath, swtch) {
+  var dynamicValues = {};
+  var consistentPath = removeTrailingSlash(path);
+  if (swtch) {
+    [].concat(swtch.props.path).forEach(function (childPath) {
+      var dynamicSegments = getDynamicSegmentNames(basePath + childPath);
+      var regexStr = formatPathRegex(basePath, childPath);
+      var matches = consistentPath.match(new RegExp('^' + regexStr + '$'));
+      if (matches) {
+        matches.shift();
+        dynamicSegments.forEach(function (segment, index) {
+          dynamicValues[segment] = matches[index];
+        });
+      }
+    });
+  }
+  return dynamicValues;
+}
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+  return typeof obj;
+} : function (obj) {
+  return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+};
+
+var classCallCheck = function (instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+};
+
+var createClass = function () {
+  function defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  return function (Constructor, protoProps, staticProps) {
+    if (protoProps) defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) defineProperties(Constructor, staticProps);
+    return Constructor;
+  };
+}();
+
+var _extends = Object.assign || function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+
+    for (var key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+        target[key] = source[key];
+      }
+    }
+  }
+
+  return target;
+};
+
+var inherits = function (subClass, superClass) {
+  if (typeof superClass !== "function" && superClass !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+  }
+
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    }
+  });
+  if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+};
+
+var possibleConstructorReturn = function (self, call) {
+  if (!self) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return call && (typeof call === "object" || typeof call === "function") ? call : self;
+};
+
+var Switcher = function (_Component) {
+  inherits(Switcher, _Component);
+
+  function Switcher(props) {
+    classCallCheck(this, Switcher);
+
+    var _this = possibleConstructorReturn(this, Object.getPrototypeOf(Switcher).call(this, props));
+
+    _initialiseProps.call(_this);
+
+    var currPath = currentPath(props.location);
+    var switchElement = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, switchElement);
+    _this.state = {
+      visibleSwitch: switchElement,
+      dynamicValues: dynamicValues
+    };
+    return _this;
+  }
+
+  createClass(Switcher, [{
+    key: 'componentDidMount',
+    value: function componentDidMount() {
+      if (this.props.load) {
+        window.addEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.addEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.addEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'componentWillReceiveProps',
+    value: function componentWillReceiveProps(nextProps) {
+      this.handleSwitchChange(nextProps);
+    }
+  }, {
+    key: 'shouldComponentUpdate',
+    value: function shouldComponentUpdate(nextProps) {
+      return !nextProps.preventUpdate();
+    }
+  }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      if (this.props.load) {
+        window.removeEventListener('load', this.handleRouteChange);
+      }
+      if (this.props.pushState) {
+        window.removeEventListener('popstate', this.handleRouteChange);
+      }
+      if (this.props.hashChange) {
+        window.removeEventListener('hashchange', this.handleRouteChange);
+      }
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _this2 = this;
+
+      var _ref = this.state.visibleSwitch || {};
+
+      var props = _ref.props;
+
+      var visibleSwitch = this.state.visibleSwitch && React__default.cloneElement(this.state.visibleSwitch, _extends({}, props, this.props.mapDynamicSegments(this.state.dynamicValues)));
+
+      if (this.props.renderSwitch) {
+        return this.props.renderSwitch(visibleSwitch, this.state.dynamicValues);
+      }
+
+      if (this.props.wrapper) {
+        var _ret = function () {
+          var passedProps = _extends({}, _this2.props);
+          Object.keys(Switcher.propTypes).forEach(function (k) {
+            return delete passedProps[k];
+          });
+          return {
+            v: React__default.createElement(_this2.props.wrapper, passedProps, visibleSwitch)
+          };
+        }();
+
+        if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+      } else {
+        return visibleSwitch;
+      }
+    }
+  }]);
+  return Switcher;
+}(React.Component);
+
+Switcher.displayName = 'Switcher';
+Switcher.propTypes = {
+  children: React.PropTypes.oneOfType([React.PropTypes.arrayOf(React.PropTypes.node), React.PropTypes.node]),
+  pushState: React.PropTypes.bool,
+  hashChange: React.PropTypes.bool,
+  load: React.PropTypes.bool,
+  onChange: React.PropTypes.func,
+  wrapper: React.PropTypes.any,
+  location: React.PropTypes.string,
+  basePath: React.PropTypes.string,
+  preventUpdate: React.PropTypes.func,
+  mapDynamicSegments: React.PropTypes.func,
+  renderSwitch: React.PropTypes.func
+};
+Switcher.defaultProps = {
+  pushState: false,
+  hashChange: true,
+  load: true,
+  location: 'hash',
+  basePath: '',
+  preventUpdate: function preventUpdate() {
+    return false;
+  },
+  mapDynamicSegments: function mapDynamicSegments(values) {
+    return values;
+  }
+};
+
+var _initialiseProps = function _initialiseProps() {
+  var _this3 = this;
+
+  this.handleSwitchChange = function (props) {
+    var currPath = currentPath(props.location);
+    var visibleSwitch = getSwitch(currPath, props);
+    var dynamicValues = getDynamicSegments(currPath, props.basePath, visibleSwitch);
+
+    if (typeof props.onChange === 'function') {
+      props.onChange(!!visibleSwitch, currPath, dynamicValues);
+    }
+
+    _this3.setState({ visibleSwitch: visibleSwitch, dynamicValues: dynamicValues });
+  };
+
+  this.handleRouteChange = function (ev) {
+    _this3.handleSwitchChange(_this3.props);
+  };
+};
+
+return Switcher;
+
+})));
\ No newline at end of file
diff --git a/dist/switcheroo.umd.min.js b/dist/switcheroo.umd.min.js
new file mode 100644
index 0000000..4cd289b
--- /dev/null
+++ b/dist/switcheroo.umd.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define("switcheroo",["react"],t):e.switcheroo=t(e.React)}(this,function(e){"use strict";function t(e){var t=decodeURI(window.location[e].slice(1).split("?")[0]);return"/"!==t.charAt(0)?"/"+t:t}function n(e){return"/"===e?e:"/"!==e.slice(-1)?e:e.slice(0,-1)}function o(e){return e.replace(/\/:[^\/]+/g,"/([^/]+)")}function r(e){var t=e.match(/:[^\/]+/g)||[];return t.map(function(e){return e.substr(1)})}function a(e,t){return o(n(e+t)+"/?")}function i(e){return new RegExp("^("+e.join("|")+")$")}function s(e,t){var o=t.children,r=t.basePath,s=n(e),p=[].concat(o||[]);return p.filter(function(e){var t=[].concat(e.props.path).map(function(e){return a(r,e)}),n=i(t);return n.test(s)})[0]||null}function p(e,t,o){var i={},s=n(e);return o&&[].concat(o.props.path).forEach(function(e){var n=r(t+e),o=a(t,e),p=s.match(new RegExp("^"+o+"$"));p&&(p.shift(),n.forEach(function(e,t){i[e]=p[t]}))}),i}var c="default"in e?e.default:e,u="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},h=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},f=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),l=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},d=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)},y=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t},v=function(e){function n(e){h(this,n);var o=y(this,Object.getPrototypeOf(n).call(this,e));m.call(o);var r=t(e.location),a=s(r,e),i=p(r,e.basePath,a);return o.state={visibleSwitch:a,dynamicValues:i},o}return d(n,e),f(n,[{key:"componentDidMount",value:function(){this.props.load&&window.addEventListener("load",this.handleRouteChange),this.props.pushState&&window.addEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.addEventListener("hashchange",this.handleRouteChange)}},{key:"componentWillReceiveProps",value:function(e){this.handleSwitchChange(e)}},{key:"shouldComponentUpdate",value:function(e){return!e.preventUpdate()}},{key:"componentWillUnmount",value:function(){this.props.load&&window.removeEventListener("load",this.handleRouteChange),this.props.pushState&&window.removeEventListener("popstate",this.handleRouteChange),this.props.hashChange&&window.removeEventListener("hashchange",this.handleRouteChange)}},{key:"render",value:function(){var e=this,t=this.state.visibleSwitch||{},o=t.props,r=this.state.visibleSwitch&&c.cloneElement(this.state.visibleSwitch,l({},o,this.props.mapDynamicSegments(this.state.dynamicValues)));if(this.props.renderSwitch)return this.props.renderSwitch(r,this.state.dynamicValues);if(!this.props.wrapper)return r;var a=function(){var t=l({},e.props);return Object.keys(n.propTypes).forEach(function(e){return delete t[e]}),{v:c.createElement(e.props.wrapper,t,r)}}();return"object"===("undefined"==typeof a?"undefined":u(a))?a.v:void 0}}]),n}(e.Component);v.displayName="Switcher",v.propTypes={children:e.PropTypes.oneOfType([e.PropTypes.arrayOf(e.PropTypes.node),e.PropTypes.node]),pushState:e.PropTypes.bool,hashChange:e.PropTypes.bool,load:e.PropTypes.bool,onChange:e.PropTypes.func,wrapper:e.PropTypes.any,location:e.PropTypes.string,basePath:e.PropTypes.string,preventUpdate:e.PropTypes.func,mapDynamicSegments:e.PropTypes.func,renderSwitch:e.PropTypes.func},v.defaultProps={pushState:!1,hashChange:!0,load:!0,location:"hash",basePath:"",preventUpdate:function(){return!1},mapDynamicSegments:function(e){return e}};var m=function(){var e=this;this.handleSwitchChange=function(n){var o=t(n.location),r=s(o,n),a=p(o,n.basePath,r);"function"==typeof n.onChange&&n.onChange(!!r,o,a),e.setState({visibleSwitch:r,dynamicValues:a})},this.handleRouteChange=function(t){e.handleSwitchChange(e.props)}};return v});
diff --git a/package.json b/package.json
index 9f4c40e..8f0f0fe 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,13 @@
   "name": "switcheroo",
   "version": "3.0.0",
   "description": "React component that switches between components based on route",
-  "main": "dist/switcheroo.min.js",
+  "main": "dist/switcheroo.umd.min.js",
+  "jsnext:main": "dist/switcheroo.es-modules.js",
   "scripts": {
-    "build": "$(npm bin)/webpack",
+    "build": "npm run clean && $(npm bin)/rollup -c && npm run minify",
+    "minify": "npm run minify-browser && npm run minify-umd",
+    "minify-browser": "$(npm bin)/uglifyjs dist/switcheroo.browser.js -cm > dist/switcheroo.browser.min.js",
+    "minify-umd": "$(npm bin)/uglifyjs dist/switcheroo.umd.js -cm > dist/switcheroo.umd.min.js",
     "lint:src": "$(npm bin)/eslint ./src",
     "lint:test": "$(npm bin)/eslint ./test",
     "lint": "npm run lint:src && npm run lint:test",
@@ -39,6 +43,7 @@
     "babel-loader": "6.2.4",
     "babel-plugin-transform-runtime": "6.7.5",
     "babel-preset-es2015": "6.6.0",
+    "babel-preset-es2015-rollup": "1.2.0",
     "babel-preset-react": "6.5.0",
     "babel-preset-stage-0": "6.5.0",
     "babel-runtime": "6.6.1",
@@ -50,8 +55,11 @@
     "mocha": "2.4.5",
     "react": "15.0.0",
     "react-dom": "15.0.0",
+    "rollup": "0.34.10",
+    "rollup-plugin-babel": "2.6.1",
+    "rollup-plugin-replace": "1.1.1",
     "sinon": "1.17.3",
-    "webpack": "1.12.14"
+    "uglify-js": "2.7.3"
   },
   "peerDependencies": {
     "react": "^0.14.0 || ^15.0.0"
diff --git a/rollup.config.js b/rollup.config.js
new file mode 100644
index 0000000..1f29bc8
--- /dev/null
+++ b/rollup.config.js
@@ -0,0 +1,28 @@
+import babel from 'rollup-plugin-babel';
+import replace from 'rollup-plugin-replace';
+
+export default {
+  entry: 'src/index.js',
+  plugins: [
+    babel({
+      babelrc: false,
+      presets: ['es2015-rollup', 'stage-0']
+    }),
+    replace({
+      'process.env.NODE_DEBUG': false,
+      'process.env.NODE_ENV': 'production'
+    })
+  ],
+  globals: {
+    react: 'React'
+  },
+  moduleName: 'switcheroo',
+  moduleId: 'switcheroo',
+  targets: [
+    {format: 'umd', dest: 'dist/switcheroo.umd.js'},
+    {format: 'iife', dest: 'dist/switcheroo.browser.js'},
+    {format: 'amd', dest: 'dist/switcheroo.amd.js'},
+    {format: 'cjs', dest: 'dist/switcheroo.cjs.js'},
+    {format: 'es', dest: 'dist/switcheroo.es-modules.js'}
+  ]
+};
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 1c6d569..0000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var webpack = require('webpack');
-
-module.exports = {
-  entry: './src/index',
-  module: {
-    loaders: [
-      { test: /\.js$/, loader: 'babel', exclude: /node_modules/ }
-    ]
-  },
-  output: {
-    filename: 'dist/switcheroo.min.js',
-    libraryTarget: 'umd',
-    library: 'switcheroo'
-  },
-  resolve: {
-    extensions: ['', '.js'],
-    modulesDirectories: ['node_modules', 'src'],
-    fallback: __dirname
-  },
-  externals: [
-    {
-      "react": {
-        root: "React",
-        commonjs2: "react",
-        commonjs: "react",
-        amd: "react"
-      }
-    }
-  ],
-  plugins: [
-    new webpack.optimize.OccurenceOrderPlugin(),
-    new webpack.DefinePlugin({
-      'process.env': {
-        'NODE_ENV': JSON.stringify('production')
-      }
-    }),
-    new webpack.optimize.DedupePlugin(),
-    new webpack.optimize.UglifyJsPlugin()
-  ]
-};