[OSX] Still debugging, most functionally restored.