TODO and changelog added