Refactor to include the common surrounding tags as part of the document to extend and sub-blocks for finer grain overriding.
Refactor to include the common surrounding tags as part of the document to extend and sub-blocks for finer grain overriding.

philschatz/rhaptos2.repo,philschatz/rhaptos2.repo,philschatz/rhaptos2.repo