add basic tracking
Merge branch 'basic-tracking'