Windows each

By this weekend, I really meant tonight.   Had some free-time.    I would appreciate it if one of the other contributors could test/verify my merge.

Thanks!