A TODO would be fine with me. A later pull request can handle this