initial commit of annotate macros