More doc.
Couple things done.
More TODO.