Work on bug #8369.  It mostly works, I just have to modify the templates, and set it up so that the saved data can be used.