Generic Block Randomization

- Changed block randomizer to use generic randomization