added basic structure for matches
added basic match structure
Merge branch 'FEATURE_match_structure'