ADDED: Location tracking functionality