Initial stab at getting things working on OSX