Do you want me to push directly to master?
or Shall I create PR after some basic testing because I currently cant do it as I do not own a MacOS machine?
Right now I pushed the new commit related to `macos` to cmake branch.
I have some more commits related to clean up/structuring/add support for new features (that were present in makefiles). What would be the best approach?