Upgrade to Express 4

Not sure if this is complete yet.