beginning refactoring editwishcontroller