Refactor the bambucket a bit