Added more TODOs to file