I2: Add Comments Feature