Predictor

Continue with prediction refactoring