Populate Map using fields from Results row
Tweaks to _updateById & tests
Less generic
Ditched options file
JSON stuff
More customer fields, test-tuning