Annotations

Added separate annotations for cbg vs smbg. Merged with latest master. Ready for review.
Given the text we decided on, I think we want this text to be the more general 'What is this?'