Adding support for commas and parens, fixing small quoting issue.
Moving file.