First attempt at mac os support