Added to todos for further PRs on this topic.