Temporary Catcher, minor changes for portability and comments added