Kept the express code named app.js on this branch, so it merges cleanly when we decide it's stable