v1.6.0: Shuffling improved, error checking is next.