Reworked and refactored version of the wizard system