rework: wip snapshotting