WIP - Further work on documentation template