Done some more work on the mac