Changed location finding to support timeouts, added ability to add progress completion and notification on uploads