diff --git a/client/app/bundles/comments/startup/ClientRouterApp.jsx b/client/app/bundles/comments/startup/ClientRouterApp.jsx
index 8faf1a28..067cb475 100644
--- a/client/app/bundles/comments/startup/ClientRouterApp.jsx
+++ b/client/app/bundles/comments/startup/ClientRouterApp.jsx
@@ -1,18 +1,17 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import Router from 'react-router';
-import createHistory from 'history/lib/createBrowserHistory';
+import { browserHistory } from 'react-router';
 
 import createStore from '../store/commentsStore';
 import routes from '../routes/routes';
 
 export default (props, location) => {
   const store = createStore(props);
-  const history = createHistory();
 
   return (
     <Provider store={store}>
-      <Router history={history} children={routes} />
+      <Router history={browserHistory} children={routes} />
     </Provider>
   );
 };
diff --git a/client/app/bundles/comments/startup/ServerRouterApp.jsx b/client/app/bundles/comments/startup/ServerRouterApp.jsx
index 8cf27bfa..14a00eee 100644
--- a/client/app/bundles/comments/startup/ServerRouterApp.jsx
+++ b/client/app/bundles/comments/startup/ServerRouterApp.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { match, RoutingContext } from 'react-router';
+import { match, RouterContext } from 'react-router';
 
 import createStore from '../store/commentsStore';
 import routes from '../routes/routes';
@@ -29,7 +29,7 @@ export default (props, location) => {
   // Important that you don't do this if you are redirecting or have an error.
   return (
     <Provider store={store}>
-      <RoutingContext {...routeProps} />
+      <RouterContext {...routeProps} />
     </Provider>
   );
 };
diff --git a/client/npm-shrinkwrap.json b/client/npm-shrinkwrap.json
index 8663e16b..450fa822 100644
--- a/client/npm-shrinkwrap.json
+++ b/client/npm-shrinkwrap.json
@@ -3,9 +3,9 @@
   "version": "1.1.0",
   "dependencies": {
     "abab": {
-      "version": "1.0.1",
+      "version": "1.0.2",
       "from": "abab@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.2.tgz"
     },
     "abbrev": {
       "version": "1.0.7",
@@ -28,9 +28,9 @@
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"
     },
     "acorn-to-esprima": {
-      "version": "2.0.4",
+      "version": "2.0.6",
       "from": "acorn-to-esprima@>=2.0.4 <3.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-to-esprima/-/acorn-to-esprima-2.0.4.tgz"
+      "resolved": "https://registry.npmjs.org/acorn-to-esprima/-/acorn-to-esprima-2.0.6.tgz"
     },
     "align-text": {
       "version": "0.1.3",
@@ -205,9 +205,9 @@
       "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz"
     },
     "autoprefixer": {
-      "version": "6.2.1",
+      "version": "6.2.3",
       "from": "autoprefixer@>=6.1.2 <7.0.0",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.2.1.tgz"
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.2.3.tgz"
     },
     "aws-sign2": {
       "version": "0.6.0",
@@ -872,7 +872,7 @@
     },
     "caniuse-db": {
       "version": "1.0.30000382",
-      "from": "caniuse-db@>=1.0.30000379 <2.0.0",
+      "from": "caniuse-db@>=1.0.30000382 <2.0.0",
       "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000382.tgz"
     },
     "caseless": {
@@ -903,9 +903,9 @@
       "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"
     },
     "chokidar": {
-      "version": "1.4.1",
+      "version": "1.4.2",
       "from": "chokidar@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.4.1.tgz"
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.4.2.tgz"
     },
     "clap": {
       "version": "1.0.10",
@@ -976,16 +976,36 @@
       "from": "code-point-at@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"
     },
+    "color": {
+      "version": "0.10.1",
+      "from": "color@>=0.10.1 <0.11.0",
+      "resolved": "https://registry.npmjs.org/color/-/color-0.10.1.tgz"
+    },
+    "color-convert": {
+      "version": "0.5.3",
+      "from": "color-convert@>=0.5.3 <0.6.0",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz"
+    },
+    "color-name": {
+      "version": "1.1.1",
+      "from": "color-name@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz"
+    },
+    "color-string": {
+      "version": "0.3.0",
+      "from": "color-string@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz"
+    },
+    "colormin": {
+      "version": "1.0.6",
+      "from": "colormin@>=1.0.5 <2.0.0",
+      "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.0.6.tgz"
+    },
     "colors": {
       "version": "1.1.2",
       "from": "colors@>=1.1.2 <1.2.0",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
     },
-    "colr-convert": {
-      "version": "1.0.5",
-      "from": "colr-convert@>=1.0.5 <2.0.0",
-      "resolved": "https://registry.npmjs.org/colr-convert/-/colr-convert-1.0.5.tgz"
-    },
     "combined-stream": {
       "version": "1.0.5",
       "from": "combined-stream@>=1.0.5 <1.1.0",
@@ -1084,9 +1104,9 @@
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"
     },
     "convert-source-map": {
-      "version": "1.1.2",
+      "version": "1.1.3",
       "from": "convert-source-map@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"
     },
     "cookie": {
       "version": "0.1.3",
@@ -1141,9 +1161,9 @@
       }
     },
     "css-color-names": {
-      "version": "0.0.2",
-      "from": "css-color-names@0.0.2",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.2.tgz"
+      "version": "0.0.3",
+      "from": "css-color-names@0.0.3",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz"
     },
     "css-loader": {
       "version": "0.23.1",
@@ -1201,9 +1221,9 @@
       "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz"
     },
     "dashdash": {
-      "version": "1.10.1",
+      "version": "1.11.0",
       "from": "dashdash@>=1.10.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz"
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.11.0.tgz"
     },
     "date-now": {
       "version": "0.1.4",
@@ -1648,9 +1668,9 @@
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz"
     },
     "fbjs": {
-      "version": "0.3.2",
-      "from": "fbjs@>=0.3.1 <0.4.0",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.3.2.tgz"
+      "version": "0.6.0",
+      "from": "fbjs@>=0.6.0 <0.7.0",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.6.0.tgz"
     },
     "figures": {
       "version": "1.4.0",
@@ -2473,9 +2493,9 @@
       }
     },
     "globals": {
-      "version": "8.15.0",
+      "version": "8.17.0",
       "from": "globals@>=8.3.0 <9.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-8.15.0.tgz"
+      "resolved": "https://registry.npmjs.org/globals/-/globals-8.17.0.tgz"
     },
     "globby": {
       "version": "4.0.0",
@@ -2483,9 +2503,9 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-4.0.0.tgz",
       "dependencies": {
         "glob": {
-          "version": "6.0.2",
+          "version": "6.0.3",
           "from": "glob@>=6.0.1 <7.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.2.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.3.tgz"
         }
       }
     },
@@ -3770,9 +3790,9 @@
       "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.0.0.tgz"
     },
     "postcss-colormin": {
-      "version": "2.1.7",
+      "version": "2.1.8",
       "from": "postcss-colormin@>=2.1.7 <3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.1.7.tgz"
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.1.8.tgz"
     },
     "postcss-convert-values": {
       "version": "2.3.4",
@@ -4030,14 +4050,14 @@
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.5.tgz"
     },
     "react": {
-      "version": "0.14.3",
+      "version": "0.14.5",
       "from": "react@>=0.14.3 <0.15.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-0.14.3.tgz"
+      "resolved": "https://registry.npmjs.org/react/-/react-0.14.5.tgz"
     },
     "react-addons-pure-render-mixin": {
-      "version": "0.14.3",
+      "version": "0.14.5",
       "from": "react-addons-pure-render-mixin@>=0.14.3 <0.15.0",
-      "resolved": "https://registry.npmjs.org/react-addons-pure-render-mixin/-/react-addons-pure-render-mixin-0.14.3.tgz"
+      "resolved": "https://registry.npmjs.org/react-addons-pure-render-mixin/-/react-addons-pure-render-mixin-0.14.5.tgz"
     },
     "react-bootstrap": {
       "version": "0.28.1",
@@ -4045,14 +4065,14 @@
       "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.28.1.tgz"
     },
     "react-deep-force-update": {
-      "version": "1.0.0",
+      "version": "1.0.1",
       "from": "react-deep-force-update@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-1.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-1.0.1.tgz"
     },
     "react-dom": {
-      "version": "0.14.3",
+      "version": "0.14.5",
       "from": "react-dom@>=0.14.3 <0.15.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-0.14.3.tgz"
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-0.14.5.tgz"
     },
     "react-overlays": {
       "version": "0.5.4",
@@ -4072,19 +4092,19 @@
       "resolved": "https://registry.npmjs.org/react-prop-types/-/react-prop-types-0.3.0.tgz"
     },
     "react-proxy": {
-      "version": "1.1.1",
+      "version": "1.1.2",
       "from": "react-proxy@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.1.tgz"
+      "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.2.tgz"
     },
     "react-redux": {
-      "version": "4.0.5",
+      "version": "4.0.6",
       "from": "react-redux@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-4.0.5.tgz"
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-4.0.6.tgz"
     },
     "react-router": {
-      "version": "1.0.3",
-      "from": "react-router@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-1.0.3.tgz"
+      "version": "2.0.0-rc4",
+      "from": "react-router@>=2.0.0-rc4 <3.0.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-2.0.0-rc4.tgz"
     },
     "read": {
       "version": "1.0.7",
@@ -4173,9 +4193,9 @@
       "resolved": "https://registry.npmjs.org/redux-promise/-/redux-promise-0.5.0.tgz"
     },
     "redux-thunk": {
-      "version": "1.0.2",
+      "version": "1.0.3",
       "from": "redux-thunk@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-1.0.2.tgz"
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-1.0.3.tgz"
     },
     "regenerate": {
       "version": "1.2.1",
@@ -4313,9 +4333,9 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.0.tgz",
       "dependencies": {
         "glob": {
-          "version": "6.0.2",
+          "version": "6.0.3",
           "from": "glob@>=6.0.1 <7.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.2.tgz"
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.3.tgz"
         }
       }
     },
@@ -4784,9 +4804,9 @@
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
     },
     "type-check": {
-      "version": "0.3.1",
+      "version": "0.3.2",
       "from": "type-check@>=0.3.1 <0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz"
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
     },
     "type-detect": {
       "version": "1.0.0",
@@ -4982,9 +5002,9 @@
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
     },
     "vow": {
-      "version": "0.4.11",
+      "version": "0.4.12",
       "from": "vow@>=0.4.8 <0.5.0",
-      "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.11.tgz"
+      "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.12.tgz"
     },
     "vow-fs": {
       "version": "0.3.4",
diff --git a/client/package.json b/client/package.json
index 19cf4172..42b616a6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -70,7 +70,7 @@
     "react-bootstrap": "^0.28.1",
     "react-dom": "^0.14.3",
     "react-redux": "^4.0.0",
-    "react-router": "^1.0.2",
+    "react-router": "^2.0.0-rc4",
     "redux": "^3.0.4",
     "redux-promise": "^0.5.0",
     "redux-thunk": "^1.0.0",