Feature/edoc

Starting dat conversation.
Addressed in 307b53d