Finished simulation, cant get XML so requires test data.
Merge branch 'feature-simulation' into develop