Partial Comments added, still trying to fix catcher display