wishes and router refactored