Initial tracker work

foo