diff --git a/express/express-3.1-tests.ts b/express/express-3.1-tests.ts
deleted file mode 100644
index 79f81776c7..0000000000
--- a/express/express-3.1-tests.ts
+++ /dev/null
@@ -1,1245 +0,0 @@
-/// <reference path="express-3.1.d.ts" />
-
-import express = module('express');
-var app = express();
-
-//////////////////////////
-
-var hash: any;
-
-// config
-
-app.set('view engine', 'ejs');
-app.set('views', __dirname + '/views');
-
-// middleware
-
-app.use(express.bodyParser());
-app.use(express.cookieParser('shhhh, very secret'));
-app.use(express.session());
-
-// Session-persisted message middleware
-
-app.use(function (req, res, next) {
-    var err = req.session.error
-      , msg = req.session.success;
-    delete req.session.error;
-    delete req.session.success;
-    res.locals.message = '';
-    if (err) res.locals.message = '<p class="msg error">' + err + '</p>';
-    if (msg) res.locals.message = '<p class="msg success">' + msg + '</p>';
-    next();
-});
-
-// dummy database
-
-var users = <any>{
-    tj: { name: 'tj' }
-};
-
-// when you create a user, generate a salt
-// and hash the password ('foobar' is the pass here)
-
-hash('foobar', function (err, salt, hash) {
-    if (err) throw err;
-    // store the salt & hash in the "db"
-    users.tj.salt = salt;
-    users.tj.hash = hash;
-});
-
-
-// Authenticate using our plain-object database of doom!
-
-function authenticate(name, pass, fn) {
-    if (!module.parent) console.log('authenticating %s:%s', name, pass);
-    var user = users[name];
-    // query the db for the given username
-    if (!user) return fn(new Error('cannot find user'));
-    // apply the same algorithm to the POSTed password, applying
-    // the hash against the pass / salt, if there is a match we
-    // found the user
-    hash(pass, user.salt, function (err, hash) {
-        if (err) return fn(err);
-        if (hash == user.hash) return fn(null, user);
-        fn(new Error('invalid password'));
-    })
-}
-
-function restrict(req: ExpressServerRequest, res: ExpressServerResponse, next?: Function) {
-    if (req.session.user) {
-        next();
-    } else {
-        req.session.error = 'Access denied!';
-        res.redirect('/login');
-    }
-}
-
-app.get('/', function (req, res) {
-    res.redirect('login');
-});
-
-app.get('/restricted', restrict, function (req, res) {
-    res.send('Wahoo! restricted area, click to <a href="/logout">logout</a>');
-});
-
-app.get('/logout', function (req, res) {
-    // destroy the user's session to log them out
-    // will be re-created next request
-    req.session.destroy(function () {
-        res.redirect('/');
-    });
-});
-
-app.get('/login', function (req, res) {
-    res.render('login');
-});
-
-app.post('/login', function (req, res) {
-    authenticate(req.body.username, req.body.password, function (err, user) {
-        if (user) {
-            // Regenerate session when signing in
-            // to prevent fixation 
-            req.session.regenerate(function () {
-                // Store the user's primary key 
-                // in the session store to be retrieved,
-                // or in this case the entire user object
-                req.session.user = user;
-                req.session.success = 'Authenticated as ' + user.name
-                  + ' click to <a href="/logout">logout</a>. '
-                  + ' You may now access <a href="/restricted">/restricted</a>.';
-                res.redirect('back');
-            });
-        } else {
-            req.session.error = 'Authentication failed, please check your '
-              + ' username and password.'
-              + ' (use "tj" and "foobar")';
-            res.redirect('login');
-        }
-    });
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express started on port 3000');
-}
-
-//////////////
-
-app.set('views', __dirname);
-app.set('view engine', 'jade');
-
-var pets = [];
-
-var n = 1000;
-while (n--) {
-    pets.push({ name: 'Tobi', age: 2, species: 'ferret' });
-    pets.push({ name: 'Loki', age: 1, species: 'ferret' });
-    pets.push({ name: 'Jane', age: 6, species: 'ferret' });
-}
-
-app.use(express.logger('dev'));
-
-app.get('/', function (req, res) {
-    res.render('pets', { pets: pets });
-});
-
-app.listen(3000);
-console.log('Express listening on port 3000');
-
-/////////////
-
-app.get('/', function (req, res) {
-    res.format({
-        html: function () {
-            res.send('<ul>' + users.map(function (user) {
-                return '<li>' + user.name + '</li>';
-            }).join('') + '</ul>');
-        },
-
-        text: function () {
-            res.send(users.map(function (user) {
-                return ' - ' + user.name + '\n';
-            }).join(''));
-        },
-
-        json: function () {
-            res.json(users);
-        }
-    })
-});
-
-// or you could write a tiny middleware like
-// this to abstract make things a bit more declarative:
-
-function format(mod) {
-    var obj = require(mod);
-    return function (req, res) {
-        res.format(obj);
-    }
-}
-
-app.get('/users', format('./users'));
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('listening on port 3000');
-}
-
-/////////////////////////
-
-// add favicon() before logger() so
-// GET /favicon.ico requests are not
-// logged, because this middleware
-// reponds to /favicon.ico and does not
-// call next()
-app.use(express.favicon());
-
-// custom log format
-if ('test' != process.env.NODE_ENV)
-    app.use(express.logger(':method :url'));
-
-// parses request cookies, populating
-// req.cookies and req.signedCookies
-// when the secret is passed, used 
-// for signing the cookies.
-app.use(express.cookieParser('my secret here'));
-
-// parses json, x-www-form-urlencoded, and multipart/form-data
-app.use(express.bodyParser());
-
-app.get('/', function (req, res) {
-    if (req.cookies.remember) {
-        res.send('Remembered :). Click to <a href="/forget">forget</a>!.');
-    } else {
-        res.send('<form method="post"><p>Check to <label>'
-          + '<input type="checkbox" name="remember"/> remember me</label> '
-          + '<input type="submit" value="Submit"/>.</p></form>');
-    }
-});
-
-app.get('/forget', function (req, res) {
-    res.clearCookie('remember');
-    res.redirect('back');
-});
-
-app.post('/', function (req, res) {
-    var minute = 60000;
-    if (req.body.remember) res.cookie('remember', 1, { maxAge: minute });
-    res.redirect('back');
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express started on port 3000');
-}
-
-///////////////////
-
-// ignore GET /favicon.ico
-app.use(express.favicon());
-
-// pass a secret to cookieParser() for signed cookies
-app.use(express.cookieParser('manny is cool'));
-
-// add req.session cookie support
-app.use(express.cookieSession());
-
-// do something with the session
-app.use(count);
-
-// custom middleware
-function count(req, res) {
-    req.session.count = req.session.count || 0;
-    var n = req.session.count++;
-    res.send('viewed ' + n + ' times\n');
-}
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express server listening on port 3000');
-}
-
-///////////////
-
-var api = app;
-
-app.use(express.static(__dirname + '/public'));
-
-// api middleware
-
-api.use(express.logger('dev'));
-api.use(express.bodyParser());
-
-/**
- * CORS support.
- */
-
-api.all('*', function (req, res, next) {
-    if (!req.get('Origin')) return next();
-    // use "*" here to accept any origin
-    res.set('Access-Control-Allow-Origin', 'http://localhost:3000');
-    res.set('Access-Control-Allow-Methods', 'GET, POST');
-    res.set('Access-Control-Allow-Headers', 'X-Requested-With, Content-Type');
-    // res.set('Access-Control-Allow-Max-Age', 3600);
-    if ('OPTIONS' == req.method) return res.send(200);
-    next();
-});
-
-/**
- * POST a user.
- */
-
-api.post('/user', function (req, res) {
-    console.log(req.body);
-    res.send(201);
-});
-
-app.listen(3000);
-api.listen(3001);
-
-console.log('app listening on 3000');
-console.log('api listening on 3001');
-
-////////////////////
-
-app.get('/', function (req, res) {
-    res.send('<ul>'
-      + '<li>Download <a href="/files/amazing.txt">amazing.txt</a>.</li>'
-      + '<li>Download <a href="/files/missing.txt">missing.txt</a>.</li>'
-      + '</ul>');
-});
-
-// /files/* is accessed via req.params[0]
-// but here we name it :file
-app.get('/files/:file(*)', function (req, res, next?) {
-    var file = req.params.file
-      , path = __dirname + '/files/' + file;
-
-    res.download(path);
-});
-
-// error handling middleware. Because it's
-// below our routes, you will be able to
-// "intercept" errors, otherwise Connect
-// will respond with 500 "Internal Server Error".
-app.use(function (err, req, res, next) {
-    // special-case 404s,
-    // remember you could
-    // render a 404 template here
-    if (404 == err.status) {
-        res.statusCode = 404;
-        res.send('Cant find that file, sorry!');
-    } else {
-        next(err);
-    }
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express started on port 3000');
-}
-
-///////////////////
-
-// Register ejs as .html. If we did
-// not call this, we would need to
-// name our views foo.ejs instead
-// of foo.html. The __express method
-// is simply a function that engines
-// use to hook into the Express view
-// system by default, so if we want
-// to change "foo.ejs" to "foo.html"
-// we simply pass _any_ function, in this
-// case `ejs.__express`.
-
-app.engine('.html', require('ejs').__express);
-
-// Optional since express defaults to CWD/views
-
-app.set('views', __dirname + '/views');
-
-// Without this you would need to
-// supply the extension to res.render()
-// ex: res.render('users.html').
-app.set('view engine', 'html');
-
-app.get('/', function (req, res) {
-    res.render('users', {
-        users: users,
-        title: "EJS example",
-        header: "Some users"
-    });
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express app started on port 3000');
-}
-
-////////////////////
-
-var test: any;
-
-if (!test) app.use(express.logger('dev'));
-app.use(app.router);
-
-// the error handler is strategically
-// placed *below* the app.router; if it
-// were above it would not receive errors
-// from app.get() etc 
-app.use(error);
-
-// error handling middleware have an arity of 4
-// instead of the typical (req, res, next),
-// otherwise they behave exactly like regular
-// middleware, you may have several of them,
-// in different orders etc.
-
-function error(err, req, res, next) {
-    // log it
-    if (!test) console.error(err.stack);
-
-    // respond with 500 "Internal Server Error".
-    res.send(500);
-}
-
-app.get('/', function (req, res) {
-    // Caught and passed down to the errorHandler middleware
-    throw new Error('something broke!');
-});
-
-app.get('/next', function (req, res, next) {
-    // We can also pass exceptions to next()
-    process.nextTick(function () {
-        next(new Error('oh no!'));
-    });
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express started on port 3000');
-}
-
-/////////////////////
-
-var silent: any;
-
-// general config
-app.set('views', __dirname + '/views');
-app.set('view engine', 'jade');
-
-// our custom "verbose errors" setting
-// which we can use in the templates
-// via settings['verbose errors']
-app.enable('verbose errors');
-
-// disable them in production
-// use $ NODE_ENV=production node examples/error-pages
-if ('production' == app.settings.env) {
-    app.disable('verbose errors');
-}
-
-app.use(express.favicon());
-
-silent || app.use(express.logger('dev'));
-
-// "app.router" positions our routes 
-// above the middleware defined below,
-// this means that Express will attempt
-// to match & call routes _before_ continuing
-// on, at which point we assume it's a 404 because
-// no route has handled the request.
-
-app.use(app.router);
-
-// Since this is the last non-error-handling
-// middleware use()d, we assume 404, as nothing else
-// responded.
-
-// $ curl http://localhost:3000/notfound
-// $ curl http://localhost:3000/notfound -H "Accept: application/json"
-// $ curl http://localhost:3000/notfound -H "Accept: text/plain"
-
-app.use(function (req, res, next) {
-    res.status(404);
-
-    // respond with html page
-    if (req.accepts('html')) {
-        res.render('404', { url: req.url });
-        return;
-    }
-
-    // respond with json
-    if (req.accepts('json')) {
-        res.send({ error: 'Not found' });
-        return;
-    }
-
-    // default to plain-text. send()
-    res.type('txt').send('Not found');
-});
-
-// error-handling middleware, take the same form
-// as regular middleware, however they require an
-// arity of 4, aka the signature (err, req, res, next).
-// when connect has an error, it will invoke ONLY error-handling
-// middleware.
-
-// If we were to next() here any remaining non-error-handling
-// middleware would then be executed, or if we next(err) to
-// continue passing the error, only error-handling middleware
-// would remain being executed, however here
-// we simply respond with an error page.
-
-app.use(function (err, req, res, next) {
-    // we may use properties of the error object
-    // here and next(err) appropriately, or if
-    // we possibly recovered from the error, simply next().
-    res.status(err.status || 500);
-    res.render('500', { error: err });
-});
-
-// Routes
-
-app.get('/', function (req, res) {
-    res.render('index.jade');
-});
-
-app.get('/404', function (req, res, next) {
-    // trigger a 404 since no other middleware
-    // will match /404 after this one, and we're not
-    // responding here
-    next();
-});
-
-app.get('/403', function (req, res, next) {
-    // trigger a 403 error
-    var err = <any>new Error('not allowed!');
-    err.status = 403;
-    next(err);
-});
-
-app.get('/500', function (req, res, next) {
-    // trigger a generic (500) error
-    next(new Error('keyboard cat!'));
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    //silent ||  console.log('Express started on port 3000');
-}
-
-///////////////
-
-var fs: any;
-var md: any;
-
-app.set('view engine', 'jade');
-app.set('views', __dirname + '/views');
-
-function User(name) {
-    this.private = 'heyyyy';
-    this.secret = 'something';
-    this.name = name;
-    this.id = 123;
-}
-
-// You'll probably want to do
-// something like this so you
-// dont expose "secret" data.
-
-User.prototype.toJSON = function () {
-    return {
-        id: this.id,
-        name: this.name
-    }
-};
-
-app.use(express.logger('dev'));
-
-// earlier on expose an object
-// that we can tack properties on.
-// all res.locals props are exposed
-// to the templates, so "expose" will
-// be present.
-
-app.use(function (req, res, next) {
-    res.locals.expose = {};
-    // you could alias this as req or res.expose
-    // to make it shorter and less annoying
-    next();
-});
-
-// pretend we loaded a user
-
-app.use(function (req, res, next) {
-    req.user = new User('Tobi');
-    next();
-});
-
-app.get('/', function (req, res) {
-    res.redirect('/user');
-});
-
-app.get('/user', function (req, res) {
-    // we only want to expose the user
-    // to the client for this route:
-    res.locals.expose.user = req.user;
-    res.render('page');
-});
-
-app.listen(3000);
-console.log('app listening on port 3000');
-
-///////////////////////
-
-app.get('/', function (req, res) {
-    res.send('Hello World');
-});
-
-app.listen(3000);
-console.log('Express started on port 3000');
-
-////////////////////
-
-// register .md as an engine in express view system
-
-app.engine('md', function (path, options, fn) {
-    fs.readFile(path, 'utf8', function (err, str) {
-        if (err) return fn(err);
-        try {
-            var html = md(str);
-            html = html.replace(/\{([^}]+)\}/g, function (_, name) {
-                return options[name] || '';
-            })
-            fn(null, html);
-        } catch (err) {
-            fn(err);
-        }
-    });
-})
-
-app.set('views', __dirname + '/views');
-
-// make it the default so we dont need .md
-app.set('view engine', 'md');
-
-app.get('/', function (req, res) {
-    res.render('index', { title: 'Markdown Example' });
-})
-
-app.get('/fail', function (req, res) {
-    res.render('missing', { title: 'Markdown Example' });
-})
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express started on port 3000');
-}
-
-///////////////////////
-
-var mformat: any;
-
-// bodyParser in connect 2.x uses node-formidable to parse 
-// the multipart form data.
-app.use(express.bodyParser())
-
-app.get('/', function (req, res) {
-    res.send('<form method="post" enctype="multipart/form-data">'
-      + '<p>Title: <input type="text" name="title" /></p>'
-      + '<p>Image: <input type="file" name="image" /></p>'
-      + '<p><input type="submit" value="Upload" /></p>'
-      + '</form>');
-});
-
-app.post('/', function (req, res, next) {
-    // the uploaded file can be found as `req.files.image` and the
-    // title field as `req.body.title`
-    res.send(mformat('\nuploaded %s (%d Kb) to %s as %s'
-      , req.files.image.name
-      , req.files.image.size / 1024 | 0
-      , req.files.image.path
-      , req.body.title));
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express started on port 3000');
-}
-
-//////////////////
-
-
-// first:
-// $ npm install redis online
-// $ redis-server
-
-/**
- * Module dependencies.
- */
-
-var online: any;
-var redis: any;
-var db: any;
-
-// online
-
-online = online(db);
-
-// activity tracking, in this case using
-// the UA string, you would use req.user.id etc
-
-app.use(function (req, res, next) {
-    // fire-and-forget
-    online.add(req.headers['user-agent']);
-    next();
-});
-
-/**
- * List helper.
- */
-
-function list(ids) {
-    return '<ul>' + ids.map(function (id) {
-        return '<li>' + id + '</li>';
-    }).join('') + '</ul>';
-}
-
-/**
- * GET users online.
- */
-
-app.get('/', function (req, res, next) {
-    online.last(5, function (err, ids) {
-        if (err) return next(err);
-        res.send('<p>Users online: ' + ids.length + '</p>' + list(ids));
-    });
-});
-
-app.listen(3000);
-console.log('listening on port 3000');
-
-///////////////////
-
-// Convert :to and :from to integers
-
-app.param(['to', 'from'], function (req, res, next, num, name) {
-    req.params[name] = num = parseInt(num, 10);
-    if (isNaN(num)) {
-        next(new Error('failed to parseInt ' + num));
-    } else {
-        next();
-    }
-});
-
-// Load user by id
-
-app.param('user', function (req, res, next, id) {
-    if (req.user = users[id]) {
-        next();
-    } else {
-        next(new Error('failed to find user'));
-    }
-});
-
-/**
- * GET index.
- */
-
-app.get('/', function (req, res) {
-    res.send('Visit /user/0 or /users/0-2');
-});
-
-/**
- * GET :user.
- */
-
-app.get('/user/:user', function (req, res, next) {
-    res.send('user ' + req.user.name);
-});
-
-/**
- * GET users :from - :to.
- */
-
-app.get('/users/:from-:to', function (req, res, next) {
-    var from = req.params.from
-      , to = req.params.to
-      , names = users.map(function (user) { return user.name; });
-    res.send('users ' + names.slice(from, to).join(', '));
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express started on port 3000');
-}
-
-//////////////////
-
-// Ad-hoc example resource method
-
-app.resource = function (path, obj) {
-    this.get(path, obj.index);
-    this.get(path + '/:a..:b.:format?', function (req, res) {
-        var a = parseInt(req.params.a, 10)
-          , b = parseInt(req.params.b, 10)
-          , format = req.params.format;
-        obj.range(req, res, a, b, format);
-    });
-    this.get(path + '/:id', obj.show);
-    this.del(path + '/:id', obj.destroy);
-};
-
-// Fake controller.
-
-var FUser = {
-    index: function (req, res) {
-        res.send(users);
-    },
-    show: function (req, res) {
-        res.send(users[req.params.id] || { error: 'Cannot find user' });
-    },
-    destroy: function (req, res) {
-        var id = req.params.id;
-        var destroyed = id in users;
-        delete users[id];
-        res.send(destroyed ? 'destroyed' : 'Cannot find user');
-    },
-    range: function (req, res, a, b, format) {
-        var range = users.slice(a, b + 1);
-        switch (format) {
-            case 'json':
-                res.send(range);
-                break;
-            case 'html':
-            default:
-                var html = '<ul>' + range.map(function (user) {
-                    return '<li>' + user.name + '</li>';
-                }).join('\n') + '</ul>';
-                res.send(html);
-                break;
-        }
-    }
-};
-
-// curl http://localhost:3000/users     -- responds with all users
-// curl http://localhost:3000/users/1   -- responds with user 1
-// curl http://localhost:3000/users/4   -- responds with error
-// curl http://localhost:3000/users/1..3 -- responds with several users
-// curl -X DELETE http://localhost:3000/users/1  -- deletes the user
-
-app.resource('/users', FUser);
-
-app.get('/', function (req, res) {
-    res.send([
-        '<h1>Examples:</h1> <ul>'
-      , '<li>GET /users</li>'
-      , '<li>GET /users/1</li>'
-      , '<li>GET /users/3</li>'
-      , '<li>GET /users/1..3</li>'
-      , '<li>GET /users/1..3.json</li>'
-      , '<li>DELETE /users/4</li>'
-      , '</ul>'
-    ].join('\n'));
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express started on port 3000');
-}
-
-/////////////////////
-
-
-var verbose: any;
-
-app.map = function (a, route) {
-    route = route || '';
-    for (var key in a) {
-        switch (typeof a[key]) {
-            // { '/path': { ... }}
-            case 'object':
-                app.map(a[key], route + key);
-                break;
-            // get: function(){ ... }
-            case 'function':
-                if (verbose) console.log('%s %s', key, route);
-                app[key](route, a[key]);
-                break;
-        }
-    }
-};
-
-var users2 = {
-    list: function (req, res) {
-        res.send('user list');
-    },
-
-    get: function (req, res) {
-        res.send('user ' + req.params.uid);
-    },
-
-    del: function (req, res) {
-        res.send('delete users');
-    }
-};
-
-var pets2 = {
-    list: function (req, res) {
-        res.send('user ' + req.params.uid + '\'s pets');
-    },
-
-    del: function (req, res) {
-        res.send('delete ' + req.params.uid + '\'s pet ' + req.params.pid);
-    }
-};
-
-app.map({
-    '/users': {
-        get: users2.list,
-        del: users2.del,
-        '/:uid': {
-            get: users.get ,
-            '/pets': {
-                get: pets2.list,
-                '/:pid': {
-                    del: pets2.del
-                }
-            }
-        }
-    }
-});
-
-app.listen(3000);
-
-///////////////////////////
-
-// Example requests:
-//     curl http://localhost:3000/user/0
-//     curl http://localhost:3000/user/0/edit
-//     curl http://localhost:3000/user/1
-//     curl http://localhost:3000/user/1/edit (unauthorized since this is not you)
-//     curl -X DELETE http://localhost:3000/user/0 (unauthorized since you are not an admin)
-
-function loadUser(req, res, next) {
-    // You would fetch your user from the db
-    var user = users[req.params.id];
-    if (user) {
-        req.user = user;
-        next();
-    } else {
-        next(new Error('Failed to load user ' + req.params.id));
-    }
-}
-
-function andRestrictToSelf(req, res, next) {
-    // If our authenticated user is the user we are viewing
-    // then everything is fine :)
-    if (req.authenticatedUser.id == req.user.id) {
-        next();
-    } else {
-        // You may want to implement specific exceptions
-        // such as UnauthorizedError or similar so that you
-        // can handle these can be special-cased in an error handler
-        // (view ./examples/pages for this)
-        next(new Error('Unauthorized'));
-    }
-}
-
-function andRestrictTo(role) {
-    return function (req, res, next) {
-        if (req.authenticatedUser.role == role) {
-            next();
-        } else {
-            next(new Error('Unauthorized'));
-        }
-    }
-}
-
-// Middleware for faux authentication
-// you would of course implement something real,
-// but this illustrates how an authenticated user
-// may interact with middleware
-
-app.use(function (req, res, next) {
-    req.authenticatedUser = users[0];
-    next();
-});
-
-app.get('/', function (req, res) {
-    res.redirect('/user/0');
-});
-
-app.get('/user/:id', loadUser, function (req, res) {
-    res.send('Viewing user ' + req.user.name);
-});
-
-app.get('/user/:id/edit', loadUser, andRestrictToSelf, function (req, res) {
-    res.send('Editing user ' + req.user.name);
-});
-
-app.del('/user/:id', loadUser, andRestrictTo('admin'), function (req, res) {
-    res.send('Deleted user ' + req.user.name);
-});
-
-app.listen(3000);
-console.log('Express app started on port 3000');
-
-/////////////////////////
-
-app.set('view engine', 'jade');
-app.set('views', __dirname);
-
-// populate search
-
-db.sadd('ferret', 'tobi');
-db.sadd('ferret', 'loki');
-db.sadd('ferret', 'jane');
-db.sadd('cat', 'manny');
-db.sadd('cat', 'luna');
-
-/**
- * GET the search page.
- */
-
-app.get('/', function (req, res) {
-    res.render('search');
-});
-
-/**
- * GET search for :query.
- */
-
-app.get('/search/:query?', function (req, res) {
-    var query = req.params.query;
-    db.smembers(query, function (err, vals) {
-        if (err) return res.send(500);
-        res.send(vals);
-    });
-});
-
-/**
- * GET client javascript. Here we use sendfile()
- * because serving __dirname with the static() middleware
- * would also mean serving our server "index.js" and the "search.jade"
- * template.
- */
-
-app.get('/client.js', function (req, res) {
-    res.sendfile(__dirname + '/client.js');
-});
-
-app.listen(3000);
-console.log('app listening on port 3000');
-
-///////////////////
-
-app.use(express.logger('dev'));
-
-// Required by session() middleware
-// pass the secret for signed cookies
-// (required by session())
-app.use(express.cookieParser('keyboard cat'));
-
-// Populates req.session
-app.use(express.session());
-
-app.get('/', function (req, res) {
-    var body = '';
-    if (req.session.views) {
-        ++req.session.views;
-    } else {
-        req.session.views = 1;
-        body += '<p>First time visiting? view this page in several browsers :)</p>';
-    }
-    res.send(body + '<p>viewed <strong>' + req.session.views + '</strong> times.</p>');
-});
-
-app.listen(3000);
-console.log('Express app started on port 3000');
-
-////////////////////////
-
-// log requests
-app.use(express.logger('dev'));
-
-// express on its own has no notion
-// of a "file". The express.static()
-// middleware checks for a file matching
-// the `req.path` within the directory
-// that you pass it. In this case "GET /js/app.js"
-// will look for "./public/js/app.js".
-
-app.use(express.static(__dirname + '/public'));
-
-// if you wanted to "prefix" you may use
-// the mounting feature of Connect, for example
-// "GET /static/js/app.js" instead of "GET /js/app.js".
-// The mount-path "/static" is simply removed before
-// passing control to the express.static() middleware,
-// thus it serves the file correctly by ignoring "/static"
-app.use('/static', express.static(__dirname + '/public'));
-
-// if for some reason you want to serve files from
-// several directories, you can use express.static()
-// multiple times! Here we're passing "./public/css",
-// this will allow "GET /style.css" instead of "GET /css/style.css":
-app.use(express.static(__dirname + '/public/css'));
-
-// this examples does not have any routes, however
-// you may `app.use(app.router)` before or after these
-// static() middleware. If placed before them your routes
-// will be matched BEFORE file serving takes place. If placed
-// after as shown here then file serving is performed BEFORE
-// any routes are hit:
-app.use(app.router);
-
-app.listen(3000);
-console.log('listening on port 3000');
-console.log('try:');
-console.log('  GET /hello.txt');
-console.log('  GET /js/app.js');
-console.log('  GET /css/style.css');
-
-//////////////////
-
-/*
-edit /etc/vhosts:
-
-127.0.0.1       foo.example.com
-127.0.0.1       bar.example.com
-127.0.0.1       example.com
-*/
-
-// Main app
-
-var main = express();
-
-main.use(express.logger('dev'));
-
-main.get('/', function (req, res) {
-    res.send('Hello from main app!')
-});
-
-main.get('/:sub', function (req, res) {
-    res.send('requsted ' + req.params.sub);
-});
-
-// Redirect app
-
-var redirect = express();
-
-redirect.all('*', function (req, res) {
-    console.log(req.subdomains);
-    res.redirect('http://example.com:3000/' + req.subdomains[0]);
-});
-
-app.use(express.vhost('*.example.com', redirect))
-app.use(express.vhost('example.com', main));
-
-app.listen(3000);
-console.log('Express app started on port 3000');
-
-////////////////////
-
-// create an error with .status. we
-// can then use the property in our
-// custom error handler (Connect repects this prop as well)
-
-function merror(status, msg) {
-    var err = <any>new Error(msg);
-    err.status = status;
-    return err;
-}
-
-// if we wanted to supply more than JSON, we could
-// use something similar to the content-negotiation
-// example.
-
-// here we validate the API key,
-// by mounting this middleware to /api
-// meaning only paths prefixed with "/api"
-// will cause this middleware to be invoked
-
-app.use('/api', function (req, res, next) {
-    var key = req.query['api-key'];
-
-    // key isnt present
-    if (!key) return next(merror(400, 'api key required'));
-
-    // key is invalid
-    if (!~apiKeys.indexOf(key)) return next(merror(401, 'invalid api key'));
-
-    // all good, store req.key for route access
-    req.key = key;
-    next();
-});
-
-// position our routes above the error handling middleware,
-// and below our API middleware, since we want the API validation
-// to take place BEFORE our routes
-app.use(app.router);
-
-// middleware with an arity of 4 are considered
-// error handling middleware. When you next(err)
-// it will be passed through the defined middleware
-// in order, but ONLY those with an arity of 4, ignoring
-// regular middleware.
-app.use(function (err, req, res, next) {
-    // whatever you want here, feel free to populate
-    // properties on `err` to treat it differently in here.
-    res.send(err.status || 500, { error: err.message });
-});
-
-// our custom JSON 404 middleware. Since it's placed last
-// it will be the last middleware called, if all others
-// invoke next() and do not respond.
-app.use(function (req, res) {
-    res.send(404, { error: "Lame, can't find that" });
-});
-
-// map of valid api keys, typically mapped to
-// account info with some sort of database like redis.
-// api keys do _not_ serve as authentication, merely to
-// track API usage or help prevent malicious behavior etc.
-
-var apiKeys = ['foo', 'bar', 'baz'];
-
-// these two objects will serve as our faux database
-
-var repos = [
-    { name: 'express', url: 'http://github.com/visionmedia/express' }
-  , { name: 'stylus', url: 'http://github.com/learnboost/stylus' }
-  , { name: 'cluster', url: 'http://github.com/learnboost/cluster' }
-];
-
-var userRepos = {
-    tobi: [repos[0], repos[1]]
-  , loki: [repos[1]]
-  , jane: [repos[2]]
-};
-
-// we now can assume the api key is valid,
-// and simply expose the data
-
-app.get('/api/users', function (req, res, next) {
-    res.send(users);
-});
-
-app.get('/api/repos', function (req, res, next) {
-    res.send(repos);
-});
-
-app.get('/api/user/:name/repos', function (req, res, next) {
-    var name = req.params.name
-      , user = userRepos[name];
-
-    if (user) res.send(user);
-    else next();
-});
-
-if (!module.parent) {
-    app.listen(3000);
-    console.log('Express server listening on port 3000');
-}
\ No newline at end of file
diff --git a/express/express-3.1.d.ts b/express/express-3.1.d.ts
deleted file mode 100644
index ffdfdfca60..0000000000
--- a/express/express-3.1.d.ts
+++ /dev/null
@@ -1,1920 +0,0 @@
-// Type definitions for Express 3.1
-// Project: http://expressjs.com
-// Definitions by: Diullei Gomes <https://github.com/diullei>
-// DefinitelyTyped: https://github.com/borisyankov/DefinitelyTyped
-
-/* =================== USAGE =================== 
-
-    import express = module('express');
-    var app = express();
-
- =============================================== */
-
-/// <reference path="../node/node.d.ts" />
-
-interface Route {
-    path: string;
-
-    method: string;
-
-    callbacks: Function[];
-
-    regexp: any;
-
-    /**
-    * Check if this route matches `path`, if so
-    * populate `.params`.
-    */
-    match(path: string): bool;
-}
-declare var Route: {
-    /**
-     * Initialize `Route` with the given HTTP `method`, `path`,
-     * and an array of `callbacks` and `options`.
-     *
-     * Options:
-     *
-     *   - `sensitive`    enable case-sensitive routes
-     *   - `strict`       enable strict matching for trailing slashes
-     *
-     * @param method
-     * @param path
-     * @param callbacks
-     * @param options
-     */
-    new (method: string, path: string, callbacks: Function[], options: any): Route;
-}
-
-interface Handler {
-    (req: ExpressServerRequest, res: ExpressServerResponse, next?: Function): void;
-}
-
-interface CookieOptions {
-    maxAge?: number;
-    signed?: bool;
-    expires?: Date;
-    httpOnly?: bool;
-    path?: string;
-    domain?: string;
-    secure?: bool;
-}
-
-interface Errback { (err: Error): void; }
-
-
-interface ExpressSession {
-    /**
-     * Update reset `.cookie.maxAge` to prevent
-     * the cookie from expiring when the
-     * session is still active.
-     *
-     * @return {Session} for chaining
-     * @api public
-     */
-    touch(): ExpressSession;
-
-    /**
-     * Reset `.maxAge` to `.originalMaxAge`.
-     */
-    resetMaxAge(): ExpressSession;
-
-    /**
-     * Save the session data with optional callback `fn(err)`.
-     */
-    save(fn: Function): ExpressSession;
-
-    /**
-     * Re-loads the session data _without_ altering
-     * the maxAge properties. Invokes the callback `fn(err)`,
-     * after which time if no exception has occurred the
-     * `req.session` property will be a new `Session` object,
-     * although representing the same session.
-     */
-    reload(fn: Function): ExpressSession;
-
-    /**
-     * Destroy `this` session.
-     */
-    destroy(fn: Function): ExpressSession;
-
-    /**
-     * Regenerate this request's session.
-     */
-    regenerate(fn: Function): ExpressSession;
-
-    user: any;
-
-    error: string;
-
-    success: string;
-
-    views: any;
-}
-declare var ExpressSession: {
-    /**
-     * Create a new `Session` with the given request and `data`.
-     */
-    new (req: ExpressServerRequest, data: any): ExpressSession;
-}
-
-interface ExpressServerRequest {
-
-    session: ExpressSession;
-
-    /**
-     * Return request header.
-     *
-     * The `Referrer` header field is special-cased,
-     * both `Referrer` and `Referer` are interchangeable.
-     *
-     * Examples:
-     *
-     *     req.get('Content-Type');
-     *     // => "text/plain"
-     *
-     *     req.get('content-type');
-     *     // => "text/plain"
-     *
-     *     req.get('Something');
-     *     // => undefined
-     *
-     * Aliased as `req.header()`.
-     *
-     * @param name
-     */
-    get (name: string): string;
-
-    header(name: string): string;
-
-    /**
-     * Check if the given `type(s)` is acceptable, returning
-     * the best match when true, otherwise `undefined`, in which
-     * case you should respond with 406 "Not Acceptable".
-     *
-     * The `type` value may be a single mime type string
-     * such as "application/json", the extension name
-     * such as "json", a comma-delimted list such as "json, html, text/plain",
-     * or an array `["json", "html", "text/plain"]`. When a list
-     * or array is given the _best_ match, if any is returned.
-     *
-     * Examples:
-     *
-     *     // Accept: text/html
-     *     req.accepts('html');
-     *     // => "html"
-     *
-     *     // Accept: text/*, application/json
-     *     req.accepts('html');
-     *     // => "html"
-     *     req.accepts('text/html');
-     *     // => "text/html"
-     *     req.accepts('json, text');
-     *     // => "json"
-     *     req.accepts('application/json');
-     *     // => "application/json"
-     *
-     *     // Accept: text/*, application/json
-     *     req.accepts('image/png');
-     *     req.accepts('png');
-     *     // => undefined
-     *
-     *     // Accept: text/*;q=.5, application/json
-     *     req.accepts(['html', 'json']);
-     *     req.accepts('html, json');
-     *     // => "json"
-     */
-    accepts(type: string): string;
-
-    accepts(type: string[]): string;
-
-    /**
-     * Check if the given `charset` is acceptable,
-     * otherwise you should respond with 406 "Not Acceptable".
-     *
-     * @param charset
-     */
-    acceptsCharset(charset: string): bool;
-
-    /**
-     * Check if the given `lang` is acceptable,
-     * otherwise you should respond with 406 "Not Acceptable".
-     *
-     * @param lang
-     */
-    acceptsLanguage(lang: string): bool;
-
-    /**
-     * Parse Range header field,
-     * capping to the given `size`.
-     *
-     * Unspecified ranges such as "0-" require
-     * knowledge of your resource length. In
-     * the case of a byte range this is of course
-     * the total number of bytes. If the Range
-     * header field is not given `null` is returned,
-     * `-1` when unsatisfiable, `-2` when syntactically invalid.
-     *
-     * NOTE: remember that ranges are inclusive, so
-     * for example "Range: users=0-3" should respond
-     * with 4 users when available, not 3.
-     *
-     * @param size
-     */
-    range(size: number): Array;
-
-    /**
-     * Return an array of Accepted media types
-     * ordered from highest quality to lowest.
-     *
-     * Examples:
-     *
-     *     [ { value: 'application/json',
-     *         quality: 1,
-     *         type: 'application',
-     *         subtype: 'json' },
-     *       { value: 'text/html',
-     *         quality: 0.5,
-     *         type: 'text',
-     *         subtype: 'html' } ]
-     */
-    accepted: Array;
-
-    /**
-     * Return an array of Accepted languages
-     * ordered from highest quality to lowest.
-     *
-     * Examples:
-     *
-     *     Accept-Language: en;q=.5, en-us
-     *     ['en-us', 'en']
-     */
-    acceptedLanguages: Array;
-
-    /**
-     * Return an array of Accepted charsets
-     * ordered from highest quality to lowest.
-     *
-     * Examples:
-     *
-     *     Accept-Charset: iso-8859-5;q=.2, unicode-1-1;q=0.8
-     *     ['unicode-1-1', 'iso-8859-5']
-     */
-    acceptedCharsets: Array;
-
-    /**
-     * Return the value of param `name` when present or `defaultValue`.
-     *
-     *  - Checks route placeholders, ex: _/user/:id_
-     *  - Checks body params, ex: id=12, {"id":12}
-     *  - Checks query string params, ex: ?id=12
-     *
-     * To utilize request bodies, `req.body`
-     * should be an object. This can be done by using
-     * the `connect.bodyParser()` middleware.
-     *
-     * @param name
-     * @param defaultValue
-     */
-    param(name: string, defaultValue?: any): string;
-
-    /**
-     * Check if the incoming request contains the "Content-Type"
-     * header field, and it contains the give mime `type`.
-     *
-     * Examples:
-     *
-     *      // With Content-Type: text/html; charset=utf-8
-     *      req.is('html');
-     *      req.is('text/html');
-     *      req.is('text/*');
-     *      // => true
-     *
-     *      // When Content-Type is application/json
-     *      req.is('json');
-     *      req.is('application/json');
-     *      req.is('application/*');
-     *      // => true
-     *
-     *      req.is('html');
-     *      // => false
-     *
-     * @param type
-     */
-    is(type: string): bool;
-
-    /**
-     * Return the protocol string "http" or "https"
-     * when requested with TLS. When the "trust proxy"
-     * setting is enabled the "X-Forwarded-Proto" header
-     * field will be trusted. If you're running behind
-     * a reverse proxy that supplies https for you this
-     * may be enabled.
-     */
-    protocol: string;
-
-    /**
-     * Short-hand for:
-     *
-     *    req.protocol == 'https'
-     */
-    secure: bool;
-
-    /**
-     * Return the remote address, or when
-     * "trust proxy" is `true` return
-     * the upstream addr.
-     */
-    ip: string;
-
-    /**
-     * When "trust proxy" is `true`, parse
-     * the "X-Forwarded-For" ip address list.
-     *
-     * For example if the value were "client, proxy1, proxy2"
-     * you would receive the array `["client", "proxy1", "proxy2"]`
-     * where "proxy2" is the furthest down-stream.
-     */
-    ips: string[];
-
-    /**
-     * Return basic auth credentials.
-     *
-     * Examples:
-     *
-     *    // http://tobi:hello@example.com
-     *    req.auth
-     *    // => { username: 'tobi', password: 'hello' }
-     */
-    auth: any;
-
-    /**
-     * Return subdomains as an array.
-     *
-     * Subdomains are the dot-separated parts of the host before the main domain of
-     * the app. By default, the domain of the app is assumed to be the last two
-     * parts of the host. This can be changed by setting "subdomain offset".
-     *
-     * For example, if the domain is "tobi.ferrets.example.com":
-     * If "subdomain offset" is not set, req.subdomains is `["ferrets", "tobi"]`.
-     * If "subdomain offset" is 3, req.subdomains is `["tobi"]`.
-     */
-    subdomains: string[];
-
-    /**
-     * Short-hand for `url.parse(req.url).pathname`.
-     */
-    path: string;
-
-    /**
-     * Parse the "Host" header field hostname.
-     */
-    host: string;
-
-    /**
-     * Check if the request is fresh, aka
-     * Last-Modified and/or the ETag
-     * still match.
-     */
-    fresh: bool;
-
-    /**
-     * Check if the request is stale, aka
-     * "Last-Modified" and / or the "ETag" for the
-     * resource has changed.
-     */
-    stale: bool;
-
-    /**
-     * Check if the request was an _XMLHttpRequest_.
-     */
-    xhr: bool;
-
-    body: { username: string; password: string; remember: bool; title: string; };
-
-    cookies: { string; remember: bool; };
-
-    method: string;
-
-    params: any;
-
-    user: any;
-
-    files: any;
-
-    /**
-     * Clear cookie `name`.
-     *
-     * @param name
-     * @param options
-     */
-    clearCookie(name: string, options?: any): ExpressServerResponse;
-}
-
-interface ExpressServerResponse {
-    /**
-     * Set status `code`.
-     *
-     * @param code
-     */
-    status(code: number): ExpressServerResponse;
-
-    /**
-     * Set Link header field with the given `links`.
-     *
-     * Examples:
-     *
-     *    res.links({
-     *      next: 'http://api.example.com/users?page=2',
-     *      last: 'http://api.example.com/users?page=5'
-     *    });
-     *
-     * @param links
-     */
-    links(links: any): ExpressServerResponse;
-
-    /**
-     * Send a response.
-     *
-     * Examples:
-     *
-     *     res.send(new Buffer('wahoo'));
-     *     res.send({ some: 'json' });
-     *     res.send('<p>some html</p>');
-     *     res.send(404, 'Sorry, cant find that');
-     *     res.send(404);
-     */
-    send(status: number): ExpressServerResponse;
-
-    send(bodyOrStatus: any): ExpressServerResponse;
-
-    send(status: number, body: any): ExpressServerResponse;
-
-
-    /**
-     * Send JSON response.
-     *
-     * Examples:
-     *
-     *     res.json(null);
-     *     res.json({ user: 'tj' });
-     *     res.json(500, 'oh noes!');
-     *     res.json(404, 'I dont have that');
-     */
-    json(status: number): ExpressServerResponse;
-
-    json(bodyOrStatus: any): ExpressServerResponse;
-
-    json(status: number, body: any): ExpressServerResponse;
-
-    /**
-     * Send JSON response with JSONP callback support.
-     *
-     * Examples:
-     *
-     *     res.jsonp(null);
-     *     res.jsonp({ user: 'tj' });
-     *     res.jsonp(500, 'oh noes!');
-     *     res.jsonp(404, 'I dont have that');
-     */
-    jsonp(status: number): ExpressServerResponse;
-
-    jsonp(bodyOrStatus: any): ExpressServerResponse;
-
-    jsonp(status: number, body: any): ExpressServerResponse;
-
-    /**
-     * Transfer the file at the given `path`.
-     *
-     * Automatically sets the _Content-Type_ response header field.
-     * The callback `fn(err)` is invoked when the transfer is complete
-     * or when an error occurs. Be sure to check `res.sentHeader`
-     * if you wish to attempt responding, as the header and some data
-     * may have already been transferred.
-     *
-     * Options:
-     *
-     *   - `maxAge` defaulting to 0
-     *   - `root`   root directory for relative filenames
-     *
-     * Examples:
-     *
-     *  The following example illustrates how `res.sendfile()` may
-     *  be used as an alternative for the `static()` middleware for
-     *  dynamic situations. The code backing `res.sendfile()` is actually
-     *  the same code, so HTTP cache support etc is identical.
-     *
-     *     app.get('/user/:uid/photos/:file', function(req, res){
-     *       var uid = req.params.uid
-     *         , file = req.params.file;
-     *
-     *       req.user.mayViewFilesFrom(uid, function(yes){
-     *         if (yes) {
-     *           res.sendfile('/uploads/' + uid + '/' + file);
-     *         } else {
-     *           res.send(403, 'Sorry! you cant see that.');
-     *         }
-     *       });
-     *     });
-     */
-    sendfile(path: string): void;
-
-    sendfile(path: string, options: any): void;
-
-    sendfile(path: string, fn: Errback): void;
-
-    sendfile(path: string, options: any, fn: Errback): void;
-
-    /**
-     * Transfer the file at the given `path` as an attachment.
-     *
-     * Optionally providing an alternate attachment `filename`,
-     * and optional callback `fn(err)`. The callback is invoked
-     * when the data transfer is complete, or when an error has
-     * ocurred. Be sure to check `res.headerSent` if you plan to respond.
-     *
-     * This method uses `res.sendfile()`.
-     */
-    download(path: string): void;
-
-    download(path: string, filename: string): void;
-
-    download(path: string, fn: Errback): void;
-
-    download(path: string, filename: string, fn: Errback): void;
-
-    /**
-     * Set _Content-Type_ response header with `type` through `mime.lookup()`
-     * when it does not contain "/", or set the Content-Type to `type` otherwise.
-     *
-     * Examples:
-     *
-     *     res.type('.html');
-     *     res.type('html');
-     *     res.type('json');
-     *     res.type('application/json');
-     *     res.type('png');
-     *
-     * @param type
-     */
-    contentType(type: string): ExpressServerResponse;
-
-    /**
-     * Set _Content-Type_ response header with `type` through `mime.lookup()`
-     * when it does not contain "/", or set the Content-Type to `type` otherwise.
-     *
-     * Examples:
-     *
-     *     res.type('.html');
-     *     res.type('html');
-     *     res.type('json');
-     *     res.type('application/json');
-     *     res.type('png');
-     *
-     * @param type
-     */
-    type(type: string): ExpressServerResponse;
-
-    /**
-     * Respond to the Acceptable formats using an `obj`
-     * of mime-type callbacks.
-     *
-     * This method uses `req.accepted`, an array of
-     * acceptable types ordered by their quality values.
-     * When "Accept" is not present the _first_ callback
-     * is invoked, otherwise the first match is used. When
-     * no match is performed the server responds with
-     * 406 "Not Acceptable".
-     *
-     * Content-Type is set for you, however if you choose
-     * you may alter this within the callback using `res.type()`
-     * or `res.set('Content-Type', ...)`.
-     *
-     *    res.format({
-     *      'text/plain': function(){
-     *        res.send('hey');
-     *      },
-     *
-     *      'text/html': function(){
-     *        res.send('<p>hey</p>');
-     *      },
-     *
-     *      'appliation/json': function(){
-     *        res.send({ message: 'hey' });
-     *      }
-     *    });
-     *
-     * In addition to canonicalized MIME types you may
-     * also use extnames mapped to these types:
-     *
-     *    res.format({
-     *      text: function(){
-     *        res.send('hey');
-     *      },
-     *
-     *      html: function(){
-     *        res.send('<p>hey</p>');
-     *      },
-     *
-     *      json: function(){
-     *        res.send({ message: 'hey' });
-     *      }
-     *    });
-     *
-     * By default Express passes an `Error`
-     * with a `.status` of 406 to `next(err)`
-     * if a match is not made. If you provide
-     * a `.default` callback it will be invoked
-     * instead.
-     *
-     * @param obj
-     */
-    format(obj: any): ExpressServerResponse;
-
-    /**
-     * Set _Content-Disposition_ header to _attachment_ with optional `filename`.
-     *
-     * @param filename
-     */
-    attachment(filename: string): ExpressServerResponse;
-
-    /**
-     * Set header `field` to `val`, or pass
-     * an object of header fields.
-     *
-     * Examples:
-     *
-     *    res.set('Foo', ['bar', 'baz']);
-     *    res.set('Accept', 'application/json');
-     *    res.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
-     *
-     * Aliased as `res.header()`.
-     */
-    set (field: any): void;
-
-    set (field: string, value?: string): void;
-
-    header(field: any): void;
-
-    header(field: string, value?: string): void;
-
-    /**
-     * Get value for header `field`.
-     *
-     * @param field
-     */
-    get (field: string): string;
-
-    /**
-     * Clear cookie `name`.
-     *
-     * @param name
-     * @param options
-     */
-    clearCookie(name: string, options?: any): ExpressServerResponse;
-
-    /**
-     * Set cookie `name` to `val`, with the given `options`.
-     *
-     * Options:
-     *
-     *    - `maxAge`   max-age in milliseconds, converted to `expires`
-     *    - `signed`   sign the cookie
-     *    - `path`     defaults to "/"
-     *
-     * Examples:
-     *
-     *    // "Remember Me" for 15 minutes
-     *    res.cookie('rememberme', '1', { expires: new Date(Date.now() + 900000), httpOnly: true });
-     *
-     *    // save as above
-     *    res.cookie('rememberme', '1', { maxAge: 900000, httpOnly: true })
-     */
-    cookie(name: string, val: string, options: CookieOptions);
-
-    cookie(name: string, val: any, options: CookieOptions);
-
-    /**
-     * Set the location header to `url`.
-     *
-     * The given `url` can also be the name of a mapped url, for
-     * example by default express supports "back" which redirects
-     * to the _Referrer_ or _Referer_ headers or "/".
-     *
-     * Examples:
-     *
-     *    res.location('/foo/bar').;
-     *    res.location('http://example.com');
-     *    res.location('../login'); // /blog/post/1 -> /blog/login
-     *
-     * Mounting:
-     *
-     *   When an application is mounted and `res.location()`
-     *   is given a path that does _not_ lead with "/" it becomes
-     *   relative to the mount-point. For example if the application
-     *   is mounted at "/blog", the following would become "/blog/login".
-     *
-     *      res.location('login');
-     *
-     *   While the leading slash would result in a location of "/login":
-     *
-     *      res.location('/login');
-     *
-     * @param url
-     */
-    location(url: string);
-
-    /**
-     * Redirect to the given `url` with optional response `status`
-     * defaulting to 302.
-     *
-     * The resulting `url` is determined by `res.location()`, so
-     * it will play nicely with mounted apps, relative paths,
-     * `"back"` etc.
-     *
-     * Examples:
-     *
-     *    res.redirect('/foo/bar');
-     *    res.redirect('http://example.com');
-     *    res.redirect(301, 'http://example.com');
-     *    res.redirect('http://example.com', 301);
-     *    res.redirect('../login'); // /blog/post/1 -> /blog/login
-     */
-    redirect(url: string): void;
-
-    redirect(status: number, url: string): void;
-
-    redirect(url: string, status: number): void;
-
-    /**
-     * Render `view` with the given `options` and optional callback `fn`.
-     * When a callback function is given a response will _not_ be made
-     * automatically, otherwise a response of _200_ and _text/html_ is given.
-     *
-     * Options:
-     *
-     *  - `cache`     boolean hinting to the engine it should cache
-     *  - `filename`  filename of the view being rendered
-     */
-    render(view: string): void;
-
-    render(view: string, options: any): void;
-
-    render(view: string, callback: (err: Error, html: any) => void ): void;
-
-    render(view: string, options: any, callback: (err: Error, html: any) => void ): void;
-
-    locals: any;
-}
-
-interface ExpressApplication {
-    /**
-     * Initialize the server.
-     *
-     *   - setup default configuration
-     *   - setup default middleware
-     *   - setup route reflection methods
-     */
-    init();
-
-    /**
-     * Initialize application configuration.
-     */
-    defaultConfiguration();
-
-    /**
-     * Proxy `connect#use()` to apply settings to
-     * mounted applications.
-    **/
-    use(route: string, callback?: Function): ExpressApplication;
-
-    use(route: string, server: ExpressApplication): ExpressApplication;
-
-    use(callback: Function): ExpressApplication;
-
-    use(server: ExpressApplication): ExpressApplication;
-
-    /**
-     * Register the given template engine callback `fn`
-     * as `ext`.
-     *
-     * By default will `require()` the engine based on the
-     * file extension. For example if you try to render
-     * a "foo.jade" file Express will invoke the following internally:
-     *
-     *     app.engine('jade', require('jade').__express);
-     *
-     * For engines that do not provide `.__express` out of the box,
-     * or if you wish to "map" a different extension to the template engine
-     * you may use this method. For example mapping the EJS template engine to
-     * ".html" files:
-     *
-     *     app.engine('html', require('ejs').renderFile);
-     *
-     * In this case EJS provides a `.renderFile()` method with
-     * the same signature that Express expects: `(path, options, callback)`,
-     * though note that it aliases this method as `ejs.__express` internally
-     * so if you're using ".ejs" extensions you dont need to do anything.
-     *
-     * Some template engines do not follow this convention, the
-     * [Consolidate.js](https://github.com/visionmedia/consolidate.js)
-     * library was created to map all of node's popular template
-     * engines to follow this convention, thus allowing them to
-     * work seamlessly within Express.
-     */
-    engine(ext: string, fn: Function): ExpressApplication;
-
-    /**
-     * Map the given param placeholder `name`(s) to the given callback(s).
-     *
-     * Parameter mapping is used to provide pre-conditions to routes
-     * which use normalized placeholders. For example a _:user_id_ parameter
-     * could automatically load a user's information from the database without
-     * any additional code,
-     *
-     * The callback uses the samesignature as middleware, the only differencing
-     * being that the value of the placeholder is passed, in this case the _id_
-     * of the user. Once the `next()` function is invoked, just like middleware
-     * it will continue on to execute the route, or subsequent parameter functions.
-     *
-     *      app.param('user_id', function(req, res, next, id){
-     *        User.find(id, function(err, user){
-     *          if (err) {
-     *            next(err);
-     *          } else if (user) {
-     *            req.user = user;
-     *            next();
-     *          } else {
-     *            next(new Error('failed to load user'));
-     *          }
-     *        });
-     *      });
-     *
-     * @param name
-     * @param fn
-     */
-    param(name: string, fn: Function): ExpressApplication;
-
-    param(name: Array, fn: Function): ExpressApplication;
-
-    /**
-     * Assign `setting` to `val`, or return `setting`'s value.
-     *
-     *    app.set('foo', 'bar');
-     *    app.get('foo');
-     *    // => "bar"
-     *
-     * Mounted servers inherit their parent server's settings.
-     *
-     * @param setting
-     * @param val
-     */
-    set (setting: string, val: string): ExpressApplication;
-
-    /**
-     * Return the app's absolute pathname
-     * based on the parent(s) that have
-     * mounted it.
-     *
-     * For example if the application was
-     * mounted as "/admin", which itself
-     * was mounted as "/blog" then the
-     * return value would be "/blog/admin".
-     */
-    path(): string;
-
-    /**
-     * Check if `setting` is enabled (truthy).
-     *
-     *    app.enabled('foo')
-     *    // => false
-     *
-     *    app.enable('foo')
-     *    app.enabled('foo')
-     *    // => true
-     */
-    enabled(setting: string): bool;
-
-    /**
-     * Check if `setting` is disabled.
-     *
-     *    app.disabled('foo')
-     *    // => true
-     *
-     *    app.enable('foo')
-     *    app.disabled('foo')
-     *    // => false
-     *
-     * @param setting
-     */
-    disabled(setting: string): bool;
-
-    /**
-     * Enable `setting`.
-     *
-     * @param setting
-     */
-    enable(setting: string): ExpressApplication;
-
-    /**
-     * Disable `setting`.
-     *
-     * @param setting
-     */
-    disable(setting: string): ExpressApplication;
-
-    /**
-     * Configure callback for zero or more envs,
-     * when no `env` is specified that callback will
-     * be invoked for all environments. Any combination
-     * can be used multiple times, in any order desired.
-     *
-     * Examples:
-     *
-     *    app.configure(function(){
-     *      // executed for all envs
-     *    });
-     *
-     *    app.configure('stage', function(){
-     *      // executed staging env
-     *    });
-     *
-     *    app.configure('stage', 'production', function(){
-     *      // executed for stage and production
-     *    });
-     *
-     * Note:
-     *
-     *  These callbacks are invoked immediately, and
-     *  are effectively sugar for the following:
-     *
-     *     var env = process.env.NODE_ENV || 'development';
-     *
-     *      switch (env) {
-     *        case 'development':
-     *          ...
-     *          break;
-     *        case 'stage':
-     *          ...
-     *          break;
-     *        case 'production':
-     *          ...
-     *          break;
-     *      }
-     *
-     * @param env
-     * @param fn
-     */
-    configure(env: string, fn: Function): ExpressApplication;
-
-    /**
-     * Special-cased "all" method, applying the given route `path`,
-     * middleware, and callback to _every_ HTTP method.
-     *
-     * @param path
-     * @param fn
-     */
-    all(path: string, fn?: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): ExpressApplication;
-
-    /**
-     * Render the given view `name` name with `options`
-     * and a callback accepting an error and the
-     * rendered template string.
-     *
-     * Example:
-     *
-     *    app.render('email', { name: 'Tobi' }, function(err, html){
-     *      // ...
-     *    })
-     *
-     * @param name
-     * @param options or fn
-     * @param fn
-     */
-    render(name: string, options: string, fn: Function);
-
-    render(name: string, fn: Function);
-
-    get (name: string): any;
-
-    get (name: string, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    get (name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    get (name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    get (name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    get (name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    get (name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        ...handlers: any[]): any;
-
-    get (name: RegExp): any;
-
-    get (name: RegExp, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    get (name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    get (name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    get (name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    get (name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        ...handlers: any[]): any;
-
-    post(name: string): any;
-
-    post(name: string, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    post(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    post(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    post(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    post(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        ...handlers: any[]): any;
-
-    post(name: RegExp): any;
-
-    post(name: RegExp, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    post(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    post(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    post(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    post(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        ...handlers: any[]): any;
-
-    put(name: string): any;
-
-    put(name: string, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    put(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    put(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    put(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    put(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        ...handlers: any[]): any;
-
-    put(name: RegExp): any;
-
-    put(name: RegExp, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    put(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    put(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    put(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    put(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        ...handlers: any[]): any;
-
-    del(name: string): any;
-
-    del(name: string, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    del(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    del(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    del(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    del(name: string,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        ...handlers: any[]): any;
-
-    del(name: RegExp): any;
-
-    del(name: RegExp, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    del(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    del(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    del(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
-
-    del(name: RegExp,
-        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
-        ...handlers: any[]): any;
-
-    /**
-     * Listen for connections.
-     *
-     * A node `http.Server` is returned, with this
-     * application (which is a `Function`) as its
-     * callback. If you wish to create both an HTTP
-     * and HTTPS server you may do so with the "http"
-     * and "https" modules as shown here:
-     *
-     *    var http = require('http')
-     *      , https = require('https')
-     *      , express = require('express')
-     *      , app = express();
-     *
-     *    http.createServer(app).listen(80);
-     *    https.createServer({ ... }, app).listen(443);
-     */
-    listen(port: number, hostname: string, backlog: number, callback: Function): void;
-
-    listen(port: number, callback: Function): void;
-
-    listen(path: string, callback?: Function): void;
-
-    listen(handle: any, listeningListener?: Function): void;
-
-    render(view: string, callback: (err: Error, html) => void ): void;
-
-    render(view: string, optionss: any, callback: (err: Error, html) => void ): void;
-
-    route: Route;
-
-    router: string;
-
-    settings: any;
-
-    resource: any;
-
-    map: any;
-}
-
-interface Express extends ExpressApplication {
-    /**
-     * Framework version.
-     */
-    version: string;
-
-    /**
-     * Expose mime.
-     */
-    mime: string;
-
-    (): ExpressApplication;
-
-    /**
-    * Create an express application.
-    */
-    createApplication(): ExpressApplication;
-
-    createServer(): ExpressApplication;
-
-    application: any;
-
-    request: ExpressServerRequest;
-
-    response: ExpressServerResponse;
-}
-
-declare module "express" {
-    export function (): Express;
-
-    /**
-     * Body parser:
-     * 
-     *   Parse request bodies, supports _application/json_,
-     *   _application/x-www-form-urlencoded_, and _multipart/form-data_.
-     *
-     *   This is equivalent to: 
-     *
-     *     app.use(connect.json());
-     *     app.use(connect.urlencoded());
-     *     app.use(connect.multipart());
-     *
-     * Examples:
-     *
-     *      connect()
-     *        .use(connect.bodyParser())
-     *        .use(function(req, res) {
-     *          res.end('viewing user ' + req.body.user.name);
-     *        });
-     *
-     *      $ curl -d 'user[name]=tj' http://local/
-     *      $ curl -d '{"user":{"name":"tj"}}' -H "Content-Type: application/json" http://local/
-     *
-     *  View [json](json.html), [urlencoded](urlencoded.html), and [multipart](multipart.html) for more info.
-     *
-     * @param options
-     */
-    export function bodyParser(options?: any): Handler;
-
-    /**
-     * Error handler:
-     *
-     * Development error handler, providing stack traces
-     * and error message responses for requests accepting text, html,
-     * or json.
-     *
-     * Text:
-     *
-     *   By default, and when _text/plain_ is accepted a simple stack trace
-     *   or error message will be returned.
-     *
-     * JSON:
-     *
-     *   When _application/json_ is accepted, connect will respond with
-     *   an object in the form of `{ "error": error }`.
-     *
-     * HTML:
-     *
-     *   When accepted connect will output a nice html stack trace.
-     */
-    export function errorHandler(opts?: any): Handler;
-
-    /**
-     * Method Override:
-     * 
-     * Provides faux HTTP method support.
-     * 
-     * Pass an optional `key` to use when checking for
-     * a method override, othewise defaults to _\_method_.
-     * The original method is available via `req.originalMethod`.
-     *
-     * @param key
-     */
-    export function methodOverride(key: string): Handler;
-
-    /**
-     * Cookie parser:
-     *
-     * Parse _Cookie_ header and populate `req.cookies`
-     * with an object keyed by the cookie names. Optionally
-     * you may enabled signed cookie support by passing
-     * a `secret` string, which assigns `req.secret` so
-     * it may be used by other middleware.
-     *
-     * Examples:
-     *
-     *     connect()
-     *       .use(connect.cookieParser('optional secret string'))
-     *       .use(function(req, res, next){
-     *         res.end(JSON.stringify(req.cookies));
-     *       })
-     *
-     * @param secret
-     */
-    export function cookieParser(secret: string): Handler;
-
-    /**
-     * Session:
-     * 
-     *   Setup session store with the given `options`.
-     *
-     *   Session data is _not_ saved in the cookie itself, however
-     *   cookies are used, so we must use the [cookieParser()](cookieParser.html)
-     *   middleware _before_ `session()`.
-     *
-     * Examples:
-     *
-     *     connect()
-     *       .use(connect.cookieParser())
-     *       .use(connect.session({ secret: 'keyboard cat', key: 'sid', cookie: { secure: true }}))
-     *
-     * Options:
-     *
-     *   - `key` cookie name defaulting to `connect.sid`
-     *   - `store` session store instance
-     *   - `secret` session cookie is signed with this secret to prevent tampering
-     *   - `cookie` session cookie settings, defaulting to `{ path: '/', httpOnly: true, maxAge: null }`
-     *   - `proxy` trust the reverse proxy when setting secure cookies (via "x-forwarded-proto")
-     *
-     * Cookie option:
-     *
-     *  By default `cookie.maxAge` is `null`, meaning no "expires" parameter is set
-     *  so the cookie becomes a browser-session cookie. When the user closes the 
-     *  browser the cookie (and session) will be removed.
-     *
-     * ## req.session
-     *
-     *  To store or access session data, simply use the request property `req.session`,
-     *  which is (generally) serialized as JSON by the store, so nested objects 
-     *  are typically fine. For example below is a user-specific view counter:
-     *
-     *       connect()
-     *         .use(connect.favicon())
-     *         .use(connect.cookieParser())
-     *         .use(connect.session({ secret: 'keyboard cat', cookie: { maxAge: 60000 }}))
-     *         .use(function(req, res, next){
-     *           var sess = req.session;
-     *           if (sess.views) {
-     *             res.setHeader('Content-Type', 'text/html');
-     *             res.write('<p>views: ' + sess.views + '</p>');
-     *             res.write('<p>expires in: ' + (sess.cookie.maxAge / 1000) + 's</p>');
-     *             res.end();
-     *             sess.views++;
-     *           } else {
-     *             sess.views = 1;
-     *             res.end('welcome to the session demo. refresh!');
-     *           }
-     *         }
-     *       )).listen(3000);
-     *
-     * ## Session#regenerate()
-     *
-     *  To regenerate the session simply invoke the method, once complete
-     *  a new SID and `Session` instance will be initialized at `req.session`.
-     *
-     *      req.session.regenerate(function(err){
-     *        // will have a new session here
-     *      });
-     *
-     * ## Session#destroy()
-     *
-     *  Destroys the session, removing `req.session`, will be re-generated next request.
-     *
-     *      req.session.destroy(function(err){
-     *        // cannot access session here
-     *      });
-     * 
-     * ## Session#reload()
-     *
-     *  Reloads the session data.
-     *
-     *      req.session.reload(function(err){
-     *        // session updated
-     *      });
-     *
-     * ## Session#save()
-     *
-     *  Save the session.
-     *
-     *      req.session.save(function(err){
-     *        // session saved
-     *      });
-     *
-     * ## Session#touch()
-     *
-     *   Updates the `.maxAge` property. Typically this is
-     *   not necessary to call, as the session middleware does this for you.
-     *
-     * ## Session#cookie
-     *
-     *  Each session has a unique cookie object accompany it. This allows
-     *  you to alter the session cookie per visitor. For example we can
-     *  set `req.session.cookie.expires` to `false` to enable the cookie
-     *  to remain for only the duration of the user-agent.
-     *
-     * ## Session#maxAge
-     *
-     *  Alternatively `req.session.cookie.maxAge` will return the time
-     *  remaining in milliseconds, which we may also re-assign a new value
-     *  to adjust the `.expires` property appropriately. The following
-     *  are essentially equivalent
-     *
-     *     var hour = 3600000;
-     *     req.session.cookie.expires = new Date(Date.now() + hour);
-     *     req.session.cookie.maxAge = hour;
-     *
-     * For example when `maxAge` is set to `60000` (one minute), and 30 seconds
-     * has elapsed it will return `30000` until the current request has completed,
-     * at which time `req.session.touch()` is called to reset `req.session.maxAge`
-     * to its original value.
-     *
-     *     req.session.cookie.maxAge;
-     *     // => 30000
-     *
-     * Session Store Implementation:
-     *
-     * Every session store _must_ implement the following methods
-     *
-     *    - `.get(sid, callback)`
-     *    - `.set(sid, session, callback)`
-     *    - `.destroy(sid, callback)`
-     *
-     * Recommended methods include, but are not limited to:
-     *
-     *    - `.length(callback)`
-     *    - `.clear(callback)`
-     *
-     * For an example implementation view the [connect-redis](http://github.com/visionmedia/connect-redis) repo.
-     *
-     * @param options
-     */
-    export function session(options?: any): Handler;
-
-    /**
-     * Hash the given `sess` object omitting changes
-     * to `.cookie`.
-     *
-     * @param sess
-     */
-    export function hash(sess: string): string;
-
-    /**
-     * Static:
-     *
-     *   Static file server with the given `root` path.
-     *
-     * Examples:
-     *
-     *     var oneDay = 86400000;
-     *
-     *     connect()
-     *       .use(connect.static(__dirname + '/public'))
-     *
-     *     connect()
-     *       .use(connect.static(__dirname + '/public', { maxAge: oneDay }))
-     *
-     * Options:
-     *
-     *    - `maxAge`     Browser cache maxAge in milliseconds. defaults to 0
-     *    - `hidden`     Allow transfer of hidden files. defaults to false
-     *    - `redirect`   Redirect to trailing "/" when the pathname is a dir. defaults to true
-     *
-     * @param root
-     * @param options
-     */
-    export function static (root: string, options?: any): Handler;
-
-    /**
-     * Basic Auth:
-     *
-     * Enfore basic authentication by providing a `callback(user, pass)`,
-     * which must return `true` in order to gain access. Alternatively an async
-     * method is provided as well, invoking `callback(user, pass, callback)`. Populates
-     * `req.user`. The final alternative is simply passing username / password
-     * strings.
-     *
-     *  Simple username and password
-     *
-     *     connect(connect.basicAuth('username', 'password'));
-     *
-     *  Callback verification
-     *
-     *     connect()
-     *       .use(connect.basicAuth(function(user, pass){
-     *         return 'tj' == user & 'wahoo' == pass;
-     *       }))
-     *
-     *  Async callback verification, accepting `fn(err, user)`.
-     *
-     *     connect()
-     *       .use(connect.basicAuth(function(user, pass, fn){
-     *         User.authenticate({ user: user, pass: pass }, fn);
-     *       }))
-     *
-     * @param callback or username
-     * @param realm
-     */
-    export function basicAuth(callback: Function, realm: string);
-
-    export function basicAuth(callback: string, realm: string);
-
-    /**
-     * Compress:
-     *
-     * Compress response data with gzip/deflate.
-     *
-     * Filter:
-     *
-     *  A `filter` callback function may be passed to
-     *  replace the default logic of:
-     *
-     *     exports.filter = function(req, res){
-     *       return /json|text|javascript/.test(res.getHeader('Content-Type'));
-     *     };
-     *
-     * Options:
-     *
-     *  All remaining options are passed to the gzip/deflate
-     *  creation functions. Consult node's docs for additional details.
-     *
-     *   - `chunkSize` (default: 16*1024)
-     *   - `windowBits`
-     *   - `level`: 0-9 where 0 is no compression, and 9 is slow but best compression
-     *   - `memLevel`: 1-9 low is slower but uses less memory, high is fast but uses more
-     *   - `strategy`: compression strategy
-     *
-     * @param options
-     */
-    export function compress(options: any): Handler;
-
-    /**
-     * Cookie Session:
-     *
-     *   Cookie session middleware.
-     *
-     *      var app = connect();
-     *      app.use(connect.cookieParser());
-     *      app.use(connect.cookieSession({ secret: 'tobo!', cookie: { maxAge: 60 * 60 * 1000 }}));
-     *
-     * Options:
-     *
-     *   - `key` cookie name defaulting to `connect.sess`
-     *   - `secret` prevents cookie tampering
-     *   - `cookie` session cookie settings, defaulting to `{ path: '/', httpOnly: true, maxAge: null }`
-     *   - `proxy` trust the reverse proxy when setting secure cookies (via "x-forwarded-proto")
-     *
-     * Clearing sessions:
-     *
-     *  To clear the session simply set its value to `null`,
-     *  `cookieSession()` will then respond with a 1970 Set-Cookie.
-     *
-     *     req.session = null;
-     *
-     * @param options
-     */
-    export function cookieSession(options?: any): Handler;
-
-    /**
-     * Anti CSRF:
-     *
-     * CRSF protection middleware.
-     *
-     * By default this middleware generates a token named "_csrf"
-     * which should be added to requests which mutate
-     * state, within a hidden form field, query-string etc. This
-     * token is validated against the visitor's `req.session._csrf`
-     * property.
-     *
-     * The default `value` function checks `req.body` generated
-     * by the `bodyParser()` middleware, `req.query` generated
-     * by `query()`, and the "X-CSRF-Token" header field.
-     *
-     * This middleware requires session support, thus should be added
-     * somewhere _below_ `session()` and `cookieParser()`.
-     *
-     * Options:
-     *
-     *    - `value` a function accepting the request, returning the token 
-     *
-     * @param options
-     */
-    export function csrf(options: any);
-
-    /**
-     * Directory:
-     *
-     * Serve directory listings with the given `root` path.
-     *
-     * Options:
-     *
-     *  - `hidden` display hidden (dot) files. Defaults to false.
-     *  - `icons`  display icons. Defaults to false.
-     *  - `filter` Apply this filter function to files. Defaults to false.
-     *
-     * @param root
-     * @param options
-     */
-    export function directory(root: string, options?: any): Handler;
-
-    /**
-     * Favicon:
-     *
-     * By default serves the connect favicon, or the favicon
-     * located by the given `path`.
-     *
-     * Options:
-     *
-     *   - `maxAge`  cache-control max-age directive, defaulting to 1 day
-     *
-     * Examples:
-     *
-     *   Serve default favicon:
-     *
-     *     connect()
-     *       .use(connect.favicon())
-     *
-     *   Serve favicon before logging for brevity:
-     *
-     *     connect()
-     *       .use(connect.favicon())
-     *       .use(connect.logger('dev'))
-     *
-     *   Serve custom favicon:
-     *
-     *     connect()
-     *       .use(connect.favicon('public/favicon.ico))
-     *
-     * @param path
-     * @param options
-     */
-    export function favicon(path?: string, options?: any);
-
-    /**
-     * JSON:
-     *
-     * Parse JSON request bodies, providing the
-     * parsed object as `req.body`.
-     *
-     * Options:
-     *
-     *   - `strict`  when `false` anything `JSON.parse()` accepts will be parsed
-     *   - `reviver`  used as the second "reviver" argument for JSON.parse
-     *   - `limit`  byte limit disabled by default
-     *
-     * @param options
-     */
-    export function json(options?: any): Handler;
-
-    /**
-     * Limit:
-     *
-     *   Limit request bodies to the given size in `bytes`.
-     *
-     *   A string representation of the bytesize may also be passed,
-     *   for example "5mb", "200kb", "1gb", etc.
-     *
-     *     connect()
-     *       .use(connect.limit('5.5mb'))
-     *       .use(handleImageUpload)
-     */
-    export function limit(bytes: number): Handler;
-
-    export function limit(bytes: string): Handler;
-
-    /**
-     * Logger:
-     *
-     * Log requests with the given `options` or a `format` string.
-     *
-     * Options:
-     *
-     *   - `format`  Format string, see below for tokens
-     *   - `stream`  Output stream, defaults to _stdout_
-     *   - `buffer`  Buffer duration, defaults to 1000ms when _true_
-     *   - `immediate`  Write log line on request instead of response (for response times)
-     *
-     * Tokens:
-     *
-     *   - `:req[header]` ex: `:req[Accept]`
-     *   - `:res[header]` ex: `:res[Content-Length]`
-     *   - `:http-version`
-     *   - `:response-time`
-     *   - `:remote-addr`
-     *   - `:date`
-     *   - `:method`
-     *   - `:url`
-     *   - `:referrer`
-     *   - `:user-agent`
-     *   - `:status`
-     *
-     * Formats:
-     *
-     *   Pre-defined formats that ship with connect:
-     *
-     *    - `default` ':remote-addr - - [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"'
-     *    - `short` ':remote-addr - :method :url HTTP/:http-version :status :res[content-length] - :response-time ms'
-     *    - `tiny`  ':method :url :status :res[content-length] - :response-time ms'
-     *    - `dev` concise output colored by response status for development use
-     *
-     * Examples:
-     *
-     *      connect.logger() // default
-     *      connect.logger('short')
-     *      connect.logger('tiny')
-     *      connect.logger({ immediate: true, format: 'dev' })
-     *      connect.logger(':method :url - :referrer')
-     *      connect.logger(':req[content-type] -> :res[content-type]')
-     *      connect.logger(function(tokens, req, res){ return 'some format string' })
-     *
-     * Defining Tokens:
-     *
-     *   To define a token, simply invoke `connect.logger.token()` with the
-     *   name and a callback function. The value returned is then available
-     *   as ":type" in this case.
-     *
-     *      connect.logger.token('type', function(req, res){ return req.headers['content-type']; })
-     *
-     * Defining Formats:
-     *
-     *   All default formats are defined this way, however it's public API as well:
-     *
-     *       connect.logger.format('name', 'string or function')
-     */
-    export function logger(options: string): Handler;
-
-    export function logger(options: Function): Handler;
-
-    export function logger(options: any): Handler;
-
-    /**
-     * Compile `fmt` into a function.
-     *
-     * @param fmt
-     */
-    export function compile(fmt: string): Handler;
-
-    /**
-     * Define a token function with the given `name`,
-     * and callback `fn(req, res)`.
-     *
-     * @param name
-     * @param fn
-     */
-    export function token(name: string, fn: Function): any;
-
-    /**
-     * Define a `fmt` with the given `name`.
-     */
-    export function format(name: string, str: string): any;
-
-    export function format(name: string, str: Function): any;
-
-    /**
-     * Query:
-     *
-     * Automatically parse the query-string when available,
-     * populating the `req.query` object.
-     *
-     * Examples:
-     *
-     *     connect()
-     *       .use(connect.query())
-     *       .use(function(req, res){
-     *         res.end(JSON.stringify(req.query));
-     *       });
-     *
-     *  The `options` passed are provided to qs.parse function.
-     */
-    export function query(options: any): Handler;
-
-    /**
-     * Reponse time:
-     *
-     * Adds the `X-Response-Time` header displaying the response
-     * duration in milliseconds.
-     */
-    export function responseTime(): Handler;
-
-    /**
-     * Static cache:
-     *
-     * Enables a memory cache layer on top of
-     * the `static()` middleware, serving popular
-     * static files.
-     *
-     * By default a maximum of 128 objects are
-     * held in cache, with a max of 256k each,
-     * totalling ~32mb.
-     *
-     * A Least-Recently-Used (LRU) cache algo
-     * is implemented through the `Cache` object,
-     * simply rotating cache objects as they are
-     * hit. This means that increasingly popular
-     * objects maintain their positions while
-     * others get shoved out of the stack and
-     * garbage collected.
-     *
-     * Benchmarks:
-     *
-     *     static(): 2700 rps
-     *     node-static: 5300 rps
-     *     static() + staticCache(): 7500 rps
-     *
-     * Options:
-     *
-     *   - `maxObjects`  max cache objects [128]
-     *   - `maxLength`  max cache object length 256kb
-     */
-    export function staticCache(options: any): Handler;
-
-    /**
-     * Timeout:
-     *
-     * Times out the request in `ms`, defaulting to `5000`. The
-     * method `req.clearTimeout()` is added to revert this behaviour
-     * programmatically within your application's middleware, routes, etc.
-     *
-     * The timeout error is passed to `next()` so that you may customize
-     * the response behaviour. This error has the `.timeout` property as
-     * well as `.status == 408`.
-     */
-    export function timeout(ms: number): Handler;
-
-    /**
-     * Vhost:
-     * 
-     *   Setup vhost for the given `hostname` and `server`.
-     *
-     *     connect()
-     *       .use(connect.vhost('foo.com', fooApp))
-     *       .use(connect.vhost('bar.com', barApp))
-     *       .use(connect.vhost('*.com', mainApp))
-     *
-     *  The `server` may be a Connect server or
-     *  a regular Node `http.Server`. 
-     *
-     * @param hostname
-     * @param server
-     */
-    export function vhost(hostname: string, server: any): Handler;
-}
\ No newline at end of file
diff --git a/express/express-tests.ts b/express/express-tests.ts
index 9b54b1701c..53dfc11436 100644
--- a/express/express-tests.ts
+++ b/express/express-tests.ts
@@ -1,10 +1,1250 @@
 /// <reference path="express.d.ts" />
 
-declare var _, $;
+import express = module('express');
+var app = express();
 
-import Express = module('express');
-var express: Express;
-var app: Express.ServerApplication;
+//////////////////////////
+
+var hash: any;
+
+// config
+
+app.set('view engine', 'ejs');
+app.set('views', __dirname + '/views');
+
+// middleware
+
+app.use(express.bodyParser());
+app.use(express.cookieParser('shhhh, very secret'));
+app.use(express.session());
+
+// Session-persisted message middleware
+
+app.use(function (req, res, next) {
+    var err = req.session.error
+      , msg = req.session.success;
+    delete req.session.error;
+    delete req.session.success;
+    res.locals.message = '';
+    if (err) res.locals.message = '<p class="msg error">' + err + '</p>';
+    if (msg) res.locals.message = '<p class="msg success">' + msg + '</p>';
+    next();
+});
+
+// dummy database
+
+var users = <any>{
+    tj: { name: 'tj' }
+};
+
+// when you create a user, generate a salt
+// and hash the password ('foobar' is the pass here)
+
+hash('foobar', function (err, salt, hash) {
+    if (err) throw err;
+    // store the salt & hash in the "db"
+    users.tj.salt = salt;
+    users.tj.hash = hash;
+});
+
+
+// Authenticate using our plain-object database of doom!
+
+function authenticate(name, pass, fn) {
+    if (!module.parent) console.log('authenticating %s:%s', name, pass);
+    var user = users[name];
+    // query the db for the given username
+    if (!user) return fn(new Error('cannot find user'));
+    // apply the same algorithm to the POSTed password, applying
+    // the hash against the pass / salt, if there is a match we
+    // found the user
+    hash(pass, user.salt, function (err, hash) {
+        if (err) return fn(err);
+        if (hash == user.hash) return fn(null, user);
+        fn(new Error('invalid password'));
+    })
+}
+
+function restrict(req: ExpressServerRequest, res: ExpressServerResponse, next?: Function) {
+    if (req.session.user) {
+        next();
+    } else {
+        req.session.error = 'Access denied!';
+        res.redirect('/login');
+    }
+}
+
+app.get('/', function (req, res) {
+    res.redirect('login');
+});
+
+app.get('/restricted', restrict, function (req, res) {
+    res.send('Wahoo! restricted area, click to <a href="/logout">logout</a>');
+});
+
+app.get('/logout', function (req, res) {
+    // destroy the user's session to log them out
+    // will be re-created next request
+    req.session.destroy(function () {
+        res.redirect('/');
+    });
+});
+
+app.get('/login', function (req, res) {
+    res.render('login');
+});
+
+app.post('/login', function (req, res) {
+    authenticate(req.body.username, req.body.password, function (err, user) {
+        if (user) {
+            // Regenerate session when signing in
+            // to prevent fixation 
+            req.session.regenerate(function () {
+                // Store the user's primary key 
+                // in the session store to be retrieved,
+                // or in this case the entire user object
+                req.session.user = user;
+                req.session.success = 'Authenticated as ' + user.name
+                  + ' click to <a href="/logout">logout</a>. '
+                  + ' You may now access <a href="/restricted">/restricted</a>.';
+                res.redirect('back');
+            });
+        } else {
+            req.session.error = 'Authentication failed, please check your '
+              + ' username and password.'
+              + ' (use "tj" and "foobar")';
+            res.redirect('login');
+        }
+    });
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express started on port 3000');
+}
+
+//////////////
+
+app.set('views', __dirname);
+app.set('view engine', 'jade');
+
+var pets = [];
+
+var n = 1000;
+while (n--) {
+    pets.push({ name: 'Tobi', age: 2, species: 'ferret' });
+    pets.push({ name: 'Loki', age: 1, species: 'ferret' });
+    pets.push({ name: 'Jane', age: 6, species: 'ferret' });
+}
+
+app.use(express.logger('dev'));
+
+app.get('/', function (req, res) {
+    res.render('pets', { pets: pets });
+});
+
+app.listen(3000);
+console.log('Express listening on port 3000');
+
+/////////////
+
+app.get('/', function (req, res) {
+    res.format({
+        html: function () {
+            res.send('<ul>' + users.map(function (user) {
+                return '<li>' + user.name + '</li>';
+            }).join('') + '</ul>');
+        },
+
+        text: function () {
+            res.send(users.map(function (user) {
+                return ' - ' + user.name + '\n';
+            }).join(''));
+        },
+
+        json: function () {
+            res.json(users);
+        }
+    })
+});
+
+// or you could write a tiny middleware like
+// this to abstract make things a bit more declarative:
+
+function format(mod) {
+    var obj = require(mod);
+    return function (req, res) {
+        res.format(obj);
+    }
+}
+
+app.get('/users', format('./users'));
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('listening on port 3000');
+}
+
+/////////////////////////
+
+// add favicon() before logger() so
+// GET /favicon.ico requests are not
+// logged, because this middleware
+// reponds to /favicon.ico and does not
+// call next()
+app.use(express.favicon());
+
+// custom log format
+if ('test' != process.env.NODE_ENV)
+    app.use(express.logger(':method :url'));
+
+// parses request cookies, populating
+// req.cookies and req.signedCookies
+// when the secret is passed, used 
+// for signing the cookies.
+app.use(express.cookieParser('my secret here'));
+
+// parses json, x-www-form-urlencoded, and multipart/form-data
+app.use(express.bodyParser());
+
+app.get('/', function (req, res) {
+    if (req.cookies.remember) {
+        res.send('Remembered :). Click to <a href="/forget">forget</a>!.');
+    } else {
+        res.send('<form method="post"><p>Check to <label>'
+          + '<input type="checkbox" name="remember"/> remember me</label> '
+          + '<input type="submit" value="Submit"/>.</p></form>');
+    }
+});
+
+app.get('/forget', function (req, res) {
+    res.clearCookie('remember');
+    res.redirect('back');
+});
+
+app.post('/', function (req, res) {
+    var minute = 60000;
+    if (req.body.remember) res.cookie('remember', 1, { maxAge: minute });
+    res.redirect('back');
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express started on port 3000');
+}
+
+///////////////////
+
+// ignore GET /favicon.ico
+app.use(express.favicon());
+
+// pass a secret to cookieParser() for signed cookies
+app.use(express.cookieParser('manny is cool'));
+
+// add req.session cookie support
+app.use(express.cookieSession());
+
+// do something with the session
+app.use(count);
+
+// custom middleware
+function count(req, res) {
+    req.session.count = req.session.count || 0;
+    var n = req.session.count++;
+    res.send('viewed ' + n + ' times\n');
+}
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express server listening on port 3000');
+}
+
+///////////////
+
+var api = app;
+
+app.use(express.static(__dirname + '/public'));
+
+// api middleware
+
+api.use(express.logger('dev'));
+api.use(express.bodyParser());
+
+/**
+ * CORS support.
+ */
+
+api.all('*', function (req, res, next) {
+    if (!req.get('Origin')) return next();
+    // use "*" here to accept any origin
+    res.set('Access-Control-Allow-Origin', 'http://localhost:3000');
+    res.set('Access-Control-Allow-Methods', 'GET, POST');
+    res.set('Access-Control-Allow-Headers', 'X-Requested-With, Content-Type');
+    // res.set('Access-Control-Allow-Max-Age', 3600);
+    if ('OPTIONS' == req.method) return res.send(200);
+    next();
+});
+
+/**
+ * POST a user.
+ */
+
+api.post('/user', function (req, res) {
+    console.log(req.body);
+    res.send(201);
+});
+
+app.listen(3000);
+api.listen(3001);
+
+console.log('app listening on 3000');
+console.log('api listening on 3001');
+
+////////////////////
+
+app.get('/', function (req, res) {
+    res.send('<ul>'
+      + '<li>Download <a href="/files/amazing.txt">amazing.txt</a>.</li>'
+      + '<li>Download <a href="/files/missing.txt">missing.txt</a>.</li>'
+      + '</ul>');
+});
+
+// /files/* is accessed via req.params[0]
+// but here we name it :file
+app.get('/files/:file(*)', function (req, res, next?) {
+    var file = req.params.file
+      , path = __dirname + '/files/' + file;
+
+    res.download(path);
+});
+
+// error handling middleware. Because it's
+// below our routes, you will be able to
+// "intercept" errors, otherwise Connect
+// will respond with 500 "Internal Server Error".
+app.use(function (err, req, res, next) {
+    // special-case 404s,
+    // remember you could
+    // render a 404 template here
+    if (404 == err.status) {
+        res.statusCode = 404;
+        res.send('Cant find that file, sorry!');
+    } else {
+        next(err);
+    }
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express started on port 3000');
+}
+
+///////////////////
+
+// Register ejs as .html. If we did
+// not call this, we would need to
+// name our views foo.ejs instead
+// of foo.html. The __express method
+// is simply a function that engines
+// use to hook into the Express view
+// system by default, so if we want
+// to change "foo.ejs" to "foo.html"
+// we simply pass _any_ function, in this
+// case `ejs.__express`.
+
+app.engine('.html', require('ejs').__express);
+
+// Optional since express defaults to CWD/views
+
+app.set('views', __dirname + '/views');
+
+// Without this you would need to
+// supply the extension to res.render()
+// ex: res.render('users.html').
+app.set('view engine', 'html');
+
+app.get('/', function (req, res) {
+    res.render('users', {
+        users: users,
+        title: "EJS example",
+        header: "Some users"
+    });
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express app started on port 3000');
+}
+
+////////////////////
+
+var test: any;
+
+if (!test) app.use(express.logger('dev'));
+app.use(app.router);
+
+// the error handler is strategically
+// placed *below* the app.router; if it
+// were above it would not receive errors
+// from app.get() etc 
+app.use(error);
+
+// error handling middleware have an arity of 4
+// instead of the typical (req, res, next),
+// otherwise they behave exactly like regular
+// middleware, you may have several of them,
+// in different orders etc.
+
+function error(err, req, res, next) {
+    // log it
+    if (!test) console.error(err.stack);
+
+    // respond with 500 "Internal Server Error".
+    res.send(500);
+}
+
+app.get('/', function (req, res) {
+    // Caught and passed down to the errorHandler middleware
+    throw new Error('something broke!');
+});
+
+app.get('/next', function (req, res, next) {
+    // We can also pass exceptions to next()
+    process.nextTick(function () {
+        next(new Error('oh no!'));
+    });
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express started on port 3000');
+}
+
+/////////////////////
+
+var silent: any;
+
+// general config
+app.set('views', __dirname + '/views');
+app.set('view engine', 'jade');
+
+// our custom "verbose errors" setting
+// which we can use in the templates
+// via settings['verbose errors']
+app.enable('verbose errors');
+
+// disable them in production
+// use $ NODE_ENV=production node examples/error-pages
+if ('production' == app.settings.env) {
+    app.disable('verbose errors');
+}
+
+app.use(express.favicon());
+
+silent || app.use(express.logger('dev'));
+
+// "app.router" positions our routes 
+// above the middleware defined below,
+// this means that Express will attempt
+// to match & call routes _before_ continuing
+// on, at which point we assume it's a 404 because
+// no route has handled the request.
+
+app.use(app.router);
+
+// Since this is the last non-error-handling
+// middleware use()d, we assume 404, as nothing else
+// responded.
+
+// $ curl http://localhost:3000/notfound
+// $ curl http://localhost:3000/notfound -H "Accept: application/json"
+// $ curl http://localhost:3000/notfound -H "Accept: text/plain"
+
+app.use(function (req, res, next) {
+    res.status(404);
+
+    // respond with html page
+    if (req.accepts('html')) {
+        res.render('404', { url: req.url });
+        return;
+    }
+
+    // respond with json
+    if (req.accepts('json')) {
+        res.send({ error: 'Not found' });
+        return;
+    }
+
+    // default to plain-text. send()
+    res.type('txt').send('Not found');
+});
+
+// error-handling middleware, take the same form
+// as regular middleware, however they require an
+// arity of 4, aka the signature (err, req, res, next).
+// when connect has an error, it will invoke ONLY error-handling
+// middleware.
+
+// If we were to next() here any remaining non-error-handling
+// middleware would then be executed, or if we next(err) to
+// continue passing the error, only error-handling middleware
+// would remain being executed, however here
+// we simply respond with an error page.
+
+app.use(function (err, req, res, next) {
+    // we may use properties of the error object
+    // here and next(err) appropriately, or if
+    // we possibly recovered from the error, simply next().
+    res.status(err.status || 500);
+    res.render('500', { error: err });
+});
+
+// Routes
+
+app.get('/', function (req, res) {
+    res.render('index.jade');
+});
+
+app.get('/404', function (req, res, next) {
+    // trigger a 404 since no other middleware
+    // will match /404 after this one, and we're not
+    // responding here
+    next();
+});
+
+app.get('/403', function (req, res, next) {
+    // trigger a 403 error
+    var err = <any>new Error('not allowed!');
+    err.status = 403;
+    next(err);
+});
+
+app.get('/500', function (req, res, next) {
+    // trigger a generic (500) error
+    next(new Error('keyboard cat!'));
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    //silent ||  console.log('Express started on port 3000');
+}
+
+///////////////
+
+var fs: any;
+var md: any;
+
+app.set('view engine', 'jade');
+app.set('views', __dirname + '/views');
+
+function User(name) {
+    this.private = 'heyyyy';
+    this.secret = 'something';
+    this.name = name;
+    this.id = 123;
+}
+
+// You'll probably want to do
+// something like this so you
+// dont expose "secret" data.
+
+User.prototype.toJSON = function () {
+    return {
+        id: this.id,
+        name: this.name
+    }
+};
+
+app.use(express.logger('dev'));
+
+// earlier on expose an object
+// that we can tack properties on.
+// all res.locals props are exposed
+// to the templates, so "expose" will
+// be present.
+
+app.use(function (req, res, next) {
+    res.locals.expose = {};
+    // you could alias this as req or res.expose
+    // to make it shorter and less annoying
+    next();
+});
+
+// pretend we loaded a user
+
+app.use(function (req, res, next) {
+    req.user = new User('Tobi');
+    next();
+});
+
+app.get('/', function (req, res) {
+    res.redirect('/user');
+});
+
+app.get('/user', function (req, res) {
+    // we only want to expose the user
+    // to the client for this route:
+    res.locals.expose.user = req.user;
+    res.render('page');
+});
+
+app.listen(3000);
+console.log('app listening on port 3000');
+
+///////////////////////
+
+app.get('/', function (req, res) {
+    res.send('Hello World');
+});
+
+app.listen(3000);
+console.log('Express started on port 3000');
+
+////////////////////
+
+// register .md as an engine in express view system
+
+app.engine('md', function (path, options, fn) {
+    fs.readFile(path, 'utf8', function (err, str) {
+        if (err) return fn(err);
+        try {
+            var html = md(str);
+            html = html.replace(/\{([^}]+)\}/g, function (_, name) {
+                return options[name] || '';
+            })
+            fn(null, html);
+        } catch (err) {
+            fn(err);
+        }
+    });
+})
+
+app.set('views', __dirname + '/views');
+
+// make it the default so we dont need .md
+app.set('view engine', 'md');
+
+app.get('/', function (req, res) {
+    res.render('index', { title: 'Markdown Example' });
+})
+
+app.get('/fail', function (req, res) {
+    res.render('missing', { title: 'Markdown Example' });
+})
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express started on port 3000');
+}
+
+///////////////////////
+
+var mformat: any;
+
+// bodyParser in connect 2.x uses node-formidable to parse 
+// the multipart form data.
+app.use(express.bodyParser())
+
+app.get('/', function (req, res) {
+    res.send('<form method="post" enctype="multipart/form-data">'
+      + '<p>Title: <input type="text" name="title" /></p>'
+      + '<p>Image: <input type="file" name="image" /></p>'
+      + '<p><input type="submit" value="Upload" /></p>'
+      + '</form>');
+});
+
+app.post('/', function (req, res, next) {
+    // the uploaded file can be found as `req.files.image` and the
+    // title field as `req.body.title`
+    res.send(mformat('\nuploaded %s (%d Kb) to %s as %s'
+      , req.files.image.name
+      , req.files.image.size / 1024 | 0
+      , req.files.image.path
+      , req.body.title));
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express started on port 3000');
+}
+
+//////////////////
+
+
+// first:
+// $ npm install redis online
+// $ redis-server
+
+/**
+ * Module dependencies.
+ */
+
+var online: any;
+var redis: any;
+var db: any;
+
+// online
+
+online = online(db);
+
+// activity tracking, in this case using
+// the UA string, you would use req.user.id etc
+
+app.use(function (req, res, next) {
+    // fire-and-forget
+    online.add(req.headers['user-agent']);
+    next();
+});
+
+/**
+ * List helper.
+ */
+
+function list(ids) {
+    return '<ul>' + ids.map(function (id) {
+        return '<li>' + id + '</li>';
+    }).join('') + '</ul>';
+}
+
+/**
+ * GET users online.
+ */
+
+app.get('/', function (req, res, next) {
+    online.last(5, function (err, ids) {
+        if (err) return next(err);
+        res.send('<p>Users online: ' + ids.length + '</p>' + list(ids));
+    });
+});
+
+app.listen(3000);
+console.log('listening on port 3000');
+
+///////////////////
+
+// Convert :to and :from to integers
+
+app.param(['to', 'from'], function (req, res, next, num, name) {
+    req.params[name] = num = parseInt(num, 10);
+    if (isNaN(num)) {
+        next(new Error('failed to parseInt ' + num));
+    } else {
+        next();
+    }
+});
+
+// Load user by id
+
+app.param('user', function (req, res, next, id) {
+    if (req.user = users[id]) {
+        next();
+    } else {
+        next(new Error('failed to find user'));
+    }
+});
+
+/**
+ * GET index.
+ */
+
+app.get('/', function (req, res) {
+    res.send('Visit /user/0 or /users/0-2');
+});
+
+/**
+ * GET :user.
+ */
+
+app.get('/user/:user', function (req, res, next) {
+    res.send('user ' + req.user.name);
+});
+
+/**
+ * GET users :from - :to.
+ */
+
+app.get('/users/:from-:to', function (req, res, next) {
+    var from = req.params.from
+      , to = req.params.to
+      , names = users.map(function (user) { return user.name; });
+    res.send('users ' + names.slice(from, to).join(', '));
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express started on port 3000');
+}
+
+//////////////////
+
+// Ad-hoc example resource method
+
+app.resource = function (path, obj) {
+    this.get(path, obj.index);
+    this.get(path + '/:a..:b.:format?', function (req, res) {
+        var a = parseInt(req.params.a, 10)
+          , b = parseInt(req.params.b, 10)
+          , format = req.params.format;
+        obj.range(req, res, a, b, format);
+    });
+    this.get(path + '/:id', obj.show);
+    this.del(path + '/:id', obj.destroy);
+};
+
+// Fake controller.
+
+var FUser = {
+    index: function (req, res) {
+        res.send(users);
+    },
+    show: function (req, res) {
+        res.send(users[req.params.id] || { error: 'Cannot find user' });
+    },
+    destroy: function (req, res) {
+        var id = req.params.id;
+        var destroyed = id in users;
+        delete users[id];
+        res.send(destroyed ? 'destroyed' : 'Cannot find user');
+    },
+    range: function (req, res, a, b, format) {
+        var range = users.slice(a, b + 1);
+        switch (format) {
+            case 'json':
+                res.send(range);
+                break;
+            case 'html':
+            default:
+                var html = '<ul>' + range.map(function (user) {
+                    return '<li>' + user.name + '</li>';
+                }).join('\n') + '</ul>';
+                res.send(html);
+                break;
+        }
+    }
+};
+
+// curl http://localhost:3000/users     -- responds with all users
+// curl http://localhost:3000/users/1   -- responds with user 1
+// curl http://localhost:3000/users/4   -- responds with error
+// curl http://localhost:3000/users/1..3 -- responds with several users
+// curl -X DELETE http://localhost:3000/users/1  -- deletes the user
+
+app.resource('/users', FUser);
+
+app.get('/', function (req, res) {
+    res.send([
+        '<h1>Examples:</h1> <ul>'
+      , '<li>GET /users</li>'
+      , '<li>GET /users/1</li>'
+      , '<li>GET /users/3</li>'
+      , '<li>GET /users/1..3</li>'
+      , '<li>GET /users/1..3.json</li>'
+      , '<li>DELETE /users/4</li>'
+      , '</ul>'
+    ].join('\n'));
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express started on port 3000');
+}
+
+/////////////////////
+
+
+var verbose: any;
+
+app.map = function (a, route) {
+    route = route || '';
+    for (var key in a) {
+        switch (typeof a[key]) {
+            // { '/path': { ... }}
+            case 'object':
+                app.map(a[key], route + key);
+                break;
+            // get: function(){ ... }
+            case 'function':
+                if (verbose) console.log('%s %s', key, route);
+                app[key](route, a[key]);
+                break;
+        }
+    }
+};
+
+var users2 = {
+    list: function (req, res) {
+        res.send('user list');
+    },
+
+    get: function (req, res) {
+        res.send('user ' + req.params.uid);
+    },
+
+    del: function (req, res) {
+        res.send('delete users');
+    }
+};
+
+var pets2 = {
+    list: function (req, res) {
+        res.send('user ' + req.params.uid + '\'s pets');
+    },
+
+    del: function (req, res) {
+        res.send('delete ' + req.params.uid + '\'s pet ' + req.params.pid);
+    }
+};
+
+app.map({
+    '/users': {
+        get: users2.list,
+        del: users2.del,
+        '/:uid': {
+            get: users.get ,
+            '/pets': {
+                get: pets2.list,
+                '/:pid': {
+                    del: pets2.del
+                }
+            }
+        }
+    }
+});
+
+app.listen(3000);
+
+///////////////////////////
+
+// Example requests:
+//     curl http://localhost:3000/user/0
+//     curl http://localhost:3000/user/0/edit
+//     curl http://localhost:3000/user/1
+//     curl http://localhost:3000/user/1/edit (unauthorized since this is not you)
+//     curl -X DELETE http://localhost:3000/user/0 (unauthorized since you are not an admin)
+
+function loadUser(req, res, next) {
+    // You would fetch your user from the db
+    var user = users[req.params.id];
+    if (user) {
+        req.user = user;
+        next();
+    } else {
+        next(new Error('Failed to load user ' + req.params.id));
+    }
+}
+
+function andRestrictToSelf(req, res, next) {
+    // If our authenticated user is the user we are viewing
+    // then everything is fine :)
+    if (req.authenticatedUser.id == req.user.id) {
+        next();
+    } else {
+        // You may want to implement specific exceptions
+        // such as UnauthorizedError or similar so that you
+        // can handle these can be special-cased in an error handler
+        // (view ./examples/pages for this)
+        next(new Error('Unauthorized'));
+    }
+}
+
+function andRestrictTo(role) {
+    return function (req, res, next) {
+        if (req.authenticatedUser.role == role) {
+            next();
+        } else {
+            next(new Error('Unauthorized'));
+        }
+    }
+}
+
+// Middleware for faux authentication
+// you would of course implement something real,
+// but this illustrates how an authenticated user
+// may interact with middleware
+
+app.use(function (req, res, next) {
+    req.authenticatedUser = users[0];
+    next();
+});
+
+app.get('/', function (req, res) {
+    res.redirect('/user/0');
+});
+
+app.get('/user/:id', loadUser, function (req, res) {
+    res.send('Viewing user ' + req.user.name);
+});
+
+app.get('/user/:id/edit', loadUser, andRestrictToSelf, function (req, res) {
+    res.send('Editing user ' + req.user.name);
+});
+
+app.del('/user/:id', loadUser, andRestrictTo('admin'), function (req, res) {
+    res.send('Deleted user ' + req.user.name);
+});
+
+app.listen(3000);
+console.log('Express app started on port 3000');
+
+/////////////////////////
+
+app.set('view engine', 'jade');
+app.set('views', __dirname);
+
+// populate search
+
+db.sadd('ferret', 'tobi');
+db.sadd('ferret', 'loki');
+db.sadd('ferret', 'jane');
+db.sadd('cat', 'manny');
+db.sadd('cat', 'luna');
+
+/**
+ * GET the search page.
+ */
+
+app.get('/', function (req, res) {
+    res.render('search');
+});
+
+/**
+ * GET search for :query.
+ */
+
+app.get('/search/:query?', function (req, res) {
+    var query = req.params.query;
+    db.smembers(query, function (err, vals) {
+        if (err) return res.send(500);
+        res.send(vals);
+    });
+});
+
+/**
+ * GET client javascript. Here we use sendfile()
+ * because serving __dirname with the static() middleware
+ * would also mean serving our server "index.js" and the "search.jade"
+ * template.
+ */
+
+app.get('/client.js', function (req, res) {
+    res.sendfile(__dirname + '/client.js');
+});
+
+app.listen(3000);
+console.log('app listening on port 3000');
+
+///////////////////
+
+app.use(express.logger('dev'));
+
+// Required by session() middleware
+// pass the secret for signed cookies
+// (required by session())
+app.use(express.cookieParser('keyboard cat'));
+
+// Populates req.session
+app.use(express.session());
+
+app.get('/', function (req, res) {
+    var body = '';
+    if (req.session.views) {
+        ++req.session.views;
+    } else {
+        req.session.views = 1;
+        body += '<p>First time visiting? view this page in several browsers :)</p>';
+    }
+    res.send(body + '<p>viewed <strong>' + req.session.views + '</strong> times.</p>');
+});
+
+app.listen(3000);
+console.log('Express app started on port 3000');
+
+////////////////////////
+
+// log requests
+app.use(express.logger('dev'));
+
+// express on its own has no notion
+// of a "file". The express.static()
+// middleware checks for a file matching
+// the `req.path` within the directory
+// that you pass it. In this case "GET /js/app.js"
+// will look for "./public/js/app.js".
+
+app.use(express.static(__dirname + '/public'));
+
+// if you wanted to "prefix" you may use
+// the mounting feature of Connect, for example
+// "GET /static/js/app.js" instead of "GET /js/app.js".
+// The mount-path "/static" is simply removed before
+// passing control to the express.static() middleware,
+// thus it serves the file correctly by ignoring "/static"
+app.use('/static', express.static(__dirname + '/public'));
+
+// if for some reason you want to serve files from
+// several directories, you can use express.static()
+// multiple times! Here we're passing "./public/css",
+// this will allow "GET /style.css" instead of "GET /css/style.css":
+app.use(express.static(__dirname + '/public/css'));
+
+// this examples does not have any routes, however
+// you may `app.use(app.router)` before or after these
+// static() middleware. If placed before them your routes
+// will be matched BEFORE file serving takes place. If placed
+// after as shown here then file serving is performed BEFORE
+// any routes are hit:
+app.use(app.router);
+
+app.listen(3000);
+console.log('listening on port 3000');
+console.log('try:');
+console.log('  GET /hello.txt');
+console.log('  GET /js/app.js');
+console.log('  GET /css/style.css');
+
+//////////////////
+
+/*
+edit /etc/vhosts:
+
+127.0.0.1       foo.example.com
+127.0.0.1       bar.example.com
+127.0.0.1       example.com
+*/
+
+// Main app
+
+var main = express();
+
+main.use(express.logger('dev'));
+
+main.get('/', function (req, res) {
+    res.send('Hello from main app!')
+});
+
+main.get('/:sub', function (req, res) {
+    res.send('requsted ' + req.params.sub);
+});
+
+// Redirect app
+
+var redirect = express();
+
+redirect.all('*', function (req, res) {
+    console.log(req.subdomains);
+    res.redirect('http://example.com:3000/' + req.subdomains[0]);
+});
+
+app.use(express.vhost('*.example.com', redirect))
+app.use(express.vhost('example.com', main));
+
+app.listen(3000);
+console.log('Express app started on port 3000');
+
+////////////////////
+
+// create an error with .status. we
+// can then use the property in our
+// custom error handler (Connect repects this prop as well)
+
+function merror(status, msg) {
+    var err = <any>new Error(msg);
+    err.status = status;
+    return err;
+}
+
+// if we wanted to supply more than JSON, we could
+// use something similar to the content-negotiation
+// example.
+
+// here we validate the API key,
+// by mounting this middleware to /api
+// meaning only paths prefixed with "/api"
+// will cause this middleware to be invoked
+
+app.use('/api', function (req, res, next) {
+    var key = req.query['api-key'];
+
+    // key isnt present
+    if (!key) return next(merror(400, 'api key required'));
+
+    // key is invalid
+    if (!~apiKeys.indexOf(key)) return next(merror(401, 'invalid api key'));
+
+    // all good, store req.key for route access
+    req.key = key;
+    next();
+});
+
+// position our routes above the error handling middleware,
+// and below our API middleware, since we want the API validation
+// to take place BEFORE our routes
+app.use(app.router);
+
+// middleware with an arity of 4 are considered
+// error handling middleware. When you next(err)
+// it will be passed through the defined middleware
+// in order, but ONLY those with an arity of 4, ignoring
+// regular middleware.
+app.use(function (err, req, res, next) {
+    // whatever you want here, feel free to populate
+    // properties on `err` to treat it differently in here.
+    res.send(err.status || 500, { error: err.message });
+});
+
+// our custom JSON 404 middleware. Since it's placed last
+// it will be the last middleware called, if all others
+// invoke next() and do not respond.
+app.use(function (req, res) {
+    res.send(404, { error: "Lame, can't find that" });
+});
+
+// map of valid api keys, typically mapped to
+// account info with some sort of database like redis.
+// api keys do _not_ serve as authentication, merely to
+// track API usage or help prevent malicious behavior etc.
+
+var apiKeys = ['foo', 'bar', 'baz'];
+
+// these two objects will serve as our faux database
+
+var repos = [
+    { name: 'express', url: 'http://github.com/visionmedia/express' }
+  , { name: 'stylus', url: 'http://github.com/learnboost/stylus' }
+  , { name: 'cluster', url: 'http://github.com/learnboost/cluster' }
+];
+
+var userRepos = {
+    tobi: [repos[0], repos[1]]
+  , loki: [repos[1]]
+  , jane: [repos[2]]
+};
+
+// we now can assume the api key is valid,
+// and simply expose the data
+
+app.get('/api/users', function (req, res, next) {
+    res.send(users);
+});
+
+app.get('/api/repos', function (req, res, next) {
+    res.send(repos);
+});
+
+app.get('/api/user/:name/repos', function (req, res, next) {
+    var name = req.params.name
+      , user = userRepos[name];
+
+    if (user) res.send(user);
+    else next();
+});
+
+if (!module.parent) {
+    app.listen(3000);
+    console.log('Express server listening on port 3000');
+}
+
+////// 
 
 function test_general() {
 
@@ -97,7 +1337,7 @@ function test_general() {
 }
 
 function test_request() {
-    var req: Express.ServerRequest;
+    var req: ExpressServerRequest;
     req.params.name;
     req.params[0];
     req.query.q;
@@ -130,7 +1370,7 @@ function test_request() {
 }
 
 function test_response() {
-    var res: Express.ServerResponse;
+    var res: ExpressServerResponse;
     res.status(404).sendfile('path/to/404.png');
     res.set('Content-Type', 'text/plain');
     res.set({
diff --git a/express/express.d.ts b/express/express.d.ts
index c8fe6bec31..8e19ab0049 100644
--- a/express/express.d.ts
+++ b/express/express.d.ts
@@ -1,218 +1,1954 @@
-// Type definitions for Express 3.0
+// Type definitions for Express 3.1
 // Project: http://expressjs.com
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// DefinitelyTyped: https://github.com/borisyankov/DefinitelyTyped
 
-/* 
-USAGE
+/* =================== USAGE =================== 
 
-///<reference path="./DefinitelyTyped/Definitions/express-3.0.d.ts"/>
-import express = module('express')
-var app = <express.ServerApplication> express()
-...
+    import express = module('express');
+    var app = express();
 
-MIDDLEWARE
+ =============================================== */
 
-express exports lots of middleware, like .static, .session, etc, but use connect so you don't have to escape
-var connect = require('connect')
-connect.session({})
+/// <reference path="../node/node.d.ts" />
 
-*/
+interface Route {
+    path: string;
 
-///<reference path='../node/node.d.ts' />
+    method: string;
 
-// do not reference this. use module('express') instead
-declare module _express {
+    callbacks: Function[];
 
-  import http = module("http");
+    regexp: any;
 
-  export interface Handler {
-      (req: ServerRequest, res: ServerResponse, next?: Function): void;
-  }
+    /**
+    * Check if this route matches `path`, if so
+    * populate `.params`.
+    */
+    match(path: string): bool;
+}
+declare var Route: {
+    /**
+     * Initialize `Route` with the given HTTP `method`, `path`,
+     * and an array of `callbacks` and `options`.
+     *
+     * Options:
+     *
+     *   - `sensitive`    enable case-sensitive routes
+     *   - `strict`       enable strict matching for trailing slashes
+     *
+     * @param method
+     * @param path
+     * @param callbacks
+     * @param options
+     */
+    new (method: string, path: string, callbacks: Function[], options: any): Route;
+}
 
-  export interface Errback { (err: Error): void; }
+interface Handler {
+    (req: ExpressServerRequest, res: ExpressServerResponse, next?: Function): void;
+}
 
-  export interface CookieOptions {
-      maxAge?: number;
-      signed?: bool;
-      expires?: Date;
-      httpOnly?: bool;
-      path?: string;
-      domain?: string;
-      secure?: bool;
-  }
+interface CookieOptions {
+    maxAge?: number;
+    signed?: bool;
+    expires?: Date;
+    httpOnly?: bool;
+    path?: string;
+    domain?: string;
+    secure?: bool;
+}
 
-  export interface ExpressSettings {
-      env?: string;
-      views?: string;
-  }
+interface Errback { (err: Error): void; }
 
-  export interface ServerApplication {
 
-      settings: ExpressSettings;
-      locals: any;
-      routes: any;
+interface ExpressSession {
+    /**
+     * Update reset `.cookie.maxAge` to prevent
+     * the cookie from expiring when the
+     * session is still active.
+     *
+     * @return {Session} for chaining
+     * @api public
+     */
+    touch(): ExpressSession;
 
-      (): ServerApplication;
+    /**
+     * Reset `.maxAge` to `.originalMaxAge`.
+     */
+    resetMaxAge(): ExpressSession;
 
-      router: Handler;
+    /**
+     * Save the session data with optional callback `fn(err)`.
+     */
+    save(fn: Function): ExpressSession;
 
-      use(route: string, callback: Function): ServerApplication;
-      use(route: string, server: ServerApplication): ServerApplication;
-      use(callback: Function): ServerApplication;
-      use(server: ServerApplication): ServerApplication;
+    /**
+     * Re-loads the session data _without_ altering
+     * the maxAge properties. Invokes the callback `fn(err)`,
+     * after which time if no exception has occurred the
+     * `req.session` property will be a new `Session` object,
+     * although representing the same session.
+     */
+    reload(fn: Function): ExpressSession;
 
-      engine(ext: string, callback: Function): ServerApplication;
+    /**
+     * Destroy `this` session.
+     */
+    destroy(fn: Function): ExpressSession;
 
-      param(param: Function): ServerApplication;
-      param(name: string, callback: Function): ServerApplication;
-      param(name: string, expressParam: any): ServerApplication;
-      param(name: any[], callback: Function): ServerApplication;
+    /**
+     * Regenerate this request's session.
+     */
+    regenerate(fn: Function): ExpressSession;
 
-      set(name: string): ServerApplication;
-      set(name: string, val: any): ServerApplication;
+    user: any;
 
-      enabled(name: string): bool;
-      disabled(name: string): bool;
+    error: string;
 
-      enable(name: string): ServerApplication;
-      disable(name: string): ServerApplication;
+    success: string;
 
-      configure(env: string, callback: () => void ): ServerApplication;
-      configure(...params: any[]): ServerApplication; // covering this case: (...env: string[], callback: () => void)
-      configure(callback: () => void ): ServerApplication;
+    views: any;
+}
+declare var ExpressSession: {
+    /**
+     * Create a new `Session` with the given request and `data`.
+     */
+    new (req: ExpressServerRequest, data: any): ExpressSession;
+}
 
-      all(path: string, ...callbacks: Function[]): void;
+interface ExpressServerRequest {
 
-      render(view: string, callback: (err: Error, html) => void ): void;
-      render(view: string, optionss: any, callback: (err: Error, html) => void ): void;
+    session: ExpressSession;
 
-      listen(port: number, hostname: string, backlog: number, callback: Function): void;
-      listen(port: number, callback: Function): void;
-      listen(path: string, callback?: Function): void;
-      listen(handle: any, listeningListener?: Function): void;
+    /**
+     * Return request header.
+     *
+     * The `Referrer` header field is special-cased,
+     * both `Referrer` and `Referer` are interchangeable.
+     *
+     * Examples:
+     *
+     *     req.get('Content-Type');
+     *     // => "text/plain"
+     *
+     *     req.get('content-type');
+     *     // => "text/plain"
+     *
+     *     req.get('Something');
+     *     // => undefined
+     *
+     * Aliased as `req.header()`.
+     *
+     * @param name
+     */
+    get (name: string): string;
 
-      get(name: string): any;
-      get(path: RegExp, handler: Handler): void;
-      get(path: string, ...callbacks: Handler[]): void;
+    header(name: string): string;
 
-      post(path: RegExp, handler: Handler ): void;
-      post(path: string, ...callbacks: Handler[]): void;
+    /**
+     * Check if the given `type(s)` is acceptable, returning
+     * the best match when true, otherwise `undefined`, in which
+     * case you should respond with 406 "Not Acceptable".
+     *
+     * The `type` value may be a single mime type string
+     * such as "application/json", the extension name
+     * such as "json", a comma-delimted list such as "json, html, text/plain",
+     * or an array `["json", "html", "text/plain"]`. When a list
+     * or array is given the _best_ match, if any is returned.
+     *
+     * Examples:
+     *
+     *     // Accept: text/html
+     *     req.accepts('html');
+     *     // => "html"
+     *
+     *     // Accept: text/*, application/json
+     *     req.accepts('html');
+     *     // => "html"
+     *     req.accepts('text/html');
+     *     // => "text/html"
+     *     req.accepts('json, text');
+     *     // => "json"
+     *     req.accepts('application/json');
+     *     // => "application/json"
+     *
+     *     // Accept: text/*, application/json
+     *     req.accepts('image/png');
+     *     req.accepts('png');
+     *     // => undefined
+     *
+     *     // Accept: text/*;q=.5, application/json
+     *     req.accepts(['html', 'json']);
+     *     req.accepts('html, json');
+     *     // => "json"
+     */
+    accepts(type: string): string;
 
-      put(path: RegExp, handler: Handler ): void;
-      put(path: string, ...callbacks: Handler[]): void;
+    accepts(type: string[]): string;
 
-      del(path: RegExp, handler: Handler ): void;
-      del(path: string, ...callbacks: Handler[]): void;
-  }
+    /**
+     * Check if the given `charset` is acceptable,
+     * otherwise you should respond with 406 "Not Acceptable".
+     *
+     * @param charset
+     */
+    acceptsCharset(charset: string): bool;
 
-  export interface ServerRequest extends http.ServerRequest {
+    /**
+     * Check if the given `lang` is acceptable,
+     * otherwise you should respond with 406 "Not Acceptable".
+     *
+     * @param lang
+     */
+    acceptsLanguage(lang: string): bool;
 
-      accepted: any[];
-      acceptedLanguages: string[];
-      acceptedCharsets: string[];
+    /**
+     * Parse Range header field,
+     * capping to the given `size`.
+     *
+     * Unspecified ranges such as "0-" require
+     * knowledge of your resource length. In
+     * the case of a byte range this is of course
+     * the total number of bytes. If the Range
+     * header field is not given `null` is returned,
+     * `-1` when unsatisfiable, `-2` when syntactically invalid.
+     *
+     * NOTE: remember that ranges are inclusive, so
+     * for example "Range: users=0-3" should respond
+     * with 4 users when available, not 3.
+     *
+     * @param size
+     */
+    range(size: number): Array;
 
-      params: any;
-      query: any;
-      body: any;
-      files: any;
+    /**
+     * Return an array of Accepted media types
+     * ordered from highest quality to lowest.
+     *
+     * Examples:
+     *
+     *     [ { value: 'application/json',
+     *         quality: 1,
+     *         type: 'application',
+     *         subtype: 'json' },
+     *       { value: 'text/html',
+     *         quality: 0.5,
+     *         type: 'text',
+     *         subtype: 'html' } ]
+     */
+    accepted: Array;
 
-      route: any;
-      cookies: any;
-      signedCookies: any;
+    /**
+     * Return an array of Accepted languages
+     * ordered from highest quality to lowest.
+     *
+     * Examples:
+     *
+     *     Accept-Language: en;q=.5, en-us
+     *     ['en-us', 'en']
+     */
+    acceptedLanguages: Array;
 
-      get(field: string): string;
-      header(field: string): string;
+    /**
+     * Return an array of Accepted charsets
+     * ordered from highest quality to lowest.
+     *
+     * Examples:
+     *
+     *     Accept-Charset: iso-8859-5;q=.2, unicode-1-1;q=0.8
+     *     ['unicode-1-1', 'iso-8859-5']
+     */
+    acceptedCharsets: Array;
 
-      accepts(types: string): any;
-      accepts(types: string[]): any;
-      acceptsCharset(charset: string): bool;
-      acceptsLanguage(lang: string): bool;
+    /**
+     * Return the value of param `name` when present or `defaultValue`.
+     *
+     *  - Checks route placeholders, ex: _/user/:id_
+     *  - Checks body params, ex: id=12, {"id":12}
+     *  - Checks query string params, ex: ?id=12
+     *
+     * To utilize request bodies, `req.body`
+     * should be an object. This can be done by using
+     * the `connect.bodyParser()` middleware.
+     *
+     * @param name
+     * @param defaultValue
+     */
+    param(name: string, defaultValue?: any): string;
 
-      range(size: number): number[];
+    /**
+     * Check if the incoming request contains the "Content-Type"
+     * header field, and it contains the give mime `type`.
+     *
+     * Examples:
+     *
+     *      // With Content-Type: text/html; charset=utf-8
+     *      req.is('html');
+     *      req.is('text/html');
+     *      req.is('text/*');
+     *      // => true
+     *
+     *      // When Content-Type is application/json
+     *      req.is('json');
+     *      req.is('application/json');
+     *      req.is('application/*');
+     *      // => true
+     *
+     *      req.is('html');
+     *      // => false
+     *
+     * @param type
+     */
+    is(type: string): bool;
 
-      param(name: string, defaultValue?: any): string;
-      is(type: string): bool;
+    /**
+     * Return the protocol string "http" or "https"
+     * when requested with TLS. When the "trust proxy"
+     * setting is enabled the "X-Forwarded-Proto" header
+     * field will be trusted. If you're running behind
+     * a reverse proxy that supplies https for you this
+     * may be enabled.
+     */
+    protocol: string;
 
-      protocol: string;
-      secure: bool;
-      ip: string;
-      ips: string[];
-      auth: any;
-      subdomains: string[];
-      path: string;
-      host: string;
-      fresh: bool;
-      stale: bool;
-      xhr: bool;
-  }
+    /**
+     * Short-hand for:
+     *
+     *    req.protocol == 'https'
+     */
+    secure: bool;
 
-  export interface ServerResponse extends http.ServerResponse {
+    /**
+     * Return the remote address, or when
+     * "trust proxy" is `true` return
+     * the upstream addr.
+     */
+    ip: string;
 
-      charset: string;
-      locals: any;
+    /**
+     * When "trust proxy" is `true`, parse
+     * the "X-Forwarded-For" ip address list.
+     *
+     * For example if the value were "client, proxy1, proxy2"
+     * you would receive the array `["client", "proxy1", "proxy2"]`
+     * where "proxy2" is the furthest down-stream.
+     */
+    ips: string[];
 
-      status(code: number): ServerResponse;
-      links(links: any): ServerResponse;
+    /**
+     * Return basic auth credentials.
+     *
+     * Examples:
+     *
+     *    // http://tobi:hello@example.com
+     *    req.auth
+     *    // => { username: 'tobi', password: 'hello' }
+     */
+    auth: any;
 
-      send(status: number): ServerResponse;
-      send(bodyOrStatus: any): ServerResponse;
-      send(status: number, body: any): ServerResponse;
-      json(status: number): ServerResponse;
-      json(bodyOrStatus: any): ServerResponse;
-      json(status: number, body: any): ServerResponse;
-      jsonp(status: number): ServerResponse;
-      jsonp(bodyOrStatus: any): ServerResponse;
-      jsonp(status: number, body: any): ServerResponse;
+    /**
+     * Return subdomains as an array.
+     *
+     * Subdomains are the dot-separated parts of the host before the main domain of
+     * the app. By default, the domain of the app is assumed to be the last two
+     * parts of the host. This can be changed by setting "subdomain offset".
+     *
+     * For example, if the domain is "tobi.ferrets.example.com":
+     * If "subdomain offset" is not set, req.subdomains is `["ferrets", "tobi"]`.
+     * If "subdomain offset" is 3, req.subdomains is `["tobi"]`.
+     */
+    subdomains: string[];
 
-      sendfile(path: string): void;
-      sendfile(path: string, options: any): void;
-      sendfile(path: string, fn: Errback): void;
-      sendfile(path: string, options: any, fn: Errback): void;
-      download(path: string): void;
-      download(path: string, filename: string): void;
-      download(path: string, fn: Errback): void;
-      download(path: string, filename: string, fn: Errback): void;
+    /**
+     * Short-hand for `url.parse(req.url).pathname`.
+     */
+    path: string;
 
-      type(type: string): ServerResponse;
-      contentType(type: string): ServerResponse;
+    /**
+     * Parse the "Host" header field hostname.
+     */
+    host: string;
 
-      format(object: any): ServerResponse;
-      attachment(filename?: string): ServerResponse;
+    /**
+     * Check if the request is fresh, aka
+     * Last-Modified and/or the ETag
+     * still match.
+     */
+    fresh: bool;
 
-      set(field: any): void;
-      set(field: string, value: string): void;
-      header(field: any): void;
-      header(field: string, value: string): void;
+    /**
+     * Check if the request is stale, aka
+     * "Last-Modified" and / or the "ETag" for the
+     * resource has changed.
+     */
+    stale: bool;
 
-      get(field: string): string;
+    /**
+     * Check if the request was an _XMLHttpRequest_.
+     */
+    xhr: bool;
 
-      clearCookie(name: string, options?: any): ServerResponse;
-      cookie(name: string, value: any, options?: CookieOptions): ServerResponse;
+    //body: { username: string; password: string; remember: bool; title: string; };
+    body: any;
 
-      redirect(url: string): void;
-      redirect(status: number, url: string): void;
-      redirect(url: string, status: number): void;
+    //cookies: { string; remember: bool; };
+    cookies: any;
 
-      render(view: string, options: any): void;
-      render(view: string, callback: (err: Error, html: any) => void ): void;
-      render(view: string, options: any, callback: (err: Error, html: any) => void ): void;
-  }
+    method: string;
+
+    params: any;
+
+    user: any;
+
+    files: any;
+
+    /**
+     * Clear cookie `name`.
+     *
+     * @param name
+     * @param options
+     */
+    clearCookie(name: string, options?: any): ExpressServerResponse;
+
+    query: any;
+
+    route: any;
+
+    signedCookies: any;
+
+    originalUrl: string;
+}
+
+interface ExpressServerResponse {
+    /**
+     * Set status `code`.
+     *
+     * @param code
+     */
+    status(code: number): ExpressServerResponse;
+
+    /**
+     * Set Link header field with the given `links`.
+     *
+     * Examples:
+     *
+     *    res.links({
+     *      next: 'http://api.example.com/users?page=2',
+     *      last: 'http://api.example.com/users?page=5'
+     *    });
+     *
+     * @param links
+     */
+    links(links: any): ExpressServerResponse;
+
+    /**
+     * Send a response.
+     *
+     * Examples:
+     *
+     *     res.send(new Buffer('wahoo'));
+     *     res.send({ some: 'json' });
+     *     res.send('<p>some html</p>');
+     *     res.send(404, 'Sorry, cant find that');
+     *     res.send(404);
+     */
+    send(status: number): ExpressServerResponse;
+
+    send(bodyOrStatus: any): ExpressServerResponse;
+
+    send(status: number, body: any): ExpressServerResponse;
+
+
+    /**
+     * Send JSON response.
+     *
+     * Examples:
+     *
+     *     res.json(null);
+     *     res.json({ user: 'tj' });
+     *     res.json(500, 'oh noes!');
+     *     res.json(404, 'I dont have that');
+     */
+    json(status: number): ExpressServerResponse;
+
+    json(bodyOrStatus: any): ExpressServerResponse;
+
+    json(status: number, body: any): ExpressServerResponse;
+
+    /**
+     * Send JSON response with JSONP callback support.
+     *
+     * Examples:
+     *
+     *     res.jsonp(null);
+     *     res.jsonp({ user: 'tj' });
+     *     res.jsonp(500, 'oh noes!');
+     *     res.jsonp(404, 'I dont have that');
+     */
+    jsonp(status: number): ExpressServerResponse;
+
+    jsonp(bodyOrStatus: any): ExpressServerResponse;
+
+    jsonp(status: number, body: any): ExpressServerResponse;
+
+    /**
+     * Transfer the file at the given `path`.
+     *
+     * Automatically sets the _Content-Type_ response header field.
+     * The callback `fn(err)` is invoked when the transfer is complete
+     * or when an error occurs. Be sure to check `res.sentHeader`
+     * if you wish to attempt responding, as the header and some data
+     * may have already been transferred.
+     *
+     * Options:
+     *
+     *   - `maxAge` defaulting to 0
+     *   - `root`   root directory for relative filenames
+     *
+     * Examples:
+     *
+     *  The following example illustrates how `res.sendfile()` may
+     *  be used as an alternative for the `static()` middleware for
+     *  dynamic situations. The code backing `res.sendfile()` is actually
+     *  the same code, so HTTP cache support etc is identical.
+     *
+     *     app.get('/user/:uid/photos/:file', function(req, res){
+     *       var uid = req.params.uid
+     *         , file = req.params.file;
+     *
+     *       req.user.mayViewFilesFrom(uid, function(yes){
+     *         if (yes) {
+     *           res.sendfile('/uploads/' + uid + '/' + file);
+     *         } else {
+     *           res.send(403, 'Sorry! you cant see that.');
+     *         }
+     *       });
+     *     });
+     */
+    sendfile(path: string): void;
+
+    sendfile(path: string, options: any): void;
+
+    sendfile(path: string, fn: Errback): void;
+
+    sendfile(path: string, options: any, fn: Errback): void;
+
+    /**
+     * Transfer the file at the given `path` as an attachment.
+     *
+     * Optionally providing an alternate attachment `filename`,
+     * and optional callback `fn(err)`. The callback is invoked
+     * when the data transfer is complete, or when an error has
+     * ocurred. Be sure to check `res.headerSent` if you plan to respond.
+     *
+     * This method uses `res.sendfile()`.
+     */
+    download(path: string): void;
+
+    download(path: string, filename: string): void;
+
+    download(path: string, fn: Errback): void;
+
+    download(path: string, filename: string, fn: Errback): void;
+
+    /**
+     * Set _Content-Type_ response header with `type` through `mime.lookup()`
+     * when it does not contain "/", or set the Content-Type to `type` otherwise.
+     *
+     * Examples:
+     *
+     *     res.type('.html');
+     *     res.type('html');
+     *     res.type('json');
+     *     res.type('application/json');
+     *     res.type('png');
+     *
+     * @param type
+     */
+    contentType(type: string): ExpressServerResponse;
+
+    /**
+     * Set _Content-Type_ response header with `type` through `mime.lookup()`
+     * when it does not contain "/", or set the Content-Type to `type` otherwise.
+     *
+     * Examples:
+     *
+     *     res.type('.html');
+     *     res.type('html');
+     *     res.type('json');
+     *     res.type('application/json');
+     *     res.type('png');
+     *
+     * @param type
+     */
+    type(type: string): ExpressServerResponse;
+
+    /**
+     * Respond to the Acceptable formats using an `obj`
+     * of mime-type callbacks.
+     *
+     * This method uses `req.accepted`, an array of
+     * acceptable types ordered by their quality values.
+     * When "Accept" is not present the _first_ callback
+     * is invoked, otherwise the first match is used. When
+     * no match is performed the server responds with
+     * 406 "Not Acceptable".
+     *
+     * Content-Type is set for you, however if you choose
+     * you may alter this within the callback using `res.type()`
+     * or `res.set('Content-Type', ...)`.
+     *
+     *    res.format({
+     *      'text/plain': function(){
+     *        res.send('hey');
+     *      },
+     *
+     *      'text/html': function(){
+     *        res.send('<p>hey</p>');
+     *      },
+     *
+     *      'appliation/json': function(){
+     *        res.send({ message: 'hey' });
+     *      }
+     *    });
+     *
+     * In addition to canonicalized MIME types you may
+     * also use extnames mapped to these types:
+     *
+     *    res.format({
+     *      text: function(){
+     *        res.send('hey');
+     *      },
+     *
+     *      html: function(){
+     *        res.send('<p>hey</p>');
+     *      },
+     *
+     *      json: function(){
+     *        res.send({ message: 'hey' });
+     *      }
+     *    });
+     *
+     * By default Express passes an `Error`
+     * with a `.status` of 406 to `next(err)`
+     * if a match is not made. If you provide
+     * a `.default` callback it will be invoked
+     * instead.
+     *
+     * @param obj
+     */
+    format(obj: any): ExpressServerResponse;
+
+    /**
+     * Set _Content-Disposition_ header to _attachment_ with optional `filename`.
+     *
+     * @param filename
+     */
+    attachment(filename?: string): ExpressServerResponse;
+
+    /**
+     * Set header `field` to `val`, or pass
+     * an object of header fields.
+     *
+     * Examples:
+     *
+     *    res.set('Foo', ['bar', 'baz']);
+     *    res.set('Accept', 'application/json');
+     *    res.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
+     *
+     * Aliased as `res.header()`.
+     */
+    set (field: any): void;
+
+    set (field: string, value?: string): void;
+
+    header(field: any): void;
+
+    header(field: string, value?: string): void;
+
+    /**
+     * Get value for header `field`.
+     *
+     * @param field
+     */
+    get (field: string): string;
+
+    /**
+     * Clear cookie `name`.
+     *
+     * @param name
+     * @param options
+     */
+    clearCookie(name: string, options?: any): ExpressServerResponse;
+
+    /**
+     * Set cookie `name` to `val`, with the given `options`.
+     *
+     * Options:
+     *
+     *    - `maxAge`   max-age in milliseconds, converted to `expires`
+     *    - `signed`   sign the cookie
+     *    - `path`     defaults to "/"
+     *
+     * Examples:
+     *
+     *    // "Remember Me" for 15 minutes
+     *    res.cookie('rememberme', '1', { expires: new Date(Date.now() + 900000), httpOnly: true });
+     *
+     *    // save as above
+     *    res.cookie('rememberme', '1', { maxAge: 900000, httpOnly: true })
+     */
+    cookie(name: string, val: string, options: CookieOptions);
+
+    cookie(name: string, val: any, options: CookieOptions);
+
+    cookie(name: string, val: any);
+
+    /**
+     * Set the location header to `url`.
+     *
+     * The given `url` can also be the name of a mapped url, for
+     * example by default express supports "back" which redirects
+     * to the _Referrer_ or _Referer_ headers or "/".
+     *
+     * Examples:
+     *
+     *    res.location('/foo/bar').;
+     *    res.location('http://example.com');
+     *    res.location('../login'); // /blog/post/1 -> /blog/login
+     *
+     * Mounting:
+     *
+     *   When an application is mounted and `res.location()`
+     *   is given a path that does _not_ lead with "/" it becomes
+     *   relative to the mount-point. For example if the application
+     *   is mounted at "/blog", the following would become "/blog/login".
+     *
+     *      res.location('login');
+     *
+     *   While the leading slash would result in a location of "/login":
+     *
+     *      res.location('/login');
+     *
+     * @param url
+     */
+    location(url: string);
+
+    /**
+     * Redirect to the given `url` with optional response `status`
+     * defaulting to 302.
+     *
+     * The resulting `url` is determined by `res.location()`, so
+     * it will play nicely with mounted apps, relative paths,
+     * `"back"` etc.
+     *
+     * Examples:
+     *
+     *    res.redirect('/foo/bar');
+     *    res.redirect('http://example.com');
+     *    res.redirect(301, 'http://example.com');
+     *    res.redirect('http://example.com', 301);
+     *    res.redirect('../login'); // /blog/post/1 -> /blog/login
+     */
+    redirect(url: string): void;
+
+    redirect(status: number, url: string): void;
+
+    redirect(url: string, status: number): void;
+
+    /**
+     * Render `view` with the given `options` and optional callback `fn`.
+     * When a callback function is given a response will _not_ be made
+     * automatically, otherwise a response of _200_ and _text/html_ is given.
+     *
+     * Options:
+     *
+     *  - `cache`     boolean hinting to the engine it should cache
+     *  - `filename`  filename of the view being rendered
+     */
+    render(view: string): void;
+
+    render(view: string, options: any): void;
+
+    render(view: string, callback: (err: Error, html: any) => void ): void;
+
+    render(view: string, options: any, callback: (err: Error, html: any) => void ): void;
+
+    locals: any;
+
+    charset: string;
+}
+
+interface ExpressApplication {
+    /**
+     * Initialize the server.
+     *
+     *   - setup default configuration
+     *   - setup default middleware
+     *   - setup route reflection methods
+     */
+    init();
+
+    /**
+     * Initialize application configuration.
+     */
+    defaultConfiguration();
+
+    /**
+     * Proxy `connect#use()` to apply settings to
+     * mounted applications.
+    **/
+    use(route: string, callback?: Function): ExpressApplication;
+
+    use(route: string, server: ExpressApplication): ExpressApplication;
+
+    use(callback: Function): ExpressApplication;
+
+    use(server: ExpressApplication): ExpressApplication;
+
+    /**
+     * Register the given template engine callback `fn`
+     * as `ext`.
+     *
+     * By default will `require()` the engine based on the
+     * file extension. For example if you try to render
+     * a "foo.jade" file Express will invoke the following internally:
+     *
+     *     app.engine('jade', require('jade').__express);
+     *
+     * For engines that do not provide `.__express` out of the box,
+     * or if you wish to "map" a different extension to the template engine
+     * you may use this method. For example mapping the EJS template engine to
+     * ".html" files:
+     *
+     *     app.engine('html', require('ejs').renderFile);
+     *
+     * In this case EJS provides a `.renderFile()` method with
+     * the same signature that Express expects: `(path, options, callback)`,
+     * though note that it aliases this method as `ejs.__express` internally
+     * so if you're using ".ejs" extensions you dont need to do anything.
+     *
+     * Some template engines do not follow this convention, the
+     * [Consolidate.js](https://github.com/visionmedia/consolidate.js)
+     * library was created to map all of node's popular template
+     * engines to follow this convention, thus allowing them to
+     * work seamlessly within Express.
+     */
+    engine(ext: string, fn: Function): ExpressApplication;
+
+    /**
+     * Map the given param placeholder `name`(s) to the given callback(s).
+     *
+     * Parameter mapping is used to provide pre-conditions to routes
+     * which use normalized placeholders. For example a _:user_id_ parameter
+     * could automatically load a user's information from the database without
+     * any additional code,
+     *
+     * The callback uses the samesignature as middleware, the only differencing
+     * being that the value of the placeholder is passed, in this case the _id_
+     * of the user. Once the `next()` function is invoked, just like middleware
+     * it will continue on to execute the route, or subsequent parameter functions.
+     *
+     *      app.param('user_id', function(req, res, next, id){
+     *        User.find(id, function(err, user){
+     *          if (err) {
+     *            next(err);
+     *          } else if (user) {
+     *            req.user = user;
+     *            next();
+     *          } else {
+     *            next(new Error('failed to load user'));
+     *          }
+     *        });
+     *      });
+     *
+     * @param name
+     * @param fn
+     */
+    param(name: string, fn: Function): ExpressApplication;
+
+    param(name: Array, fn: Function): ExpressApplication;
+
+    /**
+     * Assign `setting` to `val`, or return `setting`'s value.
+     *
+     *    app.set('foo', 'bar');
+     *    app.get('foo');
+     *    // => "bar"
+     *
+     * Mounted servers inherit their parent server's settings.
+     *
+     * @param setting
+     * @param val
+     */
+    set (setting: string, val: string): ExpressApplication;
+
+    /**
+     * Return the app's absolute pathname
+     * based on the parent(s) that have
+     * mounted it.
+     *
+     * For example if the application was
+     * mounted as "/admin", which itself
+     * was mounted as "/blog" then the
+     * return value would be "/blog/admin".
+     */
+    path(): string;
+
+    /**
+     * Check if `setting` is enabled (truthy).
+     *
+     *    app.enabled('foo')
+     *    // => false
+     *
+     *    app.enable('foo')
+     *    app.enabled('foo')
+     *    // => true
+     */
+    enabled(setting: string): bool;
+
+    /**
+     * Check if `setting` is disabled.
+     *
+     *    app.disabled('foo')
+     *    // => true
+     *
+     *    app.enable('foo')
+     *    app.disabled('foo')
+     *    // => false
+     *
+     * @param setting
+     */
+    disabled(setting: string): bool;
+
+    /**
+     * Enable `setting`.
+     *
+     * @param setting
+     */
+    enable(setting: string): ExpressApplication;
+
+    /**
+     * Disable `setting`.
+     *
+     * @param setting
+     */
+    disable(setting: string): ExpressApplication;
+
+    /**
+     * Configure callback for zero or more envs,
+     * when no `env` is specified that callback will
+     * be invoked for all environments. Any combination
+     * can be used multiple times, in any order desired.
+     *
+     * Examples:
+     *
+     *    app.configure(function(){
+     *      // executed for all envs
+     *    });
+     *
+     *    app.configure('stage', function(){
+     *      // executed staging env
+     *    });
+     *
+     *    app.configure('stage', 'production', function(){
+     *      // executed for stage and production
+     *    });
+     *
+     * Note:
+     *
+     *  These callbacks are invoked immediately, and
+     *  are effectively sugar for the following:
+     *
+     *     var env = process.env.NODE_ENV || 'development';
+     *
+     *      switch (env) {
+     *        case 'development':
+     *          ...
+     *          break;
+     *        case 'stage':
+     *          ...
+     *          break;
+     *        case 'production':
+     *          ...
+     *          break;
+     *      }
+     *
+     * @param env
+     * @param fn
+     */
+    configure(env: string, fn: Function): ExpressApplication;
+
+    configure(env0: string, env1: string, fn: Function): ExpressApplication;
+
+    configure(env0: string, env1: string, env2: string, fn: Function): ExpressApplication;
+
+    configure(env0: string, env1: string, env2: string, env3: string, fn: Function): ExpressApplication;
+
+    configure(env0: string, env1: string, env2: string, env3: string, env4: string, fn: Function): ExpressApplication;
+
+    configure(fn: Function): ExpressApplication;
+
+    /**
+     * Special-cased "all" method, applying the given route `path`,
+     * middleware, and callback to _every_ HTTP method.
+     *
+     * @param path
+     * @param fn
+     */
+    all(path: string, fn?: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): ExpressApplication;
+
+    all(path: string, ...callbacks: Function[]): void;
+
+    /**
+     * Render the given view `name` name with `options`
+     * and a callback accepting an error and the
+     * rendered template string.
+     *
+     * Example:
+     *
+     *    app.render('email', { name: 'Tobi' }, function(err, html){
+     *      // ...
+     *    })
+     *
+     * @param name
+     * @param options or fn
+     * @param fn
+     */
+    render(name: string, options: string, fn: Function);
+
+    render(name: string, fn: Function);
+
+    get (name: string): any;
+
+    get (name: string, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    get (name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    get (name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    get (name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    get (name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    get (name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        ...handlers: any[]): any;
+
+    get (name: RegExp): any;
+
+    get (name: RegExp, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    get (name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    get (name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    get (name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    get (name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        ...handlers: any[]): any;
+
+    post(name: string): any;
+
+    post(name: string, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    post(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    post(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    post(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    post(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        ...handlers: any[]): any;
+
+    post(name: RegExp): any;
+
+    post(name: RegExp, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    post(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    post(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    post(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    post(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        ...handlers: any[]): any;
+
+    put(name: string): any;
+
+    put(name: string, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    put(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    put(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    put(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    put(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        ...handlers: any[]): any;
+
+    put(name: RegExp): any;
+
+    put(name: RegExp, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    put(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    put(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    put(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    put(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        ...handlers: any[]): any;
+
+    del(name: string): any;
+
+    del(name: string, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    del(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    del(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    del(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    del(name: string,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        ...handlers: any[]): any;
+
+    del(name: RegExp): any;
+
+    del(name: RegExp, handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    del(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    del(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    del(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any): any;
+
+    del(name: RegExp,
+        handler: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler2: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler3: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler4: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        handler5: (req: ExpressServerRequest, res: ExpressServerResponse, next: Function) => any,
+        ...handlers: any[]): any;
+
+    /**
+     * Listen for connections.
+     *
+     * A node `http.Server` is returned, with this
+     * application (which is a `Function`) as its
+     * callback. If you wish to create both an HTTP
+     * and HTTPS server you may do so with the "http"
+     * and "https" modules as shown here:
+     *
+     *    var http = require('http')
+     *      , https = require('https')
+     *      , express = require('express')
+     *      , app = express();
+     *
+     *    http.createServer(app).listen(80);
+     *    https.createServer({ ... }, app).listen(443);
+     */
+    listen(port: number, hostname: string, backlog: number, callback: Function): void;
+
+    listen(port: number, callback: Function): void;
+
+    listen(path: string, callback?: Function): void;
+
+    listen(handle: any, listeningListener?: Function): void;
+
+    render(view: string, callback: (err: Error, html) => void ): void;
+
+    render(view: string, optionss: any, callback: (err: Error, html) => void ): void;
+
+    route: Route;
+
+    router: string;
+
+    settings: any;
+
+    resource: any;
+
+    map: any;
+
+    locals: any;
+}
+
+interface Express extends ExpressApplication {
+    /**
+     * Framework version.
+     */
+    version: string;
+
+    /**
+     * Expose mime.
+     */
+    mime: string;
+
+    (): ExpressApplication;
+
+    /**
+    * Create an express application.
+    */
+    createApplication(): ExpressApplication;
+
+    createServer(): ExpressApplication;
+
+    application: any;
+
+    request: ExpressServerRequest;
+
+    response: ExpressServerResponse;
 }
 
 declare module "express" {
-    export function (): _express.ServerApplication;
-    export function createServer(): ServerApplication;
-    export function static(path: string): any;
-    export var listen;
+    export function (): Express;
 
-    // Connect middleware
+    /**
+     * Body parser:
+     * 
+     *   Parse request bodies, supports _application/json_,
+     *   _application/x-www-form-urlencoded_, and _multipart/form-data_.
+     *
+     *   This is equivalent to: 
+     *
+     *     app.use(connect.json());
+     *     app.use(connect.urlencoded());
+     *     app.use(connect.multipart());
+     *
+     * Examples:
+     *
+     *      connect()
+     *        .use(connect.bodyParser())
+     *        .use(function(req, res) {
+     *          res.end('viewing user ' + req.body.user.name);
+     *        });
+     *
+     *      $ curl -d 'user[name]=tj' http://local/
+     *      $ curl -d '{"user":{"name":"tj"}}' -H "Content-Type: application/json" http://local/
+     *
+     *  View [json](json.html), [urlencoded](urlencoded.html), and [multipart](multipart.html) for more info.
+     *
+     * @param options
+     */
     export function bodyParser(options?: any): Handler;
-    export function errorHandler(opts?: any): Handler;
-    export function methodOverride(): Handler;
 
-    export interface ServerApplication extends _express.ServerApplication {}
-    export interface ServerRequest extends _express.ServerRequest {}
-    export interface ServerResponse extends _express.ServerResponse {}
-    export interface Handler extends _express.Handler {}
-}
+    /**
+     * Error handler:
+     *
+     * Development error handler, providing stack traces
+     * and error message responses for requests accepting text, html,
+     * or json.
+     *
+     * Text:
+     *
+     *   By default, and when _text/plain_ is accepted a simple stack trace
+     *   or error message will be returned.
+     *
+     * JSON:
+     *
+     *   When _application/json_ is accepted, connect will respond with
+     *   an object in the form of `{ "error": error }`.
+     *
+     * HTML:
+     *
+     *   When accepted connect will output a nice html stack trace.
+     */
+    export function errorHandler(opts?: any): Handler;
+
+    /**
+     * Method Override:
+     * 
+     * Provides faux HTTP method support.
+     * 
+     * Pass an optional `key` to use when checking for
+     * a method override, othewise defaults to _\_method_.
+     * The original method is available via `req.originalMethod`.
+     *
+     * @param key
+     */
+    export function methodOverride(key?: string): Handler;
+
+    /**
+     * Cookie parser:
+     *
+     * Parse _Cookie_ header and populate `req.cookies`
+     * with an object keyed by the cookie names. Optionally
+     * you may enabled signed cookie support by passing
+     * a `secret` string, which assigns `req.secret` so
+     * it may be used by other middleware.
+     *
+     * Examples:
+     *
+     *     connect()
+     *       .use(connect.cookieParser('optional secret string'))
+     *       .use(function(req, res, next){
+     *         res.end(JSON.stringify(req.cookies));
+     *       })
+     *
+     * @param secret
+     */
+    export function cookieParser(secret?: string): Handler;
+
+    /**
+     * Session:
+     * 
+     *   Setup session store with the given `options`.
+     *
+     *   Session data is _not_ saved in the cookie itself, however
+     *   cookies are used, so we must use the [cookieParser()](cookieParser.html)
+     *   middleware _before_ `session()`.
+     *
+     * Examples:
+     *
+     *     connect()
+     *       .use(connect.cookieParser())
+     *       .use(connect.session({ secret: 'keyboard cat', key: 'sid', cookie: { secure: true }}))
+     *
+     * Options:
+     *
+     *   - `key` cookie name defaulting to `connect.sid`
+     *   - `store` session store instance
+     *   - `secret` session cookie is signed with this secret to prevent tampering
+     *   - `cookie` session cookie settings, defaulting to `{ path: '/', httpOnly: true, maxAge: null }`
+     *   - `proxy` trust the reverse proxy when setting secure cookies (via "x-forwarded-proto")
+     *
+     * Cookie option:
+     *
+     *  By default `cookie.maxAge` is `null`, meaning no "expires" parameter is set
+     *  so the cookie becomes a browser-session cookie. When the user closes the 
+     *  browser the cookie (and session) will be removed.
+     *
+     * ## req.session
+     *
+     *  To store or access session data, simply use the request property `req.session`,
+     *  which is (generally) serialized as JSON by the store, so nested objects 
+     *  are typically fine. For example below is a user-specific view counter:
+     *
+     *       connect()
+     *         .use(connect.favicon())
+     *         .use(connect.cookieParser())
+     *         .use(connect.session({ secret: 'keyboard cat', cookie: { maxAge: 60000 }}))
+     *         .use(function(req, res, next){
+     *           var sess = req.session;
+     *           if (sess.views) {
+     *             res.setHeader('Content-Type', 'text/html');
+     *             res.write('<p>views: ' + sess.views + '</p>');
+     *             res.write('<p>expires in: ' + (sess.cookie.maxAge / 1000) + 's</p>');
+     *             res.end();
+     *             sess.views++;
+     *           } else {
+     *             sess.views = 1;
+     *             res.end('welcome to the session demo. refresh!');
+     *           }
+     *         }
+     *       )).listen(3000);
+     *
+     * ## Session#regenerate()
+     *
+     *  To regenerate the session simply invoke the method, once complete
+     *  a new SID and `Session` instance will be initialized at `req.session`.
+     *
+     *      req.session.regenerate(function(err){
+     *        // will have a new session here
+     *      });
+     *
+     * ## Session#destroy()
+     *
+     *  Destroys the session, removing `req.session`, will be re-generated next request.
+     *
+     *      req.session.destroy(function(err){
+     *        // cannot access session here
+     *      });
+     * 
+     * ## Session#reload()
+     *
+     *  Reloads the session data.
+     *
+     *      req.session.reload(function(err){
+     *        // session updated
+     *      });
+     *
+     * ## Session#save()
+     *
+     *  Save the session.
+     *
+     *      req.session.save(function(err){
+     *        // session saved
+     *      });
+     *
+     * ## Session#touch()
+     *
+     *   Updates the `.maxAge` property. Typically this is
+     *   not necessary to call, as the session middleware does this for you.
+     *
+     * ## Session#cookie
+     *
+     *  Each session has a unique cookie object accompany it. This allows
+     *  you to alter the session cookie per visitor. For example we can
+     *  set `req.session.cookie.expires` to `false` to enable the cookie
+     *  to remain for only the duration of the user-agent.
+     *
+     * ## Session#maxAge
+     *
+     *  Alternatively `req.session.cookie.maxAge` will return the time
+     *  remaining in milliseconds, which we may also re-assign a new value
+     *  to adjust the `.expires` property appropriately. The following
+     *  are essentially equivalent
+     *
+     *     var hour = 3600000;
+     *     req.session.cookie.expires = new Date(Date.now() + hour);
+     *     req.session.cookie.maxAge = hour;
+     *
+     * For example when `maxAge` is set to `60000` (one minute), and 30 seconds
+     * has elapsed it will return `30000` until the current request has completed,
+     * at which time `req.session.touch()` is called to reset `req.session.maxAge`
+     * to its original value.
+     *
+     *     req.session.cookie.maxAge;
+     *     // => 30000
+     *
+     * Session Store Implementation:
+     *
+     * Every session store _must_ implement the following methods
+     *
+     *    - `.get(sid, callback)`
+     *    - `.set(sid, session, callback)`
+     *    - `.destroy(sid, callback)`
+     *
+     * Recommended methods include, but are not limited to:
+     *
+     *    - `.length(callback)`
+     *    - `.clear(callback)`
+     *
+     * For an example implementation view the [connect-redis](http://github.com/visionmedia/connect-redis) repo.
+     *
+     * @param options
+     */
+    export function session(options?: any): Handler;
+
+    /**
+     * Hash the given `sess` object omitting changes
+     * to `.cookie`.
+     *
+     * @param sess
+     */
+    export function hash(sess: string): string;
+
+    /**
+     * Static:
+     *
+     *   Static file server with the given `root` path.
+     *
+     * Examples:
+     *
+     *     var oneDay = 86400000;
+     *
+     *     connect()
+     *       .use(connect.static(__dirname + '/public'))
+     *
+     *     connect()
+     *       .use(connect.static(__dirname + '/public', { maxAge: oneDay }))
+     *
+     * Options:
+     *
+     *    - `maxAge`     Browser cache maxAge in milliseconds. defaults to 0
+     *    - `hidden`     Allow transfer of hidden files. defaults to false
+     *    - `redirect`   Redirect to trailing "/" when the pathname is a dir. defaults to true
+     *
+     * @param root
+     * @param options
+     */
+    export function static (root: string, options?: any): Handler;
+
+    /**
+     * Basic Auth:
+     *
+     * Enfore basic authentication by providing a `callback(user, pass)`,
+     * which must return `true` in order to gain access. Alternatively an async
+     * method is provided as well, invoking `callback(user, pass, callback)`. Populates
+     * `req.user`. The final alternative is simply passing username / password
+     * strings.
+     *
+     *  Simple username and password
+     *
+     *     connect(connect.basicAuth('username', 'password'));
+     *
+     *  Callback verification
+     *
+     *     connect()
+     *       .use(connect.basicAuth(function(user, pass){
+     *         return 'tj' == user & 'wahoo' == pass;
+     *       }))
+     *
+     *  Async callback verification, accepting `fn(err, user)`.
+     *
+     *     connect()
+     *       .use(connect.basicAuth(function(user, pass, fn){
+     *         User.authenticate({ user: user, pass: pass }, fn);
+     *       }))
+     *
+     * @param callback or username
+     * @param realm
+     */
+    export function basicAuth(callback: Function, realm: string);
+
+    export function basicAuth(callback: string, realm: string);
+
+    export function basicAuth(callback: Function);
+
+    /**
+     * Compress:
+     *
+     * Compress response data with gzip/deflate.
+     *
+     * Filter:
+     *
+     *  A `filter` callback function may be passed to
+     *  replace the default logic of:
+     *
+     *     exports.filter = function(req, res){
+     *       return /json|text|javascript/.test(res.getHeader('Content-Type'));
+     *     };
+     *
+     * Options:
+     *
+     *  All remaining options are passed to the gzip/deflate
+     *  creation functions. Consult node's docs for additional details.
+     *
+     *   - `chunkSize` (default: 16*1024)
+     *   - `windowBits`
+     *   - `level`: 0-9 where 0 is no compression, and 9 is slow but best compression
+     *   - `memLevel`: 1-9 low is slower but uses less memory, high is fast but uses more
+     *   - `strategy`: compression strategy
+     *
+     * @param options
+     */
+    export function compress(options?: any): Handler;
+
+    /**
+     * Cookie Session:
+     *
+     *   Cookie session middleware.
+     *
+     *      var app = connect();
+     *      app.use(connect.cookieParser());
+     *      app.use(connect.cookieSession({ secret: 'tobo!', cookie: { maxAge: 60 * 60 * 1000 }}));
+     *
+     * Options:
+     *
+     *   - `key` cookie name defaulting to `connect.sess`
+     *   - `secret` prevents cookie tampering
+     *   - `cookie` session cookie settings, defaulting to `{ path: '/', httpOnly: true, maxAge: null }`
+     *   - `proxy` trust the reverse proxy when setting secure cookies (via "x-forwarded-proto")
+     *
+     * Clearing sessions:
+     *
+     *  To clear the session simply set its value to `null`,
+     *  `cookieSession()` will then respond with a 1970 Set-Cookie.
+     *
+     *     req.session = null;
+     *
+     * @param options
+     */
+    export function cookieSession(options?: any): Handler;
+
+    /**
+     * Anti CSRF:
+     *
+     * CRSF protection middleware.
+     *
+     * By default this middleware generates a token named "_csrf"
+     * which should be added to requests which mutate
+     * state, within a hidden form field, query-string etc. This
+     * token is validated against the visitor's `req.session._csrf`
+     * property.
+     *
+     * The default `value` function checks `req.body` generated
+     * by the `bodyParser()` middleware, `req.query` generated
+     * by `query()`, and the "X-CSRF-Token" header field.
+     *
+     * This middleware requires session support, thus should be added
+     * somewhere _below_ `session()` and `cookieParser()`.
+     *
+     * Options:
+     *
+     *    - `value` a function accepting the request, returning the token 
+     *
+     * @param options
+     */
+    export function csrf(options: any);
+
+    /**
+     * Directory:
+     *
+     * Serve directory listings with the given `root` path.
+     *
+     * Options:
+     *
+     *  - `hidden` display hidden (dot) files. Defaults to false.
+     *  - `icons`  display icons. Defaults to false.
+     *  - `filter` Apply this filter function to files. Defaults to false.
+     *
+     * @param root
+     * @param options
+     */
+    export function directory(root: string, options?: any): Handler;
+
+    /**
+     * Favicon:
+     *
+     * By default serves the connect favicon, or the favicon
+     * located by the given `path`.
+     *
+     * Options:
+     *
+     *   - `maxAge`  cache-control max-age directive, defaulting to 1 day
+     *
+     * Examples:
+     *
+     *   Serve default favicon:
+     *
+     *     connect()
+     *       .use(connect.favicon())
+     *
+     *   Serve favicon before logging for brevity:
+     *
+     *     connect()
+     *       .use(connect.favicon())
+     *       .use(connect.logger('dev'))
+     *
+     *   Serve custom favicon:
+     *
+     *     connect()
+     *       .use(connect.favicon('public/favicon.ico))
+     *
+     * @param path
+     * @param options
+     */
+    export function favicon(path?: string, options?: any);
+
+    /**
+     * JSON:
+     *
+     * Parse JSON request bodies, providing the
+     * parsed object as `req.body`.
+     *
+     * Options:
+     *
+     *   - `strict`  when `false` anything `JSON.parse()` accepts will be parsed
+     *   - `reviver`  used as the second "reviver" argument for JSON.parse
+     *   - `limit`  byte limit disabled by default
+     *
+     * @param options
+     */
+    export function json(options?: any): Handler;
+
+    /**
+     * Limit:
+     *
+     *   Limit request bodies to the given size in `bytes`.
+     *
+     *   A string representation of the bytesize may also be passed,
+     *   for example "5mb", "200kb", "1gb", etc.
+     *
+     *     connect()
+     *       .use(connect.limit('5.5mb'))
+     *       .use(handleImageUpload)
+     */
+    export function limit(bytes: number): Handler;
+
+    export function limit(bytes: string): Handler;
+
+    /**
+     * Logger:
+     *
+     * Log requests with the given `options` or a `format` string.
+     *
+     * Options:
+     *
+     *   - `format`  Format string, see below for tokens
+     *   - `stream`  Output stream, defaults to _stdout_
+     *   - `buffer`  Buffer duration, defaults to 1000ms when _true_
+     *   - `immediate`  Write log line on request instead of response (for response times)
+     *
+     * Tokens:
+     *
+     *   - `:req[header]` ex: `:req[Accept]`
+     *   - `:res[header]` ex: `:res[Content-Length]`
+     *   - `:http-version`
+     *   - `:response-time`
+     *   - `:remote-addr`
+     *   - `:date`
+     *   - `:method`
+     *   - `:url`
+     *   - `:referrer`
+     *   - `:user-agent`
+     *   - `:status`
+     *
+     * Formats:
+     *
+     *   Pre-defined formats that ship with connect:
+     *
+     *    - `default` ':remote-addr - - [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"'
+     *    - `short` ':remote-addr - :method :url HTTP/:http-version :status :res[content-length] - :response-time ms'
+     *    - `tiny`  ':method :url :status :res[content-length] - :response-time ms'
+     *    - `dev` concise output colored by response status for development use
+     *
+     * Examples:
+     *
+     *      connect.logger() // default
+     *      connect.logger('short')
+     *      connect.logger('tiny')
+     *      connect.logger({ immediate: true, format: 'dev' })
+     *      connect.logger(':method :url - :referrer')
+     *      connect.logger(':req[content-type] -> :res[content-type]')
+     *      connect.logger(function(tokens, req, res){ return 'some format string' })
+     *
+     * Defining Tokens:
+     *
+     *   To define a token, simply invoke `connect.logger.token()` with the
+     *   name and a callback function. The value returned is then available
+     *   as ":type" in this case.
+     *
+     *      connect.logger.token('type', function(req, res){ return req.headers['content-type']; })
+     *
+     * Defining Formats:
+     *
+     *   All default formats are defined this way, however it's public API as well:
+     *
+     *       connect.logger.format('name', 'string or function')
+     */
+    export function logger(options: string): Handler;
+
+    export function logger(options: Function): Handler;
+
+    export function logger(options?: any): Handler;
+
+    /**
+     * Compile `fmt` into a function.
+     *
+     * @param fmt
+     */
+    export function compile(fmt: string): Handler;
+
+    /**
+     * Define a token function with the given `name`,
+     * and callback `fn(req, res)`.
+     *
+     * @param name
+     * @param fn
+     */
+    export function token(name: string, fn: Function): any;
+
+    /**
+     * Define a `fmt` with the given `name`.
+     */
+    export function format(name: string, str: string): any;
+
+    export function format(name: string, str: Function): any;
+
+    /**
+     * Query:
+     *
+     * Automatically parse the query-string when available,
+     * populating the `req.query` object.
+     *
+     * Examples:
+     *
+     *     connect()
+     *       .use(connect.query())
+     *       .use(function(req, res){
+     *         res.end(JSON.stringify(req.query));
+     *       });
+     *
+     *  The `options` passed are provided to qs.parse function.
+     */
+    export function query(options: any): Handler;
+
+    /**
+     * Reponse time:
+     *
+     * Adds the `X-Response-Time` header displaying the response
+     * duration in milliseconds.
+     */
+    export function responseTime(): Handler;
+
+    /**
+     * Static cache:
+     *
+     * Enables a memory cache layer on top of
+     * the `static()` middleware, serving popular
+     * static files.
+     *
+     * By default a maximum of 128 objects are
+     * held in cache, with a max of 256k each,
+     * totalling ~32mb.
+     *
+     * A Least-Recently-Used (LRU) cache algo
+     * is implemented through the `Cache` object,
+     * simply rotating cache objects as they are
+     * hit. This means that increasingly popular
+     * objects maintain their positions while
+     * others get shoved out of the stack and
+     * garbage collected.
+     *
+     * Benchmarks:
+     *
+     *     static(): 2700 rps
+     *     node-static: 5300 rps
+     *     static() + staticCache(): 7500 rps
+     *
+     * Options:
+     *
+     *   - `maxObjects`  max cache objects [128]
+     *   - `maxLength`  max cache object length 256kb
+     */
+    export function staticCache(options: any): Handler;
+
+    /**
+     * Timeout:
+     *
+     * Times out the request in `ms`, defaulting to `5000`. The
+     * method `req.clearTimeout()` is added to revert this behaviour
+     * programmatically within your application's middleware, routes, etc.
+     *
+     * The timeout error is passed to `next()` so that you may customize
+     * the response behaviour. This error has the `.timeout` property as
+     * well as `.status == 408`.
+     */
+    export function timeout(ms: number): Handler;
+
+    /**
+     * Vhost:
+     * 
+     *   Setup vhost for the given `hostname` and `server`.
+     *
+     *     connect()
+     *       .use(connect.vhost('foo.com', fooApp))
+     *       .use(connect.vhost('bar.com', barApp))
+     *       .use(connect.vhost('*.com', mainApp))
+     *
+     *  The `server` may be a Connect server or
+     *  a regular Node `http.Server`. 
+     *
+     * @param hostname
+     * @param server
+     */
+    export function vhost(hostname: string, server: any): Handler;
+
+    export function urlencoded(): any;
+
+    export function multipart(): any;
+}
\ No newline at end of file