Reinstate multiple leaders

This reverts commit f466e8a7ba120a50596966acf5eb191d6d99f326.
Simplify group nesting
Add nested memberships under groups