Partial implementation for Diagnosis and Forecast.  Restructure for common definitions.