need to re-write match_history