Shuffle almost done, todo listed