Some work towards bug #7591.  I have got getExtra and setExtra in place, I just need to test them better.