Begin addition of snapshot support
9 files changed