Add commented TODO steps