Partial update to use a single analysis object

Partial update to use a single 'analysis' object following the same
working template as the Auto OH.