Add shuffle

Closes #3