Reduced 1st-order-approx bug; refactored SRW tree to reduce duplication. All tests pass :)