CFY-648 some refactoring in preperation for workflow operations