Nearly finished new prediction method, still have a few bugs ...
Merge commit '4d032d5aa24d39de40ee3f4962beb521fcf0b1be'