Add confirmation prior to check if valid?