Moved TODO to issue #1