Add snapshot taking (not saving yet)