Moved TODO to separate file.