Part 2 of annotations initial commit