Upgrade to Express 4

To do:
* [ ] Boot with no errors
* [ ] Restore old functionality