Working version of bucket fix

That should take care of things I am sure you won't want the event
handeler in the same class/