Grouping 5

Reworks work groupings to be more general to activities.