Register new snapshots

Can't this code be fixed now and these // SNAPs be removed? cc @cmr