re-integrated with modeling code
autodiff
autodiff
working except omega parameterization is weird