WIP: CFD-156 - Quick post: Document & Event.

#153 
why?