Preliminary wizard questions in place and 'oops I'm on master'