Almost complete for OSX support
Right that finishes off OSX support