Nov12

Creating pull request for code review. See comments in diff.
Not needed. Look at the CM.