More enhancements to router. WIP on authentication client