Refactored the pickLocation method so it is fully implemented