It would be good to move the picture information out into a picture object.