Continued to work on the osx port