Add TODOs/Improvements