Adding production function estimation, etc