Edited TODO comments to reflect the next needed task.