That what I thought with the whole samples extraction pipeline.  Plus, this makes it far easier to test.