rewrote some of RW class, started testing in 2d (1d seems to work by now)