More work done on routing and authentication