Fix elements and annotations

[bil-bas]

I was in the middle of implementing this, requiring some refactoring of existing systems in order to make it all make sense, when the 2 weeks break from developing (You know, Xmas and new year) caught me! I haven't pushed anything, since it really is a mess and needs some serious redesign before it will begin to work again. Hopefully, I can get back to this around the 2nd January. Ish.