Complete first draft of snapshot and bootstrap