WIP added member management