Added tracking. Resolves #5