Buckets work now, but still need to tweak the queue