Split the shuffling into the a seperate function.