First commit of working annotated content apps