Extra annotations

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

I am guessing there's some kind of pending to-do here.