Expanding School Quality Through Choice