Began work with adding support for OSX