More TODOs
Split code into many files!