1D test with convergence is working at this point, do not change the 1D code. 2D gets the right shape, but the ordering/scaling is weird