WIP catchOn/catchOnMain implementation
Merge pull request #28 from yapplabs/catch

WIP catchOn/catchOnMain implementation