Revert "Revert "Form Flow Logic""

This reverts commit 6a982032a04148bdb63bc8557835d73f5de3e2d5.