Add TODO and CHANGELOG