merge in add annontation button and link parser--not yet tested.