Still need the TODO here, or did you forget to remove it?