Handlers on buckets.
Major refactoring.