WIP: Snapshot commit