Snapshot stuff (will be reverted) from the video walkthru