Added city state native code from vince branch