That TODO should really be done on this branch...