added rudimentary name selection