Start prep for forecasts and make some calls more generic