I did the shuffle in the most recent commit... thoughts?