Updates from work for EIC R&D proposal.
Merge pull request #3 from gaskelld/master

Updates from work for EIC R&D proposal.