WIP: CFD-151- Discussion message

#144 
missing comment about the logic here.