Add local handling for shuffle

should resolve stack/52b43f077841550ad40d8928
it looks like some things may have changed when I built the templates, but everything seems to work... would appreciate some eyes on it. also check me on the actual intended changes too. :stuck_out_tongue: I tested it, but make sure it looks good.