Revert "Revert "Alternative flow and colander""

This reverts commit dbd3dfcf8dbe2272abee7bf0e9659ea033a5f996.