Finished first (rough) pass at HistFactory section