Started the todo change