Full OSX port + ooc support code