Final (definitely!) version for peer review

There was a problem with the last commit that required re-synching.
This is the final commit for peer reviewing.