done.  Refactored location selection logic to _selectLocation