Re-ordered into very simple express app