Remove buckets from the spec
Implement most of the controller