Add groups and make them work