Support snapshot windows

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

Again shouldn't the snapshot date be the end date?