added routing + tests