Adding TODOs formed from an initial skim of the existing code and the current API docs.