Should this TODO be addressed now or later?