Add todo and comments