Attempting to get annotation and linking a bit more solid.

Link is now it's own entity, and there's different handling between
links with or without an access point body. Tests pass, but still need
to do the GUI for creating links with an access point body.