Feature/section6

This is here more as a place holder, while I wait for the PR #120 to be merged.

Once that PR is merged, this PR should go in... Inshallah!