ES: adding in a bit of a more intelligent matcher...