add comments and basic notification tracker