More TODO's for the libraries.
Added to TODO.