Subfeat/simplify flow

Will requested to merge subfeat/simplify-flow into feat/basic-slack-decision Apr 14, 2020