Got rid of a todo... Added another