Added a more generic way of adding annotations. Moved the number annotations to use this, so it gets tested.