Added 'Stop tracking' to TODO