organized the TODO list better