Progress on trying to add TimeSpent