CFD-151- Discussion message

#144 
I think it would be ok to keep this logic in this single module -- but if you feel strongly about it, we can move it in a follow up PR.