Huge amounts of stuff done to Location package