Got the Windows structure set up and working
Merge commit '4eeaee82f56ab932534041adeab2124e9350517c'