Work3

Attempt to change catcher to actual bucket, need to fix.