Wizards refactoring, step 1