Working on register wizard (cont)