Add getKind. Change binarySearch. Filled in getMatch.