Initial tracker work

boo