Second pass at the windows solution.  Pushing so I can try acceptance. Squash if this works.