This scenario covers the bit of matrix support that we didn't do as part of #304. This needs to be scoped, broken down into deliverables etc.
