initial branch
first pass on OSX
first pass on OSX