Merged everything and fixed osx imports