diff --git a/lib/serve.js b/lib/serve.js
index 0340bf8..cd2d7f5 100644
--- a/lib/serve.js
+++ b/lib/serve.js
@@ -1,5 +1,5 @@
 // Generated by CoffeeScript 1.3.3
-var filed, http, log, url;
+var filed, http, log, url, w3;
 
 http = require('http');
 
@@ -7,23 +7,13 @@ url = require('url');
 
 filed = require('filed');
 
+w3 = require('w3');
+
 log = console.log;
 
 module.exports = function(proj) {
-  var server;
   if (proj == null) {
     proj = '.';
   }
-  server = http.createServer(function(req, resp) {
-    var pathname;
-    pathname = url.parse(req.url).pathname;
-    if (pathname === '/') {
-      pathname = '/index.html';
-    }
-    return filed("" + proj + "/gen" + pathname).pipe(resp);
-  });
-  return server.listen(3000, function() {
-    log('Listening on 3000...');
-    return log('CTRL-C to exit..');
-  });
+  return w3(3000, './gen');
 };
diff --git a/package.json b/package.json
index f795f21..4db5333 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,8 @@
     "flatiron": "*",
     "jade": "*",
     "zeke": "*",
-    "zeke-markdown": "*"
+    "zeke-markdown": "*",
+    "w3": "*"
   },
   "devDependencies": {
     "mocha": "*"
diff --git a/src/serve.coffee b/src/serve.coffee
index d0b2a15..8c6ec44 100644
--- a/src/serve.coffee
+++ b/src/serve.coffee
@@ -1,13 +1,15 @@
 http = require 'http'
 url = require 'url'
 filed = require 'filed'
+w3 = require 'w3'
 log = console.log
 
 module.exports = (proj='.') ->
-  server = http.createServer (req, resp) ->
-    pathname = url.parse(req.url).pathname
-    pathname = '/index.html' if pathname == '/'
-    filed("#{proj}/gen#{pathname}").pipe(resp)
-  server.listen 3000, ->
-    log 'Listening on 3000...'
-    log 'CTRL-C to exit..'    
\ No newline at end of file
+  w3 3000, './gen'
+  # server = http.createServer (req, resp) ->
+  #   pathname = url.parse(req.url).pathname
+  #   pathname = '/index.html' if pathname == '/'
+  #   filed("#{proj}/gen#{pathname}").pipe(resp)
+  # server.listen 3000, ->
+  #   log 'Listening on 3000...'
+  #   log 'CTRL-C to exit..'    
\ No newline at end of file