WIP: thread arguments through parser.  But need to use a single map.
Fixed the known problems, but still seeing a bad distance matrix coming out