Editing the todo list

left out final tests