Revert "Revert "Large commit for wizard tool""

This reverts commit ff2b09e000eb71f927cb821d52f2672fc690a55e.