Finished incomplete secondary annotation functionality.

https://catami.atlassian.net/browse/CAT-759