Add shuffle functionality

@deini @alexmckenley 
sure