Optimization for shuffle

dig it or will this have issues with strings in legacy ie?
Ah cool, didn't know that. Want me to fix or will you want to clean those up?

Also to the earlier point strings arent going through `values`