Merge changes from forecast.py refactoring. Tests updated but there is still...

Merge changes from forecast.py refactoring. Tests updated but there is still and issue with xarray and dash.