Lots of work
Tracked data added.