trying to implement location listener
Tweaking location listener
Merge conflicts after implementing listener