Pulling in initial work on the issue.