Reworking how gathered images and stored.