Moved TODO to issues