Finally getting the mainline calculator correct
Calculator slightly modified use data in a more similar manner as provided by database

ModelDriver JSON output added

ModelDriver now using current facility implementation
Merge remote-tracking branch 'upstream/master' into jaMaster