Patch Set 2: Looks good to me, but someone else must approve; Build Successful; IP review completed

Works as expected. The only thing that is missing are tests that will ensure that 'Show Annotation' menu option is in place and that it at least open an editor