Bmyerz grappa shuffle

Reissue of #234, except that it's into master instead of a different branch.