lots of additions here, as I am expanding the code base to incorporate model and scenario details