Finishing v0.1 of bucket