Rewrote ScrambleByRandom, should be complete now (needs testing of course, but we're not done).