More work on Rain Water Buckets.