Re-wrote infinite buckets. Hopefully no more crashes now :D