Started with implementation of the Catcher

Still needs more work