Finish the Group and comments functuality