Added bucket filling and stuff :)