More work on Predictions.
Changed from class to module for Predictions