Ready to merge with the comment changes.
Updated for comment voting.