Router + tests (WIP)