Getting somewhere, but not far enough with endpoitn matching