More macro business

Still some issues with ios/mac paths vs windows paths.. Grrr