First working version of #shuffle