Cleared todos and a lot of printlns