Add shuffle and some stuff