Initial tracker work

this is a comment