Merge of current working into hs-dev
Start of simplenu analysis, external data from JR
external data importation file, genesis of
Trying to merge this goddamn thing