Start to work on TODO section (about 1/2).