First modifications of group

Not a working version, only commiting to have a backup.