WIP: Porting router listening logic to base_connector module