WIP: CFD-174: Add a full form for discussion

#207