Removed completed TODO. Now let's see if it works.