WIP... adding randomization.