Ready to get working on the storing simulation data
fixing merge conflicts