WIP: Adding location update listener (from android)