Can we resolve this TODO, while you are working in this general area?