WIP: CDF-174 Add discussion full form

#207 
use a return instead of by reference.