Let's leave it for another pull request for now. :)