Major updates, working match parser