Got rid of the todo