Support snapshot windows

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

Yes, we should do this.