Now getting the match functions to work