Task #16 - support event members - WIP