Got it working on Windows, need to verify still works on Mac.