Last bit of cleanup
Change to the image data structure
First load of image data
Add check for no images