Add TODOs as I see them