Working on action-tracking for diadem