Reviewd code, added some TODOs