Re-worrking the WPF version of the wizard. Still need to add some references to the WPF project