First version with modal and wizard implementation