Made a start on routing commands