Still working on Wizard part

Still working on Wizard part