Support snapshot windows

Well no reason you didn't look at it Mark - I never created the PR. Apologies.

I don't understand this code at all actually, the comments and the code don't seem to line up, and the behaviour doesn't match to what I expect, might have to get you to explain it to me offline (or in a larger comment here).