#8 wizard refactoring (work in progress)