Routing

convert to routing
was worried about BC with very old (Core 1.2) installations