Added more to the match system (still uncomplete)