Move stuff around and add support for wizard