Revert "Revert "Updates to router and client""

This reverts commit c556a25aaac804a2f730434aceb101bcc2594c46.