A little TODOing ...