Make shuffle a seperate function