Refactored pipelines
ready for scrape