Make shuffle an independent ifdef.  Add delete support and workload.