I am working on a merge reqest with come of the changes we did as PSI to make the code Windows compatible.