Picker now working.  Fix bug if it already exists