Moved TODO to #9