Work on bug #8138.  I have the basis for editing and adding images now.