Extra annotations

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

The plan was for the tests to be extended to more objects at a later date, (once we are out of breaking?), and this was my list of other objects to construct. I can strip it if needed.