Added Wizard stuff
Fixed merge conflicts