Started implementing tracking stuff.
Finished tracking new stuff.
Merge branch 'track.new_stuff'