Annotations

Added separate annotations for cbg vs smbg. Merged with latest master. Ready for review.
Try my latest. Should be fixed.