[hk1337]

I have been keeping them in separate branches because I have had macOS with intel and arm because there were differences in the config.