Got some of match working