Add the wizard, still lot of work to be done