Yes, I think this should be done right away. Users can opt for whatever suits them then.