Two of the todo are done!