initial commit of tracking code
more cleanup.
quick fixes, fix borked import
pep8 cleanup and more simplification