Updated todo, removed require