Didn't like workflow system so restarting on it

This should clean it up a bit more. Basically greater separation of the
execution and the flow of each operation.