Noting more TODOs