more work on annotation library. Looking better!