Commit after months of being idle so I can work on macbook

No idea what changes are