Adding more TODOs for self