ridiculous log4j dependency issues
tests pass
add annotation service and fix up stage tests