Weirdness rebasing
Still trying to get OSX to work