Working on the 2.2 version of the workflow, including cleanup code after each step, refactoring the loops, and a few more tweaks