Changed around data structures, changed randomizer
fully implemented randomizer