Change sampling scheme, more amenable to future parallelization.
Todo: depricate and remove old sampling code