Fixed catcher logic + initialization

Harrizon, let me know if it not workings or you think it's wrong. We do
need to reassign and do a full rundown before going out on Thursday.