Adding todos and some other random shit.