Add some docs and TODO's before merge.