Interweave addenda

Addenda for an entry should be place directly below the entry
what do you think about renaming `lines` to `entries_with_addendas`?