Add TODOs around performance hot spots