Added tracking model and tests