Fiddling, added start of match parsing.