Bunch of work on the bucket