Better names + actual working wizard