Feature/windows

@bturner-r7 @erran-r7

Not at all urgent, but this change could use a code review.