Support snapshot windows

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

Could you pass the dictionary from `runSnapshot`? its being read twice this way.