Rewrote walker + tests