add unfinished code to ShufflesContentsIntoAGrid
fix multiple bugs with shuffling