build
merge bug
finished alot of OSX stuff
more stuffs
broken