Simulation is now mostly working (still 1D)