Split the application into two flows - this is part one (email).

Please don't merge this yet. Despite all tests passing, I'd like us to play with this on staging first.
Ah yes, good catch.