Comma emission, updated todo