Merge in ability to add screenshots.