Updated pipeline, still using my private doodleshop
Commented out some parts not used at the moment