Right, I read that but forgot to remove the TODO.  Gues I can do that now :)