Mark some TODOnes