Did you intend to leave this TODO here?  There are a few additional TODOs in this pull request, not all of which are new.