DO NOT MERGE INTO DEV!!! 
creating the annotation service - performing fixes