Initial commit of group management feature