TODO for groups functionality