Some work on the new workflow