BZ-9171: New routing

Signed-off-by: Paden <padenportillo@gmail.com>