Continuing work
Further progress on wizard variants
Merge remote-tracking branch 'origin/master'