Broke osx/linux apart