Depending on the answer to the 'main purpose' of this pull request, we might need to change the name.