Added basic group functionalilty (in progress)