Fully converted to annotations
Another milestone