Processed my own comments so I can merge this.