More work on bug #8369.  Save now works, I just need to make it smoother and cleaner.