Finalizing windows support.  bumping