Committing express code, with much better structure