Started to refactor run-and-catch