working on adding tracking