2nd pass on getting images to work