Refactored ApprovalWorkflow helper into its own file
Add task to current cycle, plus miscellaneous fixes