Stress progress fixed.

Need to inherit the abstract calculator with waterfall and Mortgage calculators