matrix-spec-proposals

0e6a9af4 - moving things around