Feature/cfd 167 group discussions overview

Replaces #219 
Then => And