This workflow is something we want to improve in general - so please shout if you run into walls