Moved TODO to github issue (#2)