WIP Add shuffle