Updated entire system to handle location updates, as well as data updates, better and in a more scalable and asynchronous way 2