Routing in CLI

This is not yet addressed - but should.