Almost completed the rewrite of the job flow