Added tracking module and initial tests