diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..5acccd9
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,4 @@
+{
+  "stage": 2,
+  "loose": "all"
+}
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000..d7a984e
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,3 @@
+demo/
+dist/
+lib/
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..add22d3
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,13 @@
+{
+  "extends": ["standard", "standard-react"],
+  "rules": {
+    "brace-style": [2, "stroustrup", {"allowSingleLine": true}],
+    "eqeqeq": [2, "smart"],
+    "jsx-quotes": [2, "prefer-double"],
+    "react/prop-types": 0,
+    "react/self-closing-comp": 0,
+    "react/wrap-multilines": 0,
+    "space-before-function-paren": [2, "never"]
+  },
+  "parser": "babel-eslint"
+}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 3ccf497..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "browser": true,
-  "node": true,
-
-  "curly": true,
-  "devel": true,
-  "globals": {
-  },
-  "noempty": true,
-  "newcap": false,
-  "undef": true,
-  "unused": "vars",
-
-  "asi": true,
-  "boss": true,
-  "eqnull": true,
-  "expr": true,
-  "funcscope": true,
-  "globalstrict": true,
-  "laxbreak": true,
-  "laxcomma": true,
-  "loopfunc": true,
-  "sub": true
-}
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..b7879c9
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,10 @@
+dist/
+src/
+test/
+.babelrc
+.eslintrc
+.eslintignore
+.gitignore
+.travis.yml
+webpack.config.js
+webpack.prod.config.js
diff --git a/README.md b/README.md
index 481f6a9..dbba504 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,5 @@
 ## React Router `<Form>`
 
-A `<Form>` component for use with
-[react-router](https://github.com/rackt/react-router)
-which does for `<form>` what react-router's
-[`<Link>` component](https://github.com/rackt/react-router/blob/master/docs/api/components/Link.md)
-does for `<a>`.
+A `<Form>` component for use with [React Router](https://github.com/rackt/react-router) which does for `<form>` what react-router's `<Link>` does for `<a>`.
 
-## MIT Licensed
\ No newline at end of file
+## MIT Licensed
diff --git a/demo/index.html b/demo/index.html
index 0f62c3f..c26b9fa 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -2,9 +2,11 @@
 <head>
   <meta charset="UTF-8">
   <title>react-router-form</title>
-  <script src="http://fb.me/react-0.13.1.js"></script>
-  <script src="http://fb.me/JSXTransformer-0.13.1.js"></script>
-  <script src="http://cdnjs.cloudflare.com/ajax/libs/react-router/0.13.2/ReactRouter.js"></script>
+  <script src="http://fb.me/react-0.14.0.js"></script>
+  <script src="http://fb.me/react-dom-0.14.0.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/react-router/1.0.0-rc1/ReactRouter.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.25/browser-polyfill.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.25/browser.min.js"></script>
   <script src="../dist/react-router-form.js"></script>
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans">
   <style>
@@ -31,200 +33,168 @@
 </head>
 <body>
 <div id="app"></div>
-<script type="text/jsx;harmony=true">void function() { 'use strict';
-
-var Form = ReactRouterForm
-var {DefaultRoute, Link, Route, RouteHandler} = ReactRouter
-
-function assign(target, sources) {
-  if (target == null) {
-    throw new TypeError('Object.assign target cannot be null or undefined');
-  }
-
-  var to = Object(target);
-  var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-  for (var nextIndex = 1; nextIndex < arguments.length; nextIndex++) {
-    var nextSource = arguments[nextIndex];
-    if (nextSource == null) {
-      continue;
-    }
-
-    var from = Object(nextSource);
-
-    // We don't currently support accessors nor proxies. Therefore this
-    // copy cannot throw. If we ever supported this then we must handle
-    // exceptions and side-effects. We don't support symbols so they won't
-    // be transferred.
-
-    for (var key in from) {
-      if (hasOwnProperty.call(from, key)) {
-        to[key] = from[key];
+<script type="text/babel">
+(function() {
+  /* global React ReactDOM ReactRouter ReactRouterForm*/
+  'use strict'
+
+  var Form = ReactRouterForm
+  var {IndexRoute, Link, Route, Router} = ReactRouter
+
+  var CONTACTS = [{
+    first: 'Ryan',
+    last: 'Florence',
+    avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/ryan.jpg'
+  }, {
+    first: 'Michael',
+    last: 'Jackson',
+    avatar: 'https://pbs.twimg.com/profile_images/574612921541505024/EBEUav5W_400x400.jpeg'
+  }, {
+    first: 'Jeremy',
+    last: 'Ashkenas',
+    avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/jeremy.jpg'
+  }, {
+    first: 'Yehuda',
+    last: 'Katz',
+    avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/yehuda.jpg'
+  }, {
+    first: 'Tom',
+    last: 'Dale',
+    avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/tom.jpg'
+  }, {
+    first: 'Pete',
+    last: 'Hunt',
+    avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/pete.jpg'
+  }, {
+    first: 'Misko',
+    last: 'Hevery',
+    avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/misko.png'
+  }, {
+    first: 'Scott',
+    last: 'Miles',
+    avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/scott.png'
+  }, {
+    first: 'Matt',
+    last: 'Zabriskie',
+    avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/matt.jpeg'
+  }]
+
+  var ContactService = {
+    add(contact, cb) {
+      if (!contact.first || !contact.last || !contact.avatar || !contact.PIN) {
+        return cb(null, 'All fields are required.')
       }
+      // Simulated server-only check
+      var dupe = CONTACTS.some(existing => {
+        return existing.first.toUpperCase() === contact.first.toUpperCase() &&
+               existing.last.toUpperCase() === contact.last.toUpperCase()
+      })
+      if (dupe) {
+        return cb(null, 'Duplicate contact name.')
+      }
+      CONTACTS.push(contact)
+      cb(null)
     }
   }
 
-  return to;
-};
-
-var CONTACTS = [{
-  first: 'Ryan',
-  last: 'Florence',
-  avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/ryan.jpg'
-}, {
-  first: 'Michael',
-  last: 'Jackson',
-  avatar: 'https://pbs.twimg.com/profile_images/574612921541505024/EBEUav5W_400x400.jpeg'
-}, {
-  first: 'Jeremy',
-  last: 'Ashkenas',
-  avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/jeremy.jpg'
-}, {
-  first: 'Yehuda',
-  last: 'Katz',
-  avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/yehuda.jpg'
-}, {
-  first: 'Tom',
-  last: 'Dale',
-  avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/tom.jpg'
-}, {
-  first: 'Pete',
-  last: 'Hunt',
-  avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/pete.jpg'
-}, {
-  first: 'Misko',
-  last: 'Hevery',
-  avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/misko.png'
-}, {
-  first: 'Scott',
-  last: 'Miles',
-  avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/scott.png'
-}, {
-  first: 'Matt',
-  last: 'Zabriskie',
-  avatar: 'http://ryanflorence.com/jsconf-avatars/avatars/matt.jpeg'
-}]
-
-var ContactService = {
-  add(contact, cb) {
-    if (!contact.first || !contact.last || !contact.avatar || !contact.PIN) {
-      return cb(null, 'All fields are required.')
-    }
-    // Simulated server-only check
-    var dupe = CONTACTS.some(existing => {
-      return existing.first.toUpperCase() == contact.first.toUpperCase() &&
-             existing.last.toUpperCase() == contact.last.toUpperCase()
-    })
-    if (dupe) {
-      return cb(null, 'Duplicate contact name.')
-    }
-    CONTACTS.push(contact)
-    cb(null)
-  }
-}
-
-var App = React.createClass({
-  render() {
-    return <div className="App">
-      <p>
-        Reuses components from the <a href="http://react-router-mega-demo.herokuapp.com/">React Router Mega Demo</a>,
-        but uses the <code>&lt;Form&gt;</code> component from <a href="https://github.com/insin/react-router-form">react-router-form</a>
-        to automatically retrieve and submit GET form data.
-      </p>
-      <RouteHandler {...this.props}/>
-    </div>
-  }
-})
-
-var Contacts = React.createClass({
-  render() {
-    return <div>
-      <h2>Contacts</h2>
-
-      <Link to="newContact">New Contact</Link>
-      <hr/>
-      {CONTACTS.map(contact => <div className="Contact">
-        <h3>{contact.first} {contact.last}</h3>
-        <img src={contact.avatar}/>
-      </div>)}
-      <hr/>
-      <Link to="newContact">New Contact</Link>
-    </div>
-  }
-})
-
-var NewContact = React.createClass({
-  getInitialState() {
-    return {
-      error: this.props.query._error || null
+  var App = React.createClass({
+    render() {
+      return <div className="App">
+        <p>
+          Reuses components from the <a href="http://react-router-mega-demo.herokuapp.com/">React Router Mega Demo</a>,
+          but uses the <code>&lt;Form&gt;</code> component
+          from <a href="https://github.com/insin/react-router-form">react-router-form</a> to
+          automatically retrieve and submit form data.
+        </p>
+        {this.props.children}
+      </div>
     }
-  },
-
-  componentWillReceiveProps(nextProps) {
-    if (nextProps.query._error) {
-      this.setState({error: nextProps.query._error})
+  })
+
+  var Contacts = React.createClass({
+    render() {
+      return <div>
+        <h2>Contacts</h2>
+
+        <Link to="/new-contact">New Contact</Link>
+        <hr/>
+        {CONTACTS.map(contact => <div className="Contact">
+          <h3>{contact.first} {contact.last}</h3>
+          <img src={contact.avatar}/>
+        </div>)}
+        <hr/>
+        <Link to="/new-contact">New Contact</Link>
+      </div>
     }
-  },
+  })
 
-  _onSubmit(e, contact) {
-    var error = this.state.error
-    if (Object.keys(contact).some(prop => contact[prop] === '')) {
-      e.preventDefault()
-      error = 'All fields are required.'
-    }
-    this.setState({error})
-  },
+  var NewContact = React.createClass({
+    getInitialState() {
+      return {
+        error: null
+      }
+    },
+
+    componentWillReceiveProps(nextProps) {
+      var {state} = this.props.location
+      var {state: nextState} = nextProps.location
+      if (nextState && nextState.error &&
+         (!state || state.error !== nextState.error)) {
+        this.setState({error: nextState.error})
+      }
+    },
 
-  render() {
-    var {query} = this.props
-    return <div>
-      <h1>New Contact</h1>
-      <p><em>
-        (Enter a duplicate name to simulate a service call resulting in an error response)
-      </em></p>
-      <div>
-        <Form to="createContact" onSubmit={this._onSubmit}>
-          {this.state.error && <p className="error">{this.state.error}</p>}
-          <p><input name="first" placeholder="first name" defaultValue={query.first || ''}/></p>
-          <p><input name="last" placeholder="last name" defaultValue={query.last || ''}/></p>
-          <p><input name="avatar" placeholder="avatar url" defaultValue={query.avatar || ''}/></p>
-          <p><input name="PIN" type="password" placeholder="PIN" defaultValue={query.PIN || ''}/></p>
-          <p><button type="submit">Add</button> or <Link to="/">Cancel</Link></p>
-        </Form>
+    _onSubmit(e, contact) {
+      var error = this.state.error
+      if (Object.keys(contact).some(prop => contact[prop] === '')) {
+        e.preventDefault()
+        error = 'All fields are required.'
+      }
+      this.setState({error})
+    },
+
+    render() {
+      var {location} = this.props
+      var contact = location.state && location.state.contact || {}
+      return <div>
+        <h1>New Contact</h1>
+        <p><em>
+          (Enter a duplicate name to simulate a service call resulting in an error response)
+        </em></p>
+        <div>
+          <Form method="POST" to="/create-contact" dataKey="contact" onSubmit={this._onSubmit}>
+            {this.state.error && <p className="error">{this.state.error}</p>}
+            <p><input name="first" placeholder="first name" defaultValue={contact.first}/></p>
+            <p><input name="last" placeholder="last name" defaultValue={contact.last}/></p>
+            <p><input name="avatar" placeholder="avatar url" defaultValue={contact.avatar}/></p>
+            <p><input name="PIN" type="password" placeholder="PIN" defaultValue={contact.PIN}/></p>
+            <p><button type="submit">Add</button> or <Link to="/">Cancel</Link></p>
+          </Form>
+        </div>
       </div>
-    </div>
-  }
-})
-
-var CreateContact = React.createClass({
-  statics: {
-    willTransitionTo(transition, params, query, cb) {
-      ContactService.add(query, (err, errorMessage) => {
-        if (!errorMessage) {
-          transition.redirect('contacts')
-        }
-        else {
-          transition.redirect('newContact', {}, assign(query, {_error: errorMessage}))
-        }
-        cb()
-      })
     }
-  },
+  })
 
-  render() {
-    return null
+  function handleCreateContact({location}, replaceState, cb) {
+    var {contact} = location.state
+    ContactService.add(contact, (_, error) => {
+      if (!error) {
+        replaceState(null, '/')
+      }
+      else {
+        replaceState({contact, error}, '/new-contact')
+      }
+      cb()
+    })
   }
-})
-
-var routes = <Route name="contacts" path="/" handler={App}>
-  <DefaultRoute handler={Contacts}/>
-  <Route name="newContact" handler={NewContact}/>
-  <Route name="createContact" handler={CreateContact}/>
-</Route>
 
-ReactRouter.run(routes, (Handler, state) => {
-  React.render(<Handler params={state.params} query={state.query}/>, document.getElementById('app'))
-})
+  var routes = <Route path="/" component={App}>
+    <IndexRoute component={Contacts}/>
+    <Route path="new-contact" component={NewContact}/>
+    <Route path="create-contact" onEnter={handleCreateContact}/>
+  </Route>
 
-}()</script>
-</body>
\ No newline at end of file
+  ReactDOM.render(<Router routes={routes}/>, document.querySelector('#app'))
+})()
+</script>
+</body>
diff --git a/dist/react-router-form.js b/dist/react-router-form.js
index 0500ba5..070fd79 100644
--- a/dist/react-router-form.js
+++ b/dist/react-router-form.js
@@ -1,332 +1,358 @@
-/*!
- * react-router-form 1.0.0 (dev build at Wed, 08 Apr 2015 10:07:29 GMT) - https://github.com/insin/react-router-form
- * MIT Licensed
- */
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.ReactRouterForm = f()}})(function(){var define,module,exports;return (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})({1:[function(require,module,exports){
-'use strict';
-
-var getFormData = require('get-form-data')
-var React = (typeof window !== "undefined" ? window.React : typeof global !== "undefined" ? global.React : null)
-var assign = require('react/lib/Object.assign')
-
-/**
- * <Form> components are used to create a <form> element that submits its input
- * data to a route.
- *
- * For example, assuming you have the following route:
- *
- *   <Route name="addPost" path="/topics/:topicID/addPost" handler={AddPost}/>
- *
- * You could use the following component to submit a form's input data to that
- * route:
- *
- *   <Form to="addPost" params={{ topicID: "123" }}>
- */
-var Form = React.createClass({
-
-  displayName: 'Form',
-
-  contextTypes: {
-    router: React.PropTypes.func
-  },
-
-  propTypes: {
-    component: React.PropTypes.any,
-    to: React.PropTypes.string.isRequired,
-    params: React.PropTypes.object,
-    query: React.PropTypes.object,
-    onSubmit: React.PropTypes.func
-  },
-
-  getDefaultProps:function() {
-    return {
-      component: 'form',
-      method: 'GET'
-    }
-  },
-
-  handleSubmit:function(event) {
-    var formData = getFormData(event.target)
-    var allowTransition = true
-    var submitResult
-
-    if (this.props.onSubmit) {
-      submitResult = this.props.onSubmit(event, formData)
-    }
-
-    if (submitResult === false || event.defaultPrevented === true) {
-      allowTransition = false
-    }
-
-    event.preventDefault()
-
-    if (allowTransition) {
-      if (this.props.method === 'GET') {
-        // GET submissions use the query string, so just marge form data into it
-        this.context.router.transitionTo(
-          this.props.to,
-          this.props.params,
-          assign({}, this.props.query, formData)
-        )
-      }
-      else {
-        // HACK - add data to the query string along with a dummy method indicator
-        this.context.router.transitionTo(
-          this.props.to,
-          this.props.params,
-          assign({}, this.props.query, formData, {_method: this.props.method})
-        )
-      }
-    }
-  },
-
-  /**
-   * Returns the value of the "action" attribute to use on the DOM element.
-   */
-  getAction:function() {
-    return this.context.router.makeHref(this.props.to, this.props.params, this.props.query)
-  },
-
-  render:function() {
-    var props = assign({}, this.props, {
-      action: this.getAction(),
-      onSubmit: this.handleSubmit
-    })
-
-    return React.createElement(this.props.component, props, this.props.children)
-  }
-})
-
-module.exports = Form
-},{"get-form-data":2,"react/lib/Object.assign":3}],2:[function(require,module,exports){
-'use strict';
-
-var NODE_LIST_CLASSES = {
-  '[object HTMLCollection]': true
-, '[object NodeList]': true
-, '[object RadioNodeList]': true
-}
-
-var IGNORED_INPUT_TYPES = {
-  'button': true
-, 'reset': true
-, 'submit': true
-, 'fieldset': true
-}
-
-var CHECKED_INPUT_TYPES = {
-  'checkbox': true
-, 'radio': true
-}
-
-var TRIM_RE = /^\s+|\s+$/g
-
-var slice = Array.prototype.slice
-var toString = Object.prototype.toString
-
-/**
- * @param {HTMLFormElement} form
- * @return {Object.<string,(string|Array.<string>)>} an object containing
- *   submittable value(s) held in the form's .elements collection, with
- *   properties named as per element names or ids.
- */
-function getFormData(form, options) {
-  if (!form) {
-    throw new Error('A form is required by getFormData, was given form=' + form)
-  }
-
-  if (!options) {
-    options = {trim: false}
-  }
-
-  var data = {}
-  var elementName
-  var elementNames = []
-  var elementNameLookup = {}
-
-  // Get unique submittable element names for the form
-  for (var i = 0, l = form.elements.length; i < l; i++) {
-    var element = form.elements[i]
-    if (IGNORED_INPUT_TYPES[element.type] || element.disabled) {
-      continue
-    }
-    elementName = element.name || element.id
-    if (!elementNameLookup[elementName]) {
-      elementNames.push(elementName)
-      elementNameLookup[elementName] = true
-    }
-  }
-
-  // Extract element data name-by-name for consistent handling of special cases
-  // around elements which contain multiple inputs.
-  for (i = 0, l = elementNames.length; i < l; i++) {
-    elementName = elementNames[i]
-    var value = getNamedFormElementData(form, elementName, options)
-    if (value != null) {
-      data[elementName] = value
-    }
-  }
-
-  return data
-}
-
-/**
- * @param {HTMLFormElement} form
- * @param {string} elementName
- * @return {(string|Array.<string>)} submittable value(s) in the form for a
- *   named element from its .elements collection, or null if there was no
- *   element with that name or the element had no submittable value(s).
- */
-function getNamedFormElementData(form, elementName, options) {
-  if (!form) {
-    throw new Error('A form is required by getNamedFormElementData, was given form=' + form)
-  }
-  if (!elementName) {
-    throw new Error('A form element name is required by getNamedFormElementData, was given elementName=' + elementName)
-  }
-
-  var element = form.elements[elementName]
-  if (!element || element.disabled) {
-    return null
-  }
-
-  var trim = !!(options && options.trim)
-
-  if (!NODE_LIST_CLASSES[toString.call(element)]) {
-    return getFormElementValue(element, trim)
-  }
-
-  // Deal with multiple form controls which have the same name
-  var data = []
-  var allRadios = true
-  for (var i = 0, l = element.length; i < l; i++) {
-    if (element[i].disabled) {
-      continue
-    }
-    if (allRadios && element[i].type !== 'radio') {
-      allRadios = false
-    }
-    var value = getFormElementValue(element[i], trim)
-    if (value != null) {
-      data = data.concat(value)
-    }
-  }
-
-  // Special case for an element with multiple same-named inputs which were all
-  // radio buttons: if there was a selected value, only return the value.
-  if (allRadios && data.length === 1) {
-    return data[0]
-  }
-
-  return (data.length > 0 ? data : null)
-}
-
-/**
- * @param {HTMLElement} element a form element.
- * @param {booleam} trim should values for text entry inputs be trimmed?
- * @return {(string|Array.<string>|File|Array.<File>)} the element's submittable
- *   value(s), or null if it had none.
- */
-function getFormElementValue(element, trim) {
-  var value = null
-
-  if (element.type === 'select-one') {
-    if (element.options.length) {
-      value = element.options[element.selectedIndex].value
-    }
-    return value
-  }
-
-  if (element.type === 'select-multiple') {
-    value = []
-    for (var i = 0, l = element.options.length; i < l; i++) {
-      if (element.options[i].selected) {
-        value.push(element.options[i].value)
-      }
-    }
-    if (value.length === 0) {
-      value = null
-    }
-    return value
-  }
-
-  // If a file input doesn't have a files attribute, fall through to using its
-  // value attribute.
-  if (element.type === 'file' && 'files' in element) {
-    if (element.multiple) {
-      value = slice.call(element.files)
-      if (value.length === 0) {
-        value = null
-      }
-    }
-    else {
-      // Should be null if not present, according to the spec
-      value = element.files[0]
-    }
-    return value
-  }
-
-  if (!CHECKED_INPUT_TYPES[element.type]) {
-    value = (trim ? element.value.replace(TRIM_RE, '') : element.value)
-  }
-  else if (element.checked) {
-    value = element.value
-  }
-
-  return value
-}
-
-getFormData.getNamedFormElementData = getNamedFormElementData
-
-module.exports = getFormData
-},{}],3:[function(require,module,exports){
-/**
- * Copyright 2014-2015, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule Object.assign
- */
-
-// https://people.mozilla.org/~jorendorff/es6-draft.html#sec-object.assign
-
-'use strict';
-
-function assign(target, sources) {
-  if (target == null) {
-    throw new TypeError('Object.assign target cannot be null or undefined');
-  }
-
-  var to = Object(target);
-  var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-  for (var nextIndex = 1; nextIndex < arguments.length; nextIndex++) {
-    var nextSource = arguments[nextIndex];
-    if (nextSource == null) {
-      continue;
-    }
-
-    var from = Object(nextSource);
-
-    // We don't currently support accessors nor proxies. Therefore this
-    // copy cannot throw. If we ever supported this then we must handle
-    // exceptions and side-effects. We don't support symbols so they won't
-    // be transferred.
-
-    for (var key in from) {
-      if (hasOwnProperty.call(from, key)) {
-        to[key] = from[key];
-      }
-    }
-  }
-
-  return to;
-}
-
-module.exports = assign;
-
-},{}]},{},[1])(1)
-});
\ No newline at end of file
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory(require("react"));
+	else if(typeof define === 'function' && define.amd)
+		define(["react"], factory);
+	else if(typeof exports === 'object')
+		exports["ReactRouterForm"] = factory(require("react"));
+	else
+		root["ReactRouterForm"] = factory(root["React"]);
+})(this, function(__WEBPACK_EXTERNAL_MODULE_2__) {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	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; };
+
+	function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
+	var getFormData = __webpack_require__(1);
+	var React = __webpack_require__(2);
+
+	/**
+	 * <Form> components are used to create a <form> element that submits its input
+	 * data to a route.
+	 *
+	 * For example, assuming you have the following route:
+	 *
+	 *   <Route path="/topics/:topicID/add-post" onEnter={handleAddPost}/>
+	 *
+	 * You could use the following component to submit a form's input data to that
+	 * route as location state:
+	 *
+	 *   <Form to={`/topics/${topicID}/add-post`}>
+	 */
+	var Form = React.createClass({
+	  displayName: 'Form',
+
+	  contextTypes: {
+	    history: React.PropTypes.object
+	  },
+
+	  propTypes: {
+	    component: React.PropTypes.any,
+	    dataKey: React.PropTypes.string,
+	    extractFormData: React.PropTypes.func,
+	    methodKey: React.PropTypes.string,
+	    onSubmit: React.PropTypes.func,
+	    query: React.PropTypes.object,
+	    state: React.PropTypes.object,
+	    to: React.PropTypes.string.isRequired
+	  },
+
+	  getDefaultProps: function getDefaultProps() {
+	    return {
+	      component: 'form',
+	      dataKey: 'body',
+	      extractFormData: getFormData,
+	      method: 'GET',
+	      methodKey: 'method'
+	    };
+	  },
+
+	  handleSubmit: function handleSubmit(event) {
+	    var formData = this.props.extractFormData(event.target);
+	    var allowTransition = true;
+	    var submitResult;
+
+	    if (this.props.onSubmit) {
+	      submitResult = this.props.onSubmit(event, formData);
+	    }
+
+	    if (submitResult === false || event.defaultPrevented === true) {
+	      allowTransition = false;
+	    }
+
+	    event.preventDefault();
+
+	    if (allowTransition) {
+	      var state = this.props.state;
+	      var to = this.props.to;
+	      var query = this.props.query;
+	      if (this.props.method === 'GET') {
+	        // GET submissions use the query string, so just merge form data into it
+	        query = _extends({}, query, formData);
+	      } else {
+	        var _extends2;
+
+	        state = _extends({}, state, (_extends2 = {}, _extends2[this.props.methodKey] = this.props.method, _extends2[this.props.dataKey] = formData, _extends2));
+	      }
+	      this.context.history.pushState(state, to, query);
+	    }
+	  },
+
+	  render: function render() {
+	    var _props = this.props;
+	    var component = _props.component;
+	    var dataKey = _props.dataKey;
+	    var methodKey = _props.methodKey;
+	    var onSubmit = _props.onSubmit;
+	    var query = _props.query;
+	    var state = _props.state;
+	    var to = _props.to;
+
+	    var props = _objectWithoutProperties(_props, ['component', 'dataKey', 'methodKey', 'onSubmit', 'query', 'state', 'to']);
+
+	    var history = this.context.history;
+
+	    props.onSubmit = this.handleSubmit;
+
+	    if (history) {
+	      props.action = history.createHref(to, query);
+	    }
+
+	    return React.createElement(this.props.component, props);
+	  }
+	});
+
+	module.exports = Form;
+
+/***/ },
+/* 1 */
+/***/ function(module, exports) {
+
+	'use strict';
+
+	var NODE_LIST_CLASSES = {
+	  '[object HTMLCollection]': true
+	, '[object NodeList]': true
+	, '[object RadioNodeList]': true
+	}
+
+	var IGNORED_INPUT_TYPES = {
+	  'button': true
+	, 'reset': true
+	, 'submit': true
+	, 'fieldset': true
+	}
+
+	var CHECKED_INPUT_TYPES = {
+	  'checkbox': true
+	, 'radio': true
+	}
+
+	var TRIM_RE = /^\s+|\s+$/g
+
+	var slice = Array.prototype.slice
+	var toString = Object.prototype.toString
+
+	/**
+	 * @param {HTMLFormElement} form
+	 * @return {Object.<string,(string|Array.<string>)>} an object containing
+	 *   submittable value(s) held in the form's .elements collection, with
+	 *   properties named as per element names or ids.
+	 */
+	function getFormData(form, options) {
+	  if (!form) {
+	    throw new Error('A form is required by getFormData, was given form=' + form)
+	  }
+
+	  if (!options) {
+	    options = {trim: false}
+	  }
+
+	  var data = {}
+	  var elementName
+	  var elementNames = []
+	  var elementNameLookup = {}
+
+	  // Get unique submittable element names for the form
+	  for (var i = 0, l = form.elements.length; i < l; i++) {
+	    var element = form.elements[i]
+	    if (IGNORED_INPUT_TYPES[element.type] || element.disabled) {
+	      continue
+	    }
+	    elementName = element.name || element.id
+	    if (elementName && !elementNameLookup[elementName]) {
+	      elementNames.push(elementName)
+	      elementNameLookup[elementName] = true
+	    }
+	  }
+
+	  // Extract element data name-by-name for consistent handling of special cases
+	  // around elements which contain multiple inputs.
+	  for (i = 0, l = elementNames.length; i < l; i++) {
+	    elementName = elementNames[i]
+	    var value = getNamedFormElementData(form, elementName, options)
+	    if (value != null) {
+	      data[elementName] = value
+	    }
+	  }
+
+	  return data
+	}
+
+	/**
+	 * @param {HTMLFormElement} form
+	 * @param {string} elementName
+	 * @return {(string|Array.<string>)} submittable value(s) in the form for a
+	 *   named element from its .elements collection, or null if there was no
+	 *   element with that name or the element had no submittable value(s).
+	 */
+	function getNamedFormElementData(form, elementName, options) {
+	  if (!form) {
+	    throw new Error('A form is required by getNamedFormElementData, was given form=' + form)
+	  }
+	  if (!elementName && toString.call(elementName) !== '[object String]') {
+	    throw new Error('A form element name is required by getNamedFormElementData, was given elementName=' + elementName)
+	  }
+
+	  var element = form.elements[elementName]
+	  if (!element || element.disabled) {
+	    return null
+	  }
+
+	  var trim = !!(options && options.trim)
+
+	  if (!NODE_LIST_CLASSES[toString.call(element)]) {
+	    return getFormElementValue(element, trim)
+	  }
+
+	  // Deal with multiple form controls which have the same name
+	  var data = []
+	  var allRadios = true
+	  for (var i = 0, l = element.length; i < l; i++) {
+	    if (element[i].disabled) {
+	      continue
+	    }
+	    if (allRadios && element[i].type !== 'radio') {
+	      allRadios = false
+	    }
+	    var value = getFormElementValue(element[i], trim)
+	    if (value != null) {
+	      data = data.concat(value)
+	    }
+	  }
+
+	  // Special case for an element with multiple same-named inputs which were all
+	  // radio buttons: if there was a selected value, only return the value.
+	  if (allRadios && data.length === 1) {
+	    return data[0]
+	  }
+
+	  return (data.length > 0 ? data : null)
+	}
+
+	/**
+	 * @param {HTMLElement} element a form element.
+	 * @param {booleam} trim should values for text entry inputs be trimmed?
+	 * @return {(string|Array.<string>|File|Array.<File>)} the element's submittable
+	 *   value(s), or null if it had none.
+	 */
+	function getFormElementValue(element, trim) {
+	  var value = null
+
+	  if (element.type === 'select-one') {
+	    if (element.options.length) {
+	      value = element.options[element.selectedIndex].value
+	    }
+	    return value
+	  }
+
+	  if (element.type === 'select-multiple') {
+	    value = []
+	    for (var i = 0, l = element.options.length; i < l; i++) {
+	      if (element.options[i].selected) {
+	        value.push(element.options[i].value)
+	      }
+	    }
+	    if (value.length === 0) {
+	      value = null
+	    }
+	    return value
+	  }
+
+	  // If a file input doesn't have a files attribute, fall through to using its
+	  // value attribute.
+	  if (element.type === 'file' && 'files' in element) {
+	    if (element.multiple) {
+	      value = slice.call(element.files)
+	      if (value.length === 0) {
+	        value = null
+	      }
+	    }
+	    else {
+	      // Should be null if not present, according to the spec
+	      value = element.files[0]
+	    }
+	    return value
+	  }
+
+	  if (!CHECKED_INPUT_TYPES[element.type]) {
+	    value = (trim ? element.value.replace(TRIM_RE, '') : element.value)
+	  }
+	  else if (element.checked) {
+	    value = element.value
+	  }
+
+	  return value
+	}
+
+	getFormData.getNamedFormElementData = getNamedFormElementData
+
+	module.exports = getFormData
+
+/***/ },
+/* 2 */
+/***/ function(module, exports) {
+
+	module.exports = __WEBPACK_EXTERNAL_MODULE_2__;
+
+/***/ }
+/******/ ])
+});
+;
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index 63051da..0000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var browserify = require('browserify')
-var del = require('del')
-var gulp = require('gulp')
-var source = require('vinyl-source-stream')
-
-var header = require('gulp-header')
-var jshint = require('gulp-jshint')
-var rename = require('gulp-rename')
-var plumber = require('gulp-plumber')
-var react = require('gulp-react')
-var streamify = require('gulp-streamify')
-var uglify = require('gulp-uglify')
-var gutil = require('gulp-util')
-
-var pkg = require('./package.json')
-var devBuild = gutil.env.release ? '' : ' (dev build at ' + (new Date()).toUTCString() + ')'
-var distHeader = '/*!\n\
- * <%= pkg.name %> <%= pkg.version %><%= devBuild %> - <%= pkg.homepage %>\n\
- * <%= pkg.license %> Licensed\n\
- */\n'
-
-var jsSrcPaths = './src/**/*.js*'
-var jsLibPaths = './lib/**/*.js'
-
-gulp.task('clean-dist', function(cb) {
-  del('./dist/*.js', cb)
-})
-
-gulp.task('clean-lib', function(cb) {
-  del(jsLibPaths, cb)
-})
-
-gulp.task('transpile-js', ['clean-lib'], function() {
-  return gulp.src(jsSrcPaths)
-    .pipe(plumber())
-    .pipe(react({harmony: true}))
-    .pipe(gulp.dest('./lib'))
-})
-
-gulp.task('lint-js', ['transpile-js'], function() {
-  return gulp.src(jsLibPaths)
-    .pipe(jshint('./.jshintrc'))
-    .pipe(jshint.reporter('jshint-stylish'))
-})
-
-gulp.task('bundle-js', ['clean-dist', 'lint-js'], function() {
-  var b = browserify(pkg.main, {
-    debug: !!gutil.env.debug
-  , standalone: pkg.standalone
-  , detectGlobals: false
-  })
-  b.transform('browserify-shim')
-
-  var stream = b.bundle()
-    .pipe(source(pkg.name + '.js'))
-    .pipe(streamify(header(distHeader, {pkg: pkg, devBuild: devBuild})))
-    .pipe(gulp.dest('./dist'))
-
-  if (gutil.env.production) {
-    stream = stream
-      .pipe(rename(pkg.name + '.min.js'))
-      .pipe(streamify(uglify()))
-      .pipe(streamify(header(distHeader, {pkg: pkg, devBuild: devBuild})))
-      .pipe(gulp.dest('./dist'))
-  }
-
-  return stream
-})
-
-gulp.task('watch', function() {
-  gulp.watch(jsSrcPaths, ['bundle-js'])
-})
-
-gulp.task('default', ['bundle-js', 'watch'])
\ No newline at end of file
diff --git a/package.json b/package.json
index dbe0790..3883d73 100644
--- a/package.json
+++ b/package.json
@@ -1,48 +1,43 @@
 {
   "name": "react-router-form",
-  "description": "",
+  "description": "<Form> is to <form> as <Link> is to <a>",
   "version": "1.0.0",
-  "main": "./lib/index.js",
+  "main": "lib/index.js",
   "standalone": "ReactRouterForm",
   "homepage": "https://github.com/insin/react-router-form",
   "license": "MIT",
   "author": "Jonny Buchanan <jonathan.buchanan@gmail.com>",
   "keywords": [
     "react",
-    "reac-router",
+    "react-router",
     "form"
   ],
   "dependencies": {
-    "get-form-data": "^1.2.1"
+    "get-form-data": "1.2.2"
   },
   "peerDependencies": {
-    "react": ">=0.13.0",
-    "react-router": ">=0.13.0"
+    "react": ">=0.14.0",
+    "react-router": ">=1.0.0-rc1"
   },
   "devDependencies": {
-    "browserify": "^9.0.7",
-    "browserify-shim": "^3.8.3",
-    "del": "^1.1.1",
-    "gulp": "^3.8.11",
-    "gulp-header": "^1.2.2",
-    "gulp-jshint": "^1.10.0",
-    "gulp-plumber": "^1.0.0",
-    "gulp-react": "^3.0.1",
-    "gulp-rename": "^1.2.2",
-    "gulp-streamify": "0.0.5",
-    "gulp-uglify": "^1.1.0",
-    "gulp-util": "^3.0.4",
-    "jshint-stylish": "^1.0.1",
-    "vinyl-source-stream": "^1.1.0"
+    "babel": "5.8.23",
+    "babel-core": "5.8.25",
+    "babel-eslint": "4.1.3",
+    "babel-loader": "5.3.2",
+    "eslint": "1.6.0",
+    "eslint-config-standard": "4.4.0",
+    "eslint-config-standard-react": "1.1.0",
+    "eslint-plugin-react": "3.5.1",
+    "eslint-plugin-standard": "1.3.1",
+    "rimraf": "2.4.3",
+    "webpack": "1.12.2"
   },
   "scripts": {
-    "debug": "gulp --debug",
-    "dist": "gulp bundle-js --production --release",
-    "watch": "gulp"
-  },
-  "browserify-shim": {
-    "react": "global:React",
-    "react-router": "global:ReactRouter"
+    "clean": "rimraf lib dist",
+    "build": "babel src --out-dir lib",
+    "build:umd": "webpack src/index.js dist/react-router-form.js && webpack src/index.js dist/react-router-form.min.js --config=webpack.prod.config.js",
+    "dist": "npm run lint && npm run clean && npm run build && npm run build:umd",
+    "lint": "eslint src"
   },
   "repository": {
     "type": "git",
diff --git a/src/index.js b/src/index.js
index 6fcd5df..89bdb88 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,8 +1,5 @@
-'use strict';
-
 var getFormData = require('get-form-data')
 var React = require('react')
-var assign = require('react/lib/Object.assign')
 
 /**
  * <Form> components are used to create a <form> element that submits its input
@@ -10,38 +7,43 @@ var assign = require('react/lib/Object.assign')
  *
  * For example, assuming you have the following route:
  *
- *   <Route name="addPost" path="/topics/:topicID/addPost" handler={AddPost}/>
+ *   <Route path="/topics/:topicID/add-post" onEnter={handleAddPost}/>
  *
  * You could use the following component to submit a form's input data to that
- * route:
+ * route as location state:
  *
- *   <Form to="addPost" params={{ topicID: "123" }}>
+ *   <Form to={`/topics/${topicID}/add-post`}>
  */
 var Form = React.createClass({
-
   displayName: 'Form',
 
   contextTypes: {
-    router: React.PropTypes.func
+    history: React.PropTypes.object
   },
 
   propTypes: {
     component: React.PropTypes.any,
-    to: React.PropTypes.string.isRequired,
-    params: React.PropTypes.object,
+    dataKey: React.PropTypes.string,
+    extractFormData: React.PropTypes.func,
+    methodKey: React.PropTypes.string,
+    onSubmit: React.PropTypes.func,
     query: React.PropTypes.object,
-    onSubmit: React.PropTypes.func
+    state: React.PropTypes.object,
+    to: React.PropTypes.string.isRequired
   },
 
   getDefaultProps() {
     return {
       component: 'form',
-      method: 'GET'
+      dataKey: 'body',
+      extractFormData: getFormData,
+      method: 'GET',
+      methodKey: 'method'
     }
   },
 
   handleSubmit(event) {
-    var formData = getFormData(event.target)
+    var formData = this.props.extractFormData(event.target)
     var allowTransition = true
     var submitResult
 
@@ -56,40 +58,38 @@ var Form = React.createClass({
     event.preventDefault()
 
     if (allowTransition) {
+      var state = this.props.state
+      var to = this.props.to
+      var query = this.props.query
       if (this.props.method === 'GET') {
-        // GET submissions use the query string, so just marge form data into it
-        this.context.router.transitionTo(
-          this.props.to,
-          this.props.params,
-          assign({}, this.props.query, formData)
-        )
+        // GET submissions use the query string, so just merge form data into it
+        query = {...query, ...formData}
       }
       else {
-        // HACK - add data to the query string along with a dummy method indicator
-        this.context.router.transitionTo(
-          this.props.to,
-          this.props.params,
-          assign({}, this.props.query, formData, {_method: this.props.method})
-        )
+        state = {
+          ...state,
+          ...{
+            [this.props.methodKey]: this.props.method,
+            [this.props.dataKey]: formData
+          }
+        }
       }
+      this.context.history.pushState(state, to, query)
     }
   },
 
-  /**
-   * Returns the value of the "action" attribute to use on the DOM element.
-   */
-  getAction() {
-    return this.context.router.makeHref(this.props.to, this.props.params, this.props.query)
-  },
-
   render() {
-    var props = assign({}, this.props, {
-      action: this.getAction(),
-      onSubmit: this.handleSubmit
-    })
+    var {component, dataKey, methodKey, onSubmit, query, state, to, ...props} = this.props
+    var {history} = this.context
+
+    props.onSubmit = this.handleSubmit
+
+    if (history) {
+      props.action = history.createHref(to, query)
+    }
 
-    return React.createElement(this.props.component, props, this.props.children)
+    return <this.props.component {...props}/>
   }
 })
 
-module.exports = Form
\ No newline at end of file
+module.exports = Form
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 0000000..292c98c
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,47 @@
+'use strict'
+
+var webpack = require('webpack')
+
+var pkg = require('./package.json')
+
+var plugins = [
+  new webpack.optimize.OccurenceOrderPlugin(),
+  new webpack.DefinePlugin({
+    'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
+  })
+]
+
+if (process.env.NODE_ENV === 'production') {
+  plugins.push(
+    new webpack.optimize.UglifyJsPlugin({
+      compressor: {
+        screw_ie8: true,
+        warnings: false
+      }
+    })
+  )
+}
+
+module.exports = {
+  module: {
+    loaders: [
+      {test: /\.js$/, loader: 'babel', exclude: /node_modules/}
+    ]
+  },
+  output: {
+    library: pkg.standalone,
+    libraryTarget: 'umd'
+  },
+  externals: [{
+    'react': {
+      root: 'React',
+      commonjs2: 'react',
+      commonjs: 'react',
+      amd: 'react'
+    }
+  }],
+  plugins: plugins,
+  resolve: {
+    extensions: ['', '.js']
+  }
+}
diff --git a/webpack.prod.config.js b/webpack.prod.config.js
new file mode 100644
index 0000000..6221aaf
--- /dev/null
+++ b/webpack.prod.config.js
@@ -0,0 +1,2 @@
+process.env.NODE_ENV = 'production'
+module.exports = require('./webpack.config')
