Fleshing out some annotation ideas