A bit more work on the new predictor setup. A few more days work needed.