Finally got a sane workflow down