Reformed from old code -- mainly ParsingItems
  - ParsingItem, EntryData, Entry
  - EntryData is Entry out of context