Edit 1 - adding catcher class, timer class