diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..64f4d9e
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,52 @@
+# Logs
+log
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
+node_modules
+
+# OSX
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+.AppleDouble
+.LSOverride
+Icon
+
+# Java
+*.class
+
+# Git
+.git
+
+# FilePizza
+src
+resources
+log
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..3e288c3
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM node:latest
+MAINTAINER Alex Kern <alex@pavlovml.com>
+ 
+# install
+RUN mkdir -p /filepizza
+WORKDIR /filepizza
+COPY package.json Makefile ./
+RUN make install
+COPY . ./
+
+# run
+ENV NODE_ENV production
+EXPOSE 80
+CMD ./dist/index.js
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0999223
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,40 @@
+# ==============================================================================
+# config
+
+.PHONY: all build clean install push run
+
+all: run
+
+WATCH ?= false
+TAG ?= latest
+
+# ==============================================================================
+# phony targets
+
+build:
+	./node_modules/.bin/babel src --ignore __tests__,__mocks__ --out-dir dist
+	./node_modules/.bin/webpack --optimize-minimize ./src/client
+	docker build -t kern/filepizza:$(TAG) .
+
+clean:
+	@ rm -rf node_modules
+	@ rm -rf dist
+
+install:
+	npm install
+
+push: build
+	docker push kern/filepizza:$(TAG)
+
+run: | node_modules
+	@ if [ "$(WATCH)" = false ]; then \
+		./node_modules/.bin/babel-node src; \
+	else \
+		./node_modules/.bin/nodemon ./node_modules/.bin/babel-node -i dist src; \
+	fi
+
+# ==============================================================================
+# file targets
+
+node_modules:
+	npm install
diff --git a/index.js b/index.js
deleted file mode 100755
index 8c217e3..0000000
--- a/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env node
-
-try {
-  require('./newrelic')
-  require('newrelic')
-} catch (ex) {
-  // Don't load New Relic if the configuration file doesn't exist.
-}
-
-module.exports = require('./dist/server')
diff --git a/lib/middleware/javascript.js b/lib/middleware/javascript.js
deleted file mode 100644
index 2d648ce..0000000
--- a/lib/middleware/javascript.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var path = require('path')
-
-var CLIENT_MODULE_PATH = path.resolve(__dirname, '../client.js')
-
-module.exports = function (req, res) {
-  res.sendFile(CLIENT_MODULE_PATH)
-}
diff --git a/package.json b/package.json
index ede0375..dc8fd1d 100644
--- a/package.json
+++ b/package.json
@@ -2,30 +2,43 @@
   "name": "filepizza",
   "version": "0.2.4",
   "description": "Free peer-to-peer file transfers in your browser.",
+  "preferGlobal": "true",
+  "bin": "./dist/index.js",
+  "author": "Alex Kern <alex@kern.io> (http://kern.io)",
+  "license": "BSD-3-Clause",
+  "homepage": "https://github.com/kern/filepizza",
   "scripts": {
-    "clean": "rm -rf dist && mkdir -p dist",
-    "prepublish": "npm run build:prod",
-    "build:prod": "npm run build:prod:server && npm run build:prod:client",
-    "build:prod:server": "./node_modules/.bin/babel lib -d dist",
-    "build:prod:client": "./node_modules/.bin/browserify lib/client.js -t babelify -t uglifyify | ./node_modules/.bin/uglifyjs -cm > dist/client.js",
-    "build:dev": "npm run build:dev:server && npm run build:dev:client",
-    "build:dev:server": "./node_modules/.bin/babel lib -d dist -s inline",
-    "build:dev:client": "./node_modules/.bin/browserify lib/client.js -t babelify -o dist/client.js -d",
-    "watch": "./node_modules/.bin/nodemon -w lib --exec 'npm run build:dev && npm run start'",
-    "start": "node index.js"
+    "start": "make run"
   },
   "repository": {
     "type": "git",
     "url": "git@github.com:kern/filepizza.git"
   },
-  "author": "Alex Kern <alex@kern.io> (http://kern.io)",
-  "license": "BSD-3-Clause",
   "bugs": {
     "url": "https://github.com/kern/filepizza/issues"
   },
-  "homepage": "https://github.com/kern/filepizza",
+  "engines": {
+    "node": ">= 5.0.0",
+    "npm": ">= 3.3.0"
+  },
+  "babel": {
+    "presets": [
+      "es2015",
+      "stage-0"
+    ],
+    "plugins": [
+      "add-module-exports",
+      "transform-react-jsx"
+    ]
+  },
   "dependencies": {
     "alt": "^0.14.4",
+    "babel-cli": "^6.6.5",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-plugin-transform-react-jsx": "^6.7.4",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-preset-stage-0": "^6.5.0",
     "classnames": "^1.2.0",
     "express": "^4.12.0",
     "express-force-ssl": "^0.3.0",
@@ -42,21 +55,15 @@
     "socket.io-client": "^1.3.5",
     "stylus": "^0.50.0",
     "twilio": "^2.3.0",
+    "webpack": "^1.12.14",
     "webrtcsupport": "^2.1.2",
+    "webtorrent": "^0.90.3",
     "winston": "^1.0.1",
     "xkcd-password": "^1.2.0"
   },
-  "engines": {
-    "node": "0.12.x"
-  },
-  "preferGlobal": "true",
-  "bin": "./index.js",
   "devDependencies": {
-    "babel": "^5.8.23",
-    "babelify": "^6.3.0",
-    "browserify": "^11.0.1",
+    "json-loader": "^0.5.4",
     "nodemon": "^1.4.1",
-    "uglify-js": "^2.4.24",
-    "uglifyify": "^3.0.1"
+    "webpack-dev-middleware": "^1.6.1"
   }
 }
diff --git a/assets/arrow.ai b/resources/arrow.ai
similarity index 100%
rename from assets/arrow.ai
rename to resources/arrow.ai
diff --git a/assets/pizza.psd b/resources/pizza.psd
similarity index 100%
rename from assets/pizza.psd
rename to resources/pizza.psd
diff --git a/lib/actions/DownloadActions.js b/src/actions/DownloadActions.js
similarity index 100%
rename from lib/actions/DownloadActions.js
rename to src/actions/DownloadActions.js
diff --git a/lib/actions/SupportActions.js b/src/actions/SupportActions.js
similarity index 100%
rename from lib/actions/SupportActions.js
rename to src/actions/SupportActions.js
diff --git a/lib/actions/UploadActions.js b/src/actions/UploadActions.js
similarity index 100%
rename from lib/actions/UploadActions.js
rename to src/actions/UploadActions.js
diff --git a/lib/alt.js b/src/alt.js
similarity index 100%
rename from lib/alt.js
rename to src/alt.js
diff --git a/lib/client.js b/src/client.js
similarity index 100%
rename from lib/client.js
rename to src/client.js
diff --git a/lib/components/App.js b/src/components/App.js
similarity index 97%
rename from lib/components/App.js
rename to src/components/App.js
index 213593f..ca93410 100644
--- a/lib/components/App.js
+++ b/src/components/App.js
@@ -43,7 +43,6 @@ export default class App extends React.Component {
         <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Quicksand:300,400,700|Lobster+Two" />
         <link rel="stylesheet" href="/css" />
 
-        <script src="//cdn.jsdelivr.net/webtorrent/latest/webtorrent.min.js" />
         <Bootstrap data={this.props.data} />
         <script src="/js" />
 
diff --git a/lib/components/Bootstrap.js b/src/components/Bootstrap.js
similarity index 100%
rename from lib/components/Bootstrap.js
rename to src/components/Bootstrap.js
diff --git a/lib/components/ChromeNotice.js b/src/components/ChromeNotice.js
similarity index 100%
rename from lib/components/ChromeNotice.js
rename to src/components/ChromeNotice.js
diff --git a/lib/components/DownloadButton.js b/src/components/DownloadButton.js
similarity index 100%
rename from lib/components/DownloadButton.js
rename to src/components/DownloadButton.js
diff --git a/lib/components/DownloadPage.js b/src/components/DownloadPage.js
similarity index 100%
rename from lib/components/DownloadPage.js
rename to src/components/DownloadPage.js
diff --git a/lib/components/DropZone.js b/src/components/DropZone.js
similarity index 100%
rename from lib/components/DropZone.js
rename to src/components/DropZone.js
diff --git a/lib/components/ErrorPage.js b/src/components/ErrorPage.js
similarity index 100%
rename from lib/components/ErrorPage.js
rename to src/components/ErrorPage.js
diff --git a/lib/components/ProgressBar.js b/src/components/ProgressBar.js
similarity index 100%
rename from lib/components/ProgressBar.js
rename to src/components/ProgressBar.js
diff --git a/lib/components/Spinner.js b/src/components/Spinner.js
similarity index 100%
rename from lib/components/Spinner.js
rename to src/components/Spinner.js
diff --git a/lib/components/Tempalink.js b/src/components/Tempalink.js
similarity index 100%
rename from lib/components/Tempalink.js
rename to src/components/Tempalink.js
diff --git a/lib/components/UploadPage.js b/src/components/UploadPage.js
similarity index 100%
rename from lib/components/UploadPage.js
rename to src/components/UploadPage.js
diff --git a/lib/components/Uploader.js b/src/components/Uploader.js
similarity index 100%
rename from lib/components/Uploader.js
rename to src/components/Uploader.js
diff --git a/lib/db.js b/src/db.js
similarity index 100%
rename from lib/db.js
rename to src/db.js
diff --git a/lib/ice.js b/src/ice.js
similarity index 100%
rename from lib/ice.js
rename to src/ice.js
diff --git a/src/index.js b/src/index.js
new file mode 100755
index 0000000..f4b5b74
--- /dev/null
+++ b/src/index.js
@@ -0,0 +1,24 @@
+#! /usr/bin/env node
+
+try {
+  require('../newrelic')
+  require('newrelic')
+} catch (ex) {
+  // Don't load New Relic if the configuration file doesn't exist.
+}
+
+process.on('unhandledRejection', (reason, p) => {
+  p.catch(err => {
+    console.error('Exiting due to unhandled rejection!')
+    console.error(err)
+    process.exit(1)
+  })
+})
+
+process.on('uncaughtException', err => {
+  console.error('Exiting due to uncaught exception!')
+  console.error(err.stack)
+  process.exit(1)
+})
+
+module.exports = require('./server')
diff --git a/lib/middleware/bootstrap.js b/src/middleware/bootstrap.js
similarity index 100%
rename from lib/middleware/bootstrap.js
rename to src/middleware/bootstrap.js
diff --git a/lib/middleware/css.js b/src/middleware/css.js
similarity index 100%
rename from lib/middleware/css.js
rename to src/middleware/css.js
diff --git a/lib/middleware/error.js b/src/middleware/error.js
similarity index 94%
rename from lib/middleware/error.js
rename to src/middleware/error.js
index c02ab0e..e0db264 100644
--- a/lib/middleware/error.js
+++ b/src/middleware/error.js
@@ -4,8 +4,6 @@ module.exports = function (err, req, res, next) {
   var message = err.message || ''
   var stack = process.env.NODE_ENV === 'production' ? null : err.stack || null
 
-  console.log(err)
-
   req.url = '/error'
   res.status(status)
   res.locals.data = {
diff --git a/src/middleware/javascript.js b/src/middleware/javascript.js
new file mode 100644
index 0000000..47c8d33
--- /dev/null
+++ b/src/middleware/javascript.js
@@ -0,0 +1,16 @@
+const path = require('path')
+
+const BUNDLE_PATH = path.resolve(__dirname, '../../dist/bundle.js')
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = function (req, res) {
+    res.sendFile(BUNDLE_PATH)
+  }
+} else {
+  const webpackMiddleware = require('webpack-dev-middleware')
+  const webpack = require('webpack')
+  const config = require('../../webpack.config.js')
+  config.output.filename = '/js'
+  config.output.path = '/'
+  module.exports = webpackMiddleware(webpack(config))
+}
diff --git a/lib/middleware/react.js b/src/middleware/react.js
similarity index 100%
rename from lib/middleware/react.js
rename to src/middleware/react.js
diff --git a/lib/middleware/static.js b/src/middleware/static.js
similarity index 100%
rename from lib/middleware/static.js
rename to src/middleware/static.js
diff --git a/lib/routes.js b/src/routes.js
similarity index 100%
rename from lib/routes.js
rename to src/routes.js
diff --git a/lib/server.js b/src/server.js
similarity index 86%
rename from lib/server.js
rename to src/server.js
index 67349c3..0538195 100644
--- a/lib/server.js
+++ b/src/server.js
@@ -46,6 +46,20 @@ server.on('error', function (err) {
   process.exit(1)
 })
 
+process.on('unhandledRejection', (reason, p) => {
+  p.catch(err => {
+    log.error('Exiting due to unhandled rejection!')
+    log.error(err)
+    process.exit(1)
+  })
+})
+
+process.on('uncaughtException', err => {
+  log.error('Exiting due to uncaught exception!')
+  log.error(err)
+  process.exit(1)
+})
+
 server.listen(port, function (err) {
   var host = server.address().address
   var port = server.address().port
@@ -57,9 +71,9 @@ app.use(expressWinston.logger({
   expressFormat: true
 }))
 
-if (process.env.NODE_ENV === 'production') {
-  app.use(forceSSL)
-}
+// if (process.env.NODE_ENV === 'production') {
+//   app.use(forceSSL)
+// }
 
 app.get('/js', require('./middleware/javascript'))
 app.get('/css', require('./middleware/css'))
diff --git a/lib/stores/DownloadStore.js b/src/stores/DownloadStore.js
similarity index 97%
rename from lib/stores/DownloadStore.js
rename to src/stores/DownloadStore.js
index a428c63..8790dbf 100644
--- a/lib/stores/DownloadStore.js
+++ b/src/stores/DownloadStore.js
@@ -35,7 +35,7 @@ export default alt.createStore(class DownloadStore {
     this.status = 'requesting'
 
     getClient().then((client) => {
-      client.download(this.infoHash, (torrent) => {
+      client.add(this.infoHash, (torrent) => {
         this.setState({ status: 'downloading' })
 
         const updateSpeed = () => {
diff --git a/lib/stores/ErrorStore.js b/src/stores/ErrorStore.js
similarity index 100%
rename from lib/stores/ErrorStore.js
rename to src/stores/ErrorStore.js
diff --git a/lib/stores/SupportStore.js b/src/stores/SupportStore.js
similarity index 100%
rename from lib/stores/SupportStore.js
rename to src/stores/SupportStore.js
diff --git a/lib/stores/UploadStore.js b/src/stores/UploadStore.js
similarity index 94%
rename from lib/stores/UploadStore.js
rename to src/stores/UploadStore.js
index 9372f2c..b9afe85 100644
--- a/lib/stores/UploadStore.js
+++ b/src/stores/UploadStore.js
@@ -42,7 +42,7 @@ export default alt.createStore(class UploadStore {
           fileName: file.name,
           fileSize: file.size,
           fileType: file.type,
-          infoHash: torrent.infoHash
+          infoHash: torrent.magnetURI
         }, (token) => {
           this.setState({
             status: 'uploading',
@@ -50,7 +50,7 @@ export default alt.createStore(class UploadStore {
             fileName: file.name,
             fileSize: file.size,
             fileType: file.type,
-            infoHash: torrent.infoHash
+            infoHash: torrent.magnetURI
           })
         })
 
diff --git a/lib/toppings.js b/src/toppings.js
similarity index 100%
rename from lib/toppings.js
rename to src/toppings.js
diff --git a/lib/util.js b/src/util.js
similarity index 100%
rename from lib/util.js
rename to src/util.js
diff --git a/lib/wt.js b/src/wt.js
similarity index 87%
rename from lib/wt.js
rename to src/wt.js
index c26c48b..0f7a20c 100644
--- a/lib/wt.js
+++ b/src/wt.js
@@ -1,3 +1,4 @@
+import WebTorrent from 'webtorrent'
 import socket from 'filepizza-socket'
 
 export function getClient() {
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 0000000..2f37d21
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,26 @@
+module.exports = {
+  entry: './src/client',
+  target: 'web',
+
+  output: {
+    filename: 'dist/bundle.js'
+  },
+
+  module: {
+    loaders: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        loader: 'babel-loader'
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      }
+    ]
+  },
+
+  node: {
+    fs: 'empty'
+  }
+}