Reworked flow design.
Initial import