[CLOSES #10] Added tracking code