Starts adding single_match support