[dcs] Add TODO details for conformance
[dcs] Add tokenization and tests
Merge branch 'dcs-master'

Conflicts:
	dcs/TODO