working diff routing, plus tests passing