Added a TODO for closure conversion