Beginning work on snapshots

Fixing a few bugs with new file names