OSX/linux build almost there