Large commit for wizard tool
Revert "Large commit for wizard tool"

This reverts commit 783e51c8d4206c5544559bd3560801d19ac7ce5a.