Extra annotations

Adding extra annotation points to the model


----
--breaking

If it'll be sorted before merging, or you have it on a list to get around to in another PR, it's fine as is.