Finally got all but comma function to work