More preliminary code for matching