Add TODOs, code comments