Feature/22 persist to document

@gglover