Nov12

Creating pull request for code review. See comments in diff.
Remember to remove your unused classes.