Updated todo and stuff
utils