Updated predictions engine, working now