Add use of simulation and prediction. Still WIP