More work trying to get discover working.