migration to mac commit

not an actual change for the most part, except some WIP stuff