finalised wizard for v2.0.0  yay