New wizard version

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Merge pull request #177 from djs55/new-wizard

New wizard version