Further work: Improve pipeline-thing.