Initial tracker work

and a response