Initial tracker work

fizzz