pending: comments and improvements to image source