Routing in CLI

This is not yet addresses - but should.