More work on bug #8313.  Annotations can be added now.  Now I just have to display them.