Snapshot fixes, begin introducing tuples.