Refactoring complete, now to update the workflow.