Changes

More data gathered
Merging with existing data
Many rewritten class constructors
Testing functionality