Designing a Pension and Savings Model Fit for Longevity