More TODO notes