Final commit with complete comment functionality