Working some more on tracking