Added template-driven output.  Removed -csv flag.