Rewrote buckets to use Vanilla bucket class as a base.