Added wrappers to fix mono app domain issue.
Fixed pull conflicts. Tidying up vs Wrapper hack.