Would you mind exposing this todo as a github issue and pulling it out of the code?