Add pimp comment functionality