Update

1. new model to handle events related to update current location
2. clean up