Did todos and some random stuff