Add TODOs and comments