This is complete. There is a new pull request with these changes.