Nov12

Creating pull request for code review. See comments in diff.
These are good, but Idle is not needed.