Getting closer to valid wavesim