Mac Support

Actually do use this. Talk about the mac support here, when we've finalized it, i'll resolve conflicts and pull it to master.