Extra annotations

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

what's with this commented-out block?