Added todo and changelog