Implemented some ideas for new workflow, only structure so far