Snapshots working, needs cleanup