WIP - derived quantities now match gamma distribution parametrization