Add superheroic demo avatars
Refactor code to skip msg grouping for now