Project folder from 7f83555f3d9b8c84b48b102275d27bda1b6e17da, 

Windows build still broken, just as a starting point.