More completion of predictor. Bit more to go