Extra annotations

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

Changing to TODO with comment.