Alternate shuffle option

threw this together to show my approach and because it was simple. 
DO NOT PULL IF ISSUE #658 IS PULLED.