Lots of changes, 1D simulation working