Started working on tracking