Revert "Revert "Photos Wrap Up""

This reverts commit 7c7ff0b1996e0cd5d3444c9da155d9bb0f5f48e6.