finish porting basic image to use file-based images.