Why shouldn't it be and what do we need to do to make it so that we can get rid of this TODO?