TODO file added, more cleaning.