start making code generic to activities
more generalization
Merge pull request #1182 from ORCID/grouping5

Grouping 5