First big batch of async refact
Updated annotator