re-organize matcher part 7; more to come