diff --git a/app/components/Nav.jsx b/app/components/Nav.jsx
index 1bff690..defc73f 100644
--- a/app/components/Nav.jsx
+++ b/app/components/Nav.jsx
@@ -1,27 +1,53 @@
 var React = require('react');
 var {Link, IndexLink} = require('react-router');
 
-// var Nav = React.createClass({
-//   render: function (){
-//     return (
-//       <div>
-//         <h2>Nav Component</h2>
-//         <IndexLink to="/" activeClassName="active" activeStyle={{fontWeight: 'bold'}}> Get Weather</IndexLink>
-//         <Link to="/about" activeClassName="active" activeStyle={{fontWeight: 'bold'}}> About</Link>
-//         <Link to="/examples" activeClassName="active" activeStyle={{fontWeight: 'bold'}}> Examples</Link>
-//       </div>
-//     );
-//   }
-// });
+var Nav = React.createClass({
+  onSearch: function (e) {
+    e.preventDefault();
+    alert('Not yet wired up!');
+},
+  render: function (){
+    return (
+      <div className="top-bar">
+              <div className="top-bar-left">
+                <ul className="menu">
+                  <li className="menu-text">React Weather App</li>
+                  <li>
+                    <IndexLink to="/" activeClassName="active" activeStyle={{fontWeight: 'bold'}}>Get Weather</IndexLink>
+                  </li>
+                  <li>
+                    <Link to="/about" activeClassName="active"  activeStyle={{fontWeight: 'bold'}}>About</Link>
+                  </li>
+                  <li>
+                    <Link to="/examples" activeClassName="active" activeStyle={{fontWeight: 'bold'}}>Examples</Link>
+                  </li>
+                </ul>
+              </div>
+              <div className="top-bar-right">
+                <form onSubmit={this.onSearch}>
+                  <ul className="menu">
+                    <li>
+                      <input type="search" placeholder="Search weather"/>
+                    </li>
+                    <li>
+                      <input type="submit" className="button" value="Get Weather"/>
+                    </li>
+                  </ul>
+                </form>
+              </div>
+            </div>
+    );
+  }
+});
 
-var Nav = () => {
-  return (
-    <div>
-      <h2>Nav Component</h2>
-      <IndexLink to="/" activeClassName="active" activeStyle={{fontWeight: 'bold'}}> Get Weather</IndexLink>
-      <Link to="/about" activeClassName="active" activeStyle={{fontWeight: 'bold'}}> About</Link>
-      <Link to="/examples" activeClassName="active" activeStyle={{fontWeight: 'bold'}}> Examples</Link>
-    </div>
-  );
-};
+// var Nav = () => {
+//   return (
+//     <div>
+//       <h2>Nav Component</h2>
+//       <IndexLink to="/" activeClassName="active" activeStyle={{fontWeight: 'bold'}}> Get Weather</IndexLink>
+//       <Link to="/about" activeClassName="active" activeStyle={{fontWeight: 'bold'}}> About</Link>
+//       <Link to="/examples" activeClassName="active" activeStyle={{fontWeight: 'bold'}}> Examples</Link>
+//     </div>
+//   );
+// };
 module.exports = Nav;
diff --git a/public/bundle.js b/public/bundle.js
index 45c2767..b2ba8f1 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -1391,7 +1391,7 @@
 /* 224 */
 /***/ function(module, exports, __webpack_require__) {
 
-	eval("'use strict';\n\nvar React = __webpack_require__(8);\n\nvar _require = __webpack_require__(166),\n    Link = _require.Link,\n    IndexLink = _require.IndexLink;\n\n// var Nav = React.createClass({\n//   render: function (){\n//     return (\n//       <div>\n//         <h2>Nav Component</h2>\n//         <IndexLink to=\"/\" activeClassName=\"active\" activeStyle={{fontWeight: 'bold'}}> Get Weather</IndexLink>\n//         <Link to=\"/about\" activeClassName=\"active\" activeStyle={{fontWeight: 'bold'}}> About</Link>\n//         <Link to=\"/examples\" activeClassName=\"active\" activeStyle={{fontWeight: 'bold'}}> Examples</Link>\n//       </div>\n//     );\n//   }\n// });\n\nvar Nav = function Nav() {\n  return React.createElement(\n    'div',\n    null,\n    React.createElement(\n      'h2',\n      null,\n      'Nav Component'\n    ),\n    React.createElement(\n      IndexLink,\n      { to: '/', activeClassName: 'active', activeStyle: { fontWeight: 'bold' } },\n      ' Get Weather'\n    ),\n    React.createElement(\n      Link,\n      { to: '/about', activeClassName: 'active', activeStyle: { fontWeight: 'bold' } },\n      ' About'\n    ),\n    React.createElement(\n      Link,\n      { to: '/examples', activeClassName: 'active', activeStyle: { fontWeight: 'bold' } },\n      ' Examples'\n    )\n  );\n};\nmodule.exports = Nav;//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMjI0LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL2FwcC9jb21wb25lbnRzL05hdi5qc3g/ZWIxMyJdLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgUmVhY3QgPSByZXF1aXJlKCdyZWFjdCcpO1xyXG52YXIge0xpbmssIEluZGV4TGlua30gPSByZXF1aXJlKCdyZWFjdC1yb3V0ZXInKTtcclxuXHJcbi8vIHZhciBOYXYgPSBSZWFjdC5jcmVhdGVDbGFzcyh7XHJcbi8vICAgcmVuZGVyOiBmdW5jdGlvbiAoKXtcclxuLy8gICAgIHJldHVybiAoXHJcbi8vICAgICAgIDxkaXY+XHJcbi8vICAgICAgICAgPGgyPk5hdiBDb21wb25lbnQ8L2gyPlxyXG4vLyAgICAgICAgIDxJbmRleExpbmsgdG89XCIvXCIgYWN0aXZlQ2xhc3NOYW1lPVwiYWN0aXZlXCIgYWN0aXZlU3R5bGU9e3tmb250V2VpZ2h0OiAnYm9sZCd9fT4gR2V0IFdlYXRoZXI8L0luZGV4TGluaz5cclxuLy8gICAgICAgICA8TGluayB0bz1cIi9hYm91dFwiIGFjdGl2ZUNsYXNzTmFtZT1cImFjdGl2ZVwiIGFjdGl2ZVN0eWxlPXt7Zm9udFdlaWdodDogJ2JvbGQnfX0+IEFib3V0PC9MaW5rPlxyXG4vLyAgICAgICAgIDxMaW5rIHRvPVwiL2V4YW1wbGVzXCIgYWN0aXZlQ2xhc3NOYW1lPVwiYWN0aXZlXCIgYWN0aXZlU3R5bGU9e3tmb250V2VpZ2h0OiAnYm9sZCd9fT4gRXhhbXBsZXM8L0xpbms+XHJcbi8vICAgICAgIDwvZGl2PlxyXG4vLyAgICAgKTtcclxuLy8gICB9XHJcbi8vIH0pO1xyXG5cclxudmFyIE5hdiA9ICgpID0+IHtcclxuICByZXR1cm4gKFxyXG4gICAgPGRpdj5cclxuICAgICAgPGgyPk5hdiBDb21wb25lbnQ8L2gyPlxyXG4gICAgICA8SW5kZXhMaW5rIHRvPVwiL1wiIGFjdGl2ZUNsYXNzTmFtZT1cImFjdGl2ZVwiIGFjdGl2ZVN0eWxlPXt7Zm9udFdlaWdodDogJ2JvbGQnfX0+IEdldCBXZWF0aGVyPC9JbmRleExpbms+XHJcbiAgICAgIDxMaW5rIHRvPVwiL2Fib3V0XCIgYWN0aXZlQ2xhc3NOYW1lPVwiYWN0aXZlXCIgYWN0aXZlU3R5bGU9e3tmb250V2VpZ2h0OiAnYm9sZCd9fT4gQWJvdXQ8L0xpbms+XHJcbiAgICAgIDxMaW5rIHRvPVwiL2V4YW1wbGVzXCIgYWN0aXZlQ2xhc3NOYW1lPVwiYWN0aXZlXCIgYWN0aXZlU3R5bGU9e3tmb250V2VpZ2h0OiAnYm9sZCd9fT4gRXhhbXBsZXM8L0xpbms+XHJcbiAgICA8L2Rpdj5cclxuICApO1xyXG59O1xyXG5tb2R1bGUuZXhwb3J0cyA9IE5hdjtcclxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIGFwcC9jb21wb25lbnRzL05hdi5qc3giXSwibWFwcGluZ3MiOiI7O0FBQUE7QUFDQTtBQUFBO0FBQUE7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFBQTtBQUNBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ0E7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFKQTtBQU9BOyIsInNvdXJjZVJvb3QiOiIifQ==");
+	eval("'use strict';\n\nvar React = __webpack_require__(8);\n\nvar _require = __webpack_require__(166),\n    Link = _require.Link,\n    IndexLink = _require.IndexLink;\n\nvar Nav = React.createClass({\n  displayName: 'Nav',\n\n  onSearch: function onSearch(e) {\n    e.preventDefault();\n    alert('Not yet wired up!');\n  },\n  render: function render() {\n    return React.createElement(\n      'div',\n      { className: 'top-bar' },\n      React.createElement(\n        'div',\n        { className: 'top-bar-left' },\n        React.createElement(\n          'ul',\n          { className: 'menu' },\n          React.createElement(\n            'li',\n            { className: 'menu-text' },\n            'React Weather App'\n          ),\n          React.createElement(\n            'li',\n            null,\n            React.createElement(\n              IndexLink,\n              { to: '/', activeClassName: 'active', activeStyle: { fontWeight: 'bold' } },\n              'Get Weather'\n            )\n          ),\n          React.createElement(\n            'li',\n            null,\n            React.createElement(\n              Link,\n              { to: '/about', activeClassName: 'active', activeStyle: { fontWeight: 'bold' } },\n              'About'\n            )\n          ),\n          React.createElement(\n            'li',\n            null,\n            React.createElement(\n              Link,\n              { to: '/examples', activeClassName: 'active', activeStyle: { fontWeight: 'bold' } },\n              'Examples'\n            )\n          )\n        )\n      ),\n      React.createElement(\n        'div',\n        { className: 'top-bar-right' },\n        React.createElement(\n          'form',\n          { onSubmit: this.onSearch },\n          React.createElement(\n            'ul',\n            { className: 'menu' },\n            React.createElement(\n              'li',\n              null,\n              React.createElement('input', { type: 'search', placeholder: 'Search weather' })\n            ),\n            React.createElement(\n              'li',\n              null,\n              React.createElement('input', { type: 'submit', className: 'button', value: 'Get Weather' })\n            )\n          )\n        )\n      )\n    );\n  }\n});\n\n// var Nav = () => {\n//   return (\n//     <div>\n//       <h2>Nav Component</h2>\n//       <IndexLink to=\"/\" activeClassName=\"active\" activeStyle={{fontWeight: 'bold'}}> Get Weather</IndexLink>\n//       <Link to=\"/about\" activeClassName=\"active\" activeStyle={{fontWeight: 'bold'}}> About</Link>\n//       <Link to=\"/examples\" activeClassName=\"active\" activeStyle={{fontWeight: 'bold'}}> Examples</Link>\n//     </div>\n//   );\n// };\nmodule.exports = Nav;//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMjI0LmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vL2FwcC9jb21wb25lbnRzL05hdi5qc3g/ZWIxMyJdLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgUmVhY3QgPSByZXF1aXJlKCdyZWFjdCcpO1xyXG52YXIge0xpbmssIEluZGV4TGlua30gPSByZXF1aXJlKCdyZWFjdC1yb3V0ZXInKTtcclxuXHJcbnZhciBOYXYgPSBSZWFjdC5jcmVhdGVDbGFzcyh7XHJcbiAgb25TZWFyY2g6IGZ1bmN0aW9uIChlKSB7XHJcbiAgICBlLnByZXZlbnREZWZhdWx0KCk7XHJcbiAgICBhbGVydCgnTm90IHlldCB3aXJlZCB1cCEnKTtcclxufSxcclxuICByZW5kZXI6IGZ1bmN0aW9uICgpe1xyXG4gICAgcmV0dXJuIChcclxuICAgICAgPGRpdiBjbGFzc05hbWU9XCJ0b3AtYmFyXCI+XHJcbiAgICAgICAgICAgICAgPGRpdiBjbGFzc05hbWU9XCJ0b3AtYmFyLWxlZnRcIj5cclxuICAgICAgICAgICAgICAgIDx1bCBjbGFzc05hbWU9XCJtZW51XCI+XHJcbiAgICAgICAgICAgICAgICAgIDxsaSBjbGFzc05hbWU9XCJtZW51LXRleHRcIj5SZWFjdCBXZWF0aGVyIEFwcDwvbGk+XHJcbiAgICAgICAgICAgICAgICAgIDxsaT5cclxuICAgICAgICAgICAgICAgICAgICA8SW5kZXhMaW5rIHRvPVwiL1wiIGFjdGl2ZUNsYXNzTmFtZT1cImFjdGl2ZVwiIGFjdGl2ZVN0eWxlPXt7Zm9udFdlaWdodDogJ2JvbGQnfX0+R2V0IFdlYXRoZXI8L0luZGV4TGluaz5cclxuICAgICAgICAgICAgICAgICAgPC9saT5cclxuICAgICAgICAgICAgICAgICAgPGxpPlxyXG4gICAgICAgICAgICAgICAgICAgIDxMaW5rIHRvPVwiL2Fib3V0XCIgYWN0aXZlQ2xhc3NOYW1lPVwiYWN0aXZlXCIgIGFjdGl2ZVN0eWxlPXt7Zm9udFdlaWdodDogJ2JvbGQnfX0+QWJvdXQ8L0xpbms+XHJcbiAgICAgICAgICAgICAgICAgIDwvbGk+XHJcbiAgICAgICAgICAgICAgICAgIDxsaT5cclxuICAgICAgICAgICAgICAgICAgICA8TGluayB0bz1cIi9leGFtcGxlc1wiIGFjdGl2ZUNsYXNzTmFtZT1cImFjdGl2ZVwiIGFjdGl2ZVN0eWxlPXt7Zm9udFdlaWdodDogJ2JvbGQnfX0+RXhhbXBsZXM8L0xpbms+XHJcbiAgICAgICAgICAgICAgICAgIDwvbGk+XHJcbiAgICAgICAgICAgICAgICA8L3VsPlxyXG4gICAgICAgICAgICAgIDwvZGl2PlxyXG4gICAgICAgICAgICAgIDxkaXYgY2xhc3NOYW1lPVwidG9wLWJhci1yaWdodFwiPlxyXG4gICAgICAgICAgICAgICAgPGZvcm0gb25TdWJtaXQ9e3RoaXMub25TZWFyY2h9PlxyXG4gICAgICAgICAgICAgICAgICA8dWwgY2xhc3NOYW1lPVwibWVudVwiPlxyXG4gICAgICAgICAgICAgICAgICAgIDxsaT5cclxuICAgICAgICAgICAgICAgICAgICAgIDxpbnB1dCB0eXBlPVwic2VhcmNoXCIgcGxhY2Vob2xkZXI9XCJTZWFyY2ggd2VhdGhlclwiLz5cclxuICAgICAgICAgICAgICAgICAgICA8L2xpPlxyXG4gICAgICAgICAgICAgICAgICAgIDxsaT5cclxuICAgICAgICAgICAgICAgICAgICAgIDxpbnB1dCB0eXBlPVwic3VibWl0XCIgY2xhc3NOYW1lPVwiYnV0dG9uXCIgdmFsdWU9XCJHZXQgV2VhdGhlclwiLz5cclxuICAgICAgICAgICAgICAgICAgICA8L2xpPlxyXG4gICAgICAgICAgICAgICAgICA8L3VsPlxyXG4gICAgICAgICAgICAgICAgPC9mb3JtPlxyXG4gICAgICAgICAgICAgIDwvZGl2PlxyXG4gICAgICAgICAgICA8L2Rpdj5cclxuICAgICk7XHJcbiAgfVxyXG59KTtcclxuXHJcbi8vIHZhciBOYXYgPSAoKSA9PiB7XHJcbi8vICAgcmV0dXJuIChcclxuLy8gICAgIDxkaXY+XHJcbi8vICAgICAgIDxoMj5OYXYgQ29tcG9uZW50PC9oMj5cclxuLy8gICAgICAgPEluZGV4TGluayB0bz1cIi9cIiBhY3RpdmVDbGFzc05hbWU9XCJhY3RpdmVcIiBhY3RpdmVTdHlsZT17e2ZvbnRXZWlnaHQ6ICdib2xkJ319PiBHZXQgV2VhdGhlcjwvSW5kZXhMaW5rPlxyXG4vLyAgICAgICA8TGluayB0bz1cIi9hYm91dFwiIGFjdGl2ZUNsYXNzTmFtZT1cImFjdGl2ZVwiIGFjdGl2ZVN0eWxlPXt7Zm9udFdlaWdodDogJ2JvbGQnfX0+IEFib3V0PC9MaW5rPlxyXG4vLyAgICAgICA8TGluayB0bz1cIi9leGFtcGxlc1wiIGFjdGl2ZUNsYXNzTmFtZT1cImFjdGl2ZVwiIGFjdGl2ZVN0eWxlPXt7Zm9udFdlaWdodDogJ2JvbGQnfX0+IEV4YW1wbGVzPC9MaW5rPlxyXG4vLyAgICAgPC9kaXY+XHJcbi8vICAgKTtcclxuLy8gfTtcclxubW9kdWxlLmV4cG9ydHMgPSBOYXY7XHJcblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyBhcHAvY29tcG9uZW50cy9OYXYuanN4Il0sIm1hcHBpbmdzIjoiOztBQUFBO0FBQ0E7QUFBQTtBQUFBO0FBQUE7QUFDQTtBQUNBO0FBQUE7QUFDQTtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQUE7QUFDQTtBQUFBO0FBQUE7QUFDQTtBQUFBO0FBQUE7QUFDQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ0E7QUFBQTtBQUFBO0FBQ0E7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQURBO0FBR0E7QUFBQTtBQUFBO0FBQ0E7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQURBO0FBR0E7QUFBQTtBQUFBO0FBQ0E7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQURBO0FBUkE7QUFEQTtBQWNBO0FBQUE7QUFBQTtBQUNBO0FBQUE7QUFBQTtBQUNBO0FBQUE7QUFBQTtBQUNBO0FBQUE7QUFBQTtBQUNBO0FBREE7QUFHQTtBQUFBO0FBQUE7QUFDQTtBQURBO0FBSkE7QUFEQTtBQURBO0FBZkE7QUE2QkE7QUFwQ0E7QUFDQTtBQXNDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTsiLCJzb3VyY2VSb290IjoiIn0=");
 
 /***/ },
 /* 225 */