OO Decomposition, model fixed, prediction works.