thesis: worked on the todos