[Scenario] Matrix Support (simple)

[damyanp]

Covers basic matrix support (notably without support for different orientations).

Need to create deliverables etc. that include updating the language spec, adding functional tests etc.