Add: Group class draft