Commit from 30k feet.  OSX fix/threading fix