refactor: don't pass around router.Ourself