added first attempt at new matching