Initial commit: single msg version of current annotations_store