TODO is less important than ChangeLog, move it down. :)