Started making the sampler concept more generic.