Todo and comments