Reworked on the router

Fixes #2