Added error handling
Initial version of new location finder
Oops removal