Updating TODO and CHANGELOG