Last call for comments. Will merge this in by 11/04 if there are no new comments.