Added models and calculations to both forecast and future