ACCUMULO-1000 added TODO