Expanded the TODO a little