added match list features which should really not be in here
remove match functionality which should never have been here