Need better handling of async calls, removed psuedo promise
Some additions to location