Delimiters v1
Delimiters done.  More options and tests.