Massive dev work (on Mac)