Cleaned up phase-1, added snapshots to other sections of phase-1 (all in comments)