Wizard option handliong working and ready for merge into next.