Annotation library work
Work on annotation library.