[WIP] Second round of shuffling