Nov12

Creating pull request for code review. See comments in diff.
Remove this. See comment above implementation of this method.