Working version, v7 style wizard