towards new workflow, initial commit, part 2