Simulations work correctly

There is now a key error, working on debuging that