Issue 3306 kpi this session

@kparlante, I am starting a PR in my own repo to begin to get feedback before submitting one to the main Mozilla repo.