Add OSX stuff back

TODO: We need to prune some of this