Revert "Revert "Code till routing""

This reverts commit f8d470b6f516bde27b9dcccfd7367bfa94797970.