Refactored doc-list into working order